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 2009/03/31 23:10:20 UTC
svn commit: r760640 - in /felix/trunk/main: NOTICE doc/changelog.txt pom.xml
src/main/resources/config.properties
Author: pauls
Date: Tue Mar 31 21:10:19 2009
New Revision: 760640
URL: http://svn.apache.org/viewvc?rev=760640&view=rev
Log:
Update changelog and prepare 1.6.0 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=760640&r1=760639&r2=760640&view=diff
==============================================================================
--- felix/trunk/main/NOTICE (original)
+++ felix/trunk/main/NOTICE Tue Mar 31 21:10:19 2009
@@ -21,6 +21,9 @@
Copyright (c) OSGi Alliance (2000, 2007).
Licensed under the Apache License 2.0.
+This product uses software developed at
+The Codehaus (http://www.codehaus.org)
+Licensed under the Apache License 2.0.
III. License Summary
- Apache License 2.0
Modified: felix/trunk/main/doc/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/main/doc/changelog.txt?rev=760640&r1=760639&r2=760640&view=diff
==============================================================================
--- felix/trunk/main/doc/changelog.txt (original)
+++ felix/trunk/main/doc/changelog.txt Tue Mar 31 21:10:19 2009
@@ -1,3 +1,9 @@
+Changes from 1.4.1 to 1.6.0
+---------------------------
+
+** Improvement
+ * Update to latest framework version 1.6.0
+
Changes from 1.4.0 to 1.4.1
---------------------------
Modified: felix/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/main/pom.xml?rev=760640&r1=760639&r2=760640&view=diff
==============================================================================
--- felix/trunk/main/pom.xml (original)
+++ felix/trunk/main/pom.xml Tue Mar 31 21:10:19 2009
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
- <version>1.0.2</version>
+ <version>1.0.4</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -32,7 +32,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.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.2.0</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.2.0</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
@@ -69,7 +69,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
@@ -122,6 +122,21 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -137,7 +152,7 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0</version>
</artifactItem>
</artifactItems>
</configuration>
@@ -153,7 +168,7 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/bundle</outputDirectory>
@@ -161,7 +176,7 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell.tui</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/bundle</outputDirectory>
@@ -169,7 +184,7 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.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=760640&r1=760639&r2=760640&view=diff
==============================================================================
--- felix/trunk/main/src/main/resources/config.properties (original)
+++ felix/trunk/main/src/main/resources/config.properties Tue Mar 31 21:10:19 2009
@@ -49,11 +49,11 @@
#org.osgi.framework.storage.clean=onFirstInit
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.3.0-SNAPSHOT.jar
+ file:bundle/org.apache.felix.shell-1.2.0.jar \
+ file:bundle/org.apache.felix.shell.tui-1.2.0.jar \
+ file:bundle/org.apache.felix.bundlerepository-1.4.0.jar
-felix.log.level=${log.level}
+felix.log.level=1
# Sets the initial start level of the framework upon startup.
#org.osgi.framework.startlevel=1