Prepare 1.6.1 release
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@768781 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main/doc/changelog.txt b/main/doc/changelog.txt
index 3fb7901..a1ef056 100644
--- a/main/doc/changelog.txt
+++ b/main/doc/changelog.txt
@@ -1,3 +1,9 @@
+Changes from 1.6.0 to 1.6.1
+---------------------------
+
+** Improvement
+ * Update to latest framework version 1.6.1
+
Changes from 1.4.1 to 1.6.0
---------------------------
diff --git a/main/pom.xml b/main/pom.xml
index 9b212e5..a810955 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.6.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.3.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.3.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.5.0-SNAPSHOT</version>
+ <version>1.4.0</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
@@ -87,7 +87,7 @@
</dependency>
</dependencies>
<properties>
- <log.level>4</log.level>
+ <log.level>1</log.level>
<dollar>$</dollar>
</properties>
<profiles>
@@ -95,6 +95,7 @@
<id>release</id>
<properties>
<log.level>1</log.level>
+ <dollar>$</dollar>
</properties>
</profile>
</profiles>
@@ -152,7 +153,7 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.6.1</version>
</artifactItem>
</artifactItems>
</configuration>
@@ -168,7 +169,7 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/bundle</outputDirectory>
@@ -176,7 +177,7 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell.tui</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/bundle</outputDirectory>
@@ -184,7 +185,7 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.4.0</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/bundle</outputDirectory>
diff --git a/main/src/main/resources/config.properties b/main/src/main/resources/config.properties
index 66c91c1..2dc4a73 100644
--- a/main/src/main/resources/config.properties
+++ b/main/src/main/resources/config.properties
@@ -49,9 +49,9 @@
#org.osgi.framework.storage.clean=onFirstInit
felix.auto.start.1= \
- file:bundle/org.apache.felix.shell-1.3.0-SNAPSHOT.jar \
- file:bundle/org.apache.felix.shell.tui-1.3.0-SNAPSHOT.jar \
- file:bundle/org.apache.felix.bundlerepository-1.5.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}