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/07 21:54:38 UTC
svn commit: r692927 - in /felix/trunk/main: doc/changelog.txt pom.xml
src/main/resources/config.properties src/main/resources/default.properties
Author: pauls
Date: Sun Sep 7 12:54:38 2008
New Revision: 692927
URL: http://svn.apache.org/viewvc?rev=692927&view=rev
Log:
Prepare for 1.2.1 release
Modified:
felix/trunk/main/doc/changelog.txt
felix/trunk/main/pom.xml
felix/trunk/main/src/main/resources/config.properties
felix/trunk/main/src/main/resources/default.properties
Modified: felix/trunk/main/doc/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/main/doc/changelog.txt?rev=692927&r1=692926&r2=692927&view=diff
==============================================================================
--- felix/trunk/main/doc/changelog.txt (original)
+++ felix/trunk/main/doc/changelog.txt Sun Sep 7 12:54:38 2008
@@ -1,3 +1,10 @@
+Changes from 1.2.0 to 1.2.1
+---------------------------
+
+* [2008-09-07] Hide WIRE log messages. (FELIX-707)
+* [2008-09-07] Use the new Felix releases obr repository URL.
+ (FELIX-708)
+
Changes from 1.0.3 to 1.2.0
---------------------------
Modified: felix/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/main/pom.xml?rev=692927&r1=692926&r2=692927&view=diff
==============================================================================
--- felix/trunk/main/pom.xml (original)
+++ felix/trunk/main/pom.xml Sun Sep 7 12:54:38 2008
@@ -27,12 +27,12 @@
<packaging>bundle</packaging>
<name>Apache Felix Main</name>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.1</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.3.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
@@ -131,7 +131,7 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.1</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.3.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=692927&r1=692926&r2=692927&view=diff
==============================================================================
--- felix/trunk/main/src/main/resources/config.properties (original)
+++ felix/trunk/main/src/main/resources/config.properties Sun Sep 7 12:54:38 2008
@@ -28,10 +28,10 @@
#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.3.0-SNAPSHOT.jar
-felix.log.level=4
+ 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=1
felix.startlevel.framework=1
felix.startlevel.bundle=1
#felix.service.urlhandlers=false
@@ -41,7 +41,7 @@
#
org.osgi.service.http.port=8080
osgi.shell.telnet=on
-#obr.repository.url=http://bundles.osgi.org/obr/browse?_xml=1&cmd=repository
+obr.repository.url=http://felix.apache.org/obr/releases.xml
#
Modified: felix/trunk/main/src/main/resources/default.properties
URL: http://svn.apache.org/viewvc/felix/trunk/main/src/main/resources/default.properties?rev=692927&r1=692926&r2=692927&view=diff
==============================================================================
--- felix/trunk/main/src/main/resources/default.properties (original)
+++ felix/trunk/main/src/main/resources/default.properties Sun Sep 7 12:54:38 2008
@@ -27,7 +27,7 @@
#org.osgi.framework.bootdelegation=sun.*,com.sun.*
#felix.cache.profile=foo
-felix.log.level=4
+felix.log.level=1
felix.startlevel.framework=1
felix.startlevel.bundle=1
#framework.service.urlhandlers=false