[maven-release-plugin] copy for tag org.apache.felix.shell.remote-1.1.0
git-svn-id: https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.shell.remote-1.1.0@988570 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/DEPENDENCIES b/DEPENDENCIES
new file mode 100644
index 0000000..8e8b3b2
--- /dev/null
+++ b/DEPENDENCIES
@@ -0,0 +1,20 @@
+Apache Felix Remote Shell
+Copyright 2010 The Apache Software Foundation
+
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
+
+I. Included Third-Party Software
+
+n/a
+
+II. Used Third-Party Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
diff --git a/NOTICE b/NOTICE
index 720f11c..cb307ff 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,21 +1,6 @@
Apache Felix Remote Shell
-Copyright 2008-2009 The Apache Software Foundation
-
-
-I. Included Software
+Copyright 2010 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
-
-II. Used Software
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
\ No newline at end of file
diff --git a/doc/changelog.txt b/doc/changelog.txt
new file mode 100644
index 0000000..b04ce5f
--- /dev/null
+++ b/doc/changelog.txt
@@ -0,0 +1,9 @@
+Changes from 1.0.4 to 1.1.0
+---------------------------
+
+** Bug
+ * [FELIX-1057] - stopping bundle causes NPE
+ * [FELIX-2192] - Remote shell has incorrect bundle symbolic name
+
+** New Feature
+ * [FELIX-2544] - Modify shell.remote to work with Gogo too
diff --git a/pom.xml b/pom.xml
index 9aa49e5..24d6205 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>felix</artifactId>
- <version>1.0.4</version>
+ <artifactId>felix-parent</artifactId>
+ <version>1.2.1</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -29,18 +29,18 @@
<description>
Provide remote access to Felix Shell or Gogo.
</description>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.1.0</version>
<artifactId>org.apache.felix.shell.remote</artifactId>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.0</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.0.1</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -58,7 +58,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>2.1.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -73,9 +73,16 @@
<DynamicImport-Package>
org.apache.felix.service.command,org.apache.felix.shell,org.osgi.service.log
</DynamicImport-Package>
+ <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
+
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.shell.remote-1.1.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.shell.remote-1.1.0</developerConnection>
+ <url>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.shell.remote-1.1.0</url>
+ </scm>
</project>
diff --git a/src/main/java/org/apache/felix/shell/remote/Listener.java b/src/main/java/org/apache/felix/shell/remote/Listener.java
index 8aba389..a67968f 100644
--- a/src/main/java/org/apache/felix/shell/remote/Listener.java
+++ b/src/main/java/org/apache/felix/shell/remote/Listener.java
@@ -60,6 +60,7 @@
m_listenerThread = new Thread(m_acceptor, "telnetconsole.Listener");
m_listenerThread.start();
}//activate
+
public ServiceMediator getServices()
{
return m_services;
