[maven-release-plugin] copy for tag org.apache.felix.main-1.2.0
git-svn-id: https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.main-1.2.0@690819 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/NOTICE b/NOTICE
index 22149e5..c5cfec9 100644
--- a/NOTICE
+++ b/NOTICE
@@ -10,7 +10,7 @@
This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright 2006 The OSGi Alliance.
+Copyright (c) OSGi Alliance (2000, 2007).
Licensed under the Apache License 2.0.
@@ -18,7 +18,7 @@
This product uses software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright 2006 The OSGi Alliance.
+Copyright (c) OSGi Alliance (2000, 2007).
Licensed under the Apache License 2.0.
diff --git a/doc/changelog.txt b/doc/changelog.txt
index 76ad816..0e8cad8 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,3 +1,9 @@
+Changes from 1.0.3 to 1.2.0
+---------------------------
+
+* [2008-08-03] Change to the R4.1 version of the spec. (FELIX-514)
+* [2008-05-08] Fixed a NPE. (FELIX-525)
+
Changes from 1.0.3 to 1.0.4
---------------------------
diff --git a/pom.xml b/pom.xml
index 956abb4..9749f81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,12 +27,12 @@
<packaging>bundle</packaging>
<name>Apache Felix Main</name>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
@@ -47,7 +47,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.2</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
@@ -58,7 +58,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell.tui</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.2</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
@@ -69,7 +69,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
@@ -94,7 +94,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -131,7 +131,7 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</artifactItem>
</artifactItems>
</configuration>
@@ -147,7 +147,7 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.2</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/bundle</outputDirectory>
@@ -155,7 +155,7 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell.tui</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.2</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/bundle</outputDirectory>
@@ -163,7 +163,7 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/bundle</outputDirectory>
@@ -204,4 +204,10 @@
</resource>
</resources>
</build>
+
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.main-1.2.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.main-1.2.0</developerConnection>
+ <url>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.main-1.2.0</url>
+ </scm>
</project>
diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties
index 0d2fe83..4ee7026 100644
--- a/src/main/resources/config.properties
+++ b/src/main/resources/config.properties
@@ -28,9 +28,9 @@
#org.osgi.framework.bootdelegation=sun.*,com.sun.*
#felix.cache.profile=foo
felix.auto.start.1= \
- file:bundle/org.apache.felix.shell-1.1.0-SNAPSHOT.jar \
- file:bundle/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar \
- file:bundle/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar
+ file:bundle/org.apache.felix.shell-1.0.2.jar \
+ file:bundle/org.apache.felix.shell.tui-1.0.2.jar \
+ file:bundle/org.apache.felix.bundlerepository-1.2.0.jar
felix.log.level=4
felix.startlevel.framework=1
felix.startlevel.bundle=1
