You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2009/09/23 12:12:00 UTC
svn commit: r818034 - in /servicemix/smx4/features/trunk: assembly/pom.xml
assembly/src/main/filtered-resources/etc/config.properties pom.xml
Author: gnodet
Date: Wed Sep 23 10:12:00 2009
New Revision: 818034
URL: http://svn.apache.org/viewvc?rev=818034&view=rev
Log:
Upgrade to current karaf snapshot while waiting for the release
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/config.properties
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=818034&r1=818033&r2=818034&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Wed Sep 23 10:12:00 2009
@@ -868,8 +868,44 @@
</includes>
</resource>
</resources>
+ <filters>
+ <filter>target/filter.txt</filter>
+ </filters>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-prop</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <tasks>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath"/>
+ <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp"/>
+ <property name="mv" value="${felix.karaf.version}"/>
+ <echo message="Maven version: ${mv}" />
+ <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0"/>
+ <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0"/>
+ <propertyregex property="ov.p3" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\3" defaultValue=".0"/>
+ <propertyregex property="ov.p4" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\4" defaultValue=""/>
+ <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)" replace="\1" defaultValue="0"/>
+ <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0"/>
+ <propertyregex property="ov.p3a" input="${ov.p3}" regexp="(\..+)" replace="\1" defaultValue=".0"/>
+ <propertyregex property="ov.p4a" input="${ov.p4}" regexp="(\..+)" replace="\1" defaultValue=""/>
+ <property name="ov" value="${ov.p1a}${ov.p2a}${ov.p3a}${ov.p4a}"/>
+ <echo message="OSGi version: ${ov}" />
+ <mkdir dir="target"/>
+ <echo message="karaf.osgi.version = ${ov}" file="target/filter.txt"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix.karaf.tooling</groupId>
<artifactId>features-maven-plugin</artifactId>
<version>${felix.karaf.version}</version>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/config.properties?rev=818034&r1=818033&r2=818034&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/config.properties (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/config.properties Wed Sep 23 10:12:00 2009
@@ -38,8 +38,8 @@
${jre-${java.specification.version}}
org.osgi.framework.system.packages.extra=\
- org.apache.felix.karaf.jaas.boot; version=0.9.0, \
- org.apache.felix.karaf.version; version=0.9.0
+ org.apache.felix.karaf.jaas.boot; version=${karaf.osgi.version}, \
+ org.apache.felix.karaf.version; version=${karaf.osgi.version}
org.osgi.framework.bootdelegation=sun.*,com.sun.management*
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=818034&r1=818033&r2=818034&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Sep 23 10:12:00 2009
@@ -99,7 +99,7 @@
<felix.core.version>1.4.0</felix.core.version>
<felix.fileinstall.version>2.0.0</felix.fileinstall.version>
<felix.framework.version>2.0.0</felix.framework.version>
- <felix.karaf.version>0.9.0-SNAPSHOT</felix.karaf.version>
+ <felix.karaf.version>1.1.0-SNAPSHOT</felix.karaf.version>
<felix.osgi.version>1.2.0</felix.osgi.version>
<felix.plugin.version>1.4.1</felix.plugin.version>
<felix.prefs.version>1.0.2</felix.prefs.version>
@@ -665,6 +665,23 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven.assembly.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-optional</artifactId>
+ <version>1.5.3-1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>