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 2007/07/19 21:09:55 UTC
svn commit: r557741 - in /felix/trunk/main: pom.xml
src/main/resources/config.properties
Author: pauls
Date: Thu Jul 19 12:09:54 2007
New Revision: 557741
URL: http://svn.apache.org/viewvc?view=rev&rev=557741
Log:
Prepare the main subproject for the 1.0.0 release.
Modified:
felix/trunk/main/pom.xml
felix/trunk/main/src/main/resources/config.properties
Modified: felix/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/main/pom.xml?view=diff&rev=557741&r1=557740&r2=557741
==============================================================================
--- felix/trunk/main/pom.xml (original)
+++ felix/trunk/main/pom.xml Thu Jul 19 12:09:54 2007
@@ -20,19 +20,19 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix Main</name>
<artifactId>org.apache.felix.main</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
@@ -49,7 +49,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
@@ -60,7 +60,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell.tui</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
@@ -71,7 +71,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
@@ -92,7 +92,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -107,6 +107,64 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>1.0.0</version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy</id>
+ <phase>install</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.apache.felix.shell</artifactId>
+ <version>1.0.0</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.0.0</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.0.0</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/bundle</outputDirectory >
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -118,17 +176,12 @@
<delete dir="${basedir}/conf"/>
<mkdir dir="${basedir}/conf"/>
<delete dir="${basedir}/bundle"/>
- <mkdir dir="${basedir}/bundle"/>
-<copy file="${basedir}/target/org.apache.felix.main-${pom.version}.jar"
- tofile="${basedir}/bin/felix.jar"/>
-<copy file="${basedir}/target/classes/config.properties"
- todir="${basedir}/conf"/>
-<copy file="${basedir}/../shell/target/org.apache.felix.shell-1.1.0-SNAPSHOT.jar"
- todir="${basedir}/bundle"/>
-<copy file="${basedir}/../shell.tui/target/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar"
- todir="${basedir}/bundle"/>
-<copy file="${basedir}/../bundlerepository/target/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar"
- todir="${basedir}/bundle"/>
+ <copy file="${basedir}/target/org.apache.felix.main-${pom.version}.jar"
+ tofile="${basedir}/bin/felix.jar"/>
+ <copy file="${basedir}/target/classes/config.properties"
+ todir="${basedir}/conf"/>
+ <move file="${basedir}/target/bundle"
+ todir="${basedir}"/>
</tasks>
</configuration>
<goals>
Modified: felix/trunk/main/src/main/resources/config.properties
URL: http://svn.apache.org/viewvc/felix/trunk/main/src/main/resources/config.properties?view=diff&rev=557741&r1=557740&r2=557741
==============================================================================
--- felix/trunk/main/src/main/resources/config.properties (original)
+++ felix/trunk/main/src/main/resources/config.properties Thu Jul 19 12:09:54 2007
@@ -28,9 +28,9 @@
#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.1.0-SNAPSHOT.jar
+ file:bundle/org.apache.felix.shell-1.0.0.jar \
+ file:bundle/org.apache.felix.shell.tui-1.0.0.jar \
+ file:bundle/org.apache.felix.bundlerepository-1.0.0.jar
felix.log.level=4
felix.startlevel.framework=1
felix.startlevel.bundle=1