You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2008/09/01 00:15:51 UTC
svn commit: r690799 - in /felix/trunk/main: NOTICE doc/changelog.txt pom.xml
src/main/resources/config.properties
Author: pauls
Date: Sun Aug 31 15:15:50 2008
New Revision: 690799
URL: http://svn.apache.org/viewvc?rev=690799&view=rev
Log:
Prepare the Felix 1.2 release.
Modified:
felix/trunk/main/NOTICE
felix/trunk/main/doc/changelog.txt
felix/trunk/main/pom.xml
felix/trunk/main/src/main/resources/config.properties
Modified: felix/trunk/main/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/main/NOTICE?rev=690799&r1=690798&r2=690799&view=diff
==============================================================================
--- felix/trunk/main/NOTICE (original)
+++ felix/trunk/main/NOTICE Sun Aug 31 15:15:50 2008
@@ -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.
Modified: felix/trunk/main/doc/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/main/doc/changelog.txt?rev=690799&r1=690798&r2=690799&view=diff
==============================================================================
--- felix/trunk/main/doc/changelog.txt (original)
+++ felix/trunk/main/doc/changelog.txt Sun Aug 31 15:15:50 2008
@@ -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
---------------------------
Modified: felix/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/main/pom.xml?rev=690799&r1=690798&r2=690799&view=diff
==============================================================================
--- felix/trunk/main/pom.xml (original)
+++ felix/trunk/main/pom.xml Sun Aug 31 15:15:50 2008
@@ -32,7 +32,7 @@
<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>
Modified: felix/trunk/main/src/main/resources/config.properties
URL: http://svn.apache.org/viewvc/felix/trunk/main/src/main/resources/config.properties?rev=690799&r1=690798&r2=690799&view=diff
==============================================================================
--- felix/trunk/main/src/main/resources/config.properties (original)
+++ felix/trunk/main/src/main/resources/config.properties Sun Aug 31 15:15:50 2008
@@ -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