Skip to content

Commit

Permalink
Cleanup after releases.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@760656 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
karlpauls committed Mar 31, 2009
1 parent c0a7835 commit 51bcc3a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion bundlerepository/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell</artifactId>
<version>1.2.0</version>
<version>1.0.2</version>
</dependency>
<dependency>
<groupId>net.sf.kxml</groupId>
Expand Down
2 changes: 1 addition & 1 deletion framework/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<packaging>bundle</packaging>
<name>Apache Felix Framework</name>
<artifactId>org.apache.felix.framework</artifactId>
<version>1.7.0-SNSNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
Expand Down
14 changes: 7 additions & 7 deletions main/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>1.6.0</version>
<version>1.7.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
Expand All @@ -47,7 +47,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell</artifactId>
<version>1.2.0</version>
<version>1.3.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
Expand All @@ -58,7 +58,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell.tui</artifactId>
<version>1.2.0</version>
<version>1.3.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
Expand Down Expand Up @@ -152,7 +152,7 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>1.6.0</version>
<version>1.7.0-SNAPSHOT</version>
</artifactItem>
</artifactItems>
</configuration>
Expand All @@ -168,23 +168,23 @@
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell</artifactId>
<version>1.2.0</version>
<version>1.3.0-SNAPSHOT</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/bundle</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell.tui</artifactId>
<version>1.2.0</version>
<version>1.3.0-SNAPSHOT</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/bundle</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
<version>1.4.0</version>
<version>1.5.0-SNAPSHOT</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/bundle</outputDirectory>
Expand Down
8 changes: 4 additions & 4 deletions main/src/main/resources/config.properties
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@
#org.osgi.framework.storage.clean=onFirstInit

felix.auto.start.1= \
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
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

felix.log.level=1
felix.log.level=${log.level}

# Sets the initial start level of the framework upon startup.
#org.osgi.framework.startlevel=1
Expand Down
2 changes: 1 addition & 1 deletion shell.tui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell</artifactId>
<version>1.2.0</version>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down

0 comments on commit 51bcc3a

Please sign in to comment.