Prepare 1.8.0 release
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk/main@773423 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/doc/changelog.txt b/doc/changelog.txt
index a1ef056..b83235d 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,8 +1,14 @@
+Changes form 1.6.1 to 1.8.0
+---------------------------
+
+** Improvement
+ * Update to latest framework version 1.8.0
+
Changes from 1.6.0 to 1.6.1
---------------------------
** Improvement
- * Update to latest framework version 1.6.1
+ * Update to latest framework version 1.6.1
Changes from 1.4.1 to 1.6.0
---------------------------
diff --git a/pom.xml b/pom.xml
index e03dd60..00f3e26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>felix</artifactId>
- <version>1.0.4</version>
+ <artifactId>felix-parent</artifactId>
+ <version>1.2.0</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.7.0-SNAPSHOT</version>
+ <version>1.8.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.3.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
@@ -62,7 +62,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>
@@ -73,7 +73,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>
@@ -91,7 +91,7 @@
</dependency>
</dependencies>
<properties>
- <log.level>4</log.level>
+ <log.level>1</log.level>
<dollar>$</dollar>
</properties>
<profiles>
@@ -157,7 +157,7 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0</version>
</artifactItem>
</artifactItems>
</configuration>
@@ -173,7 +173,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>
@@ -181,7 +181,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>
@@ -189,7 +189,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/src/main/resources/config.properties b/src/main/resources/config.properties
index 66c91c1..2dc4a73 100644
--- a/src/main/resources/config.properties
+++ b/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}
