incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r930210 - /incubator/aries/trunk/parent/default-parent/pom.xml
Date Fri, 02 Apr 2010 09:43:38 GMT
Author: gnodet
Date: Fri Apr  2 09:43:38 2010
New Revision: 930210

URL: http://svn.apache.org/viewvc?rev=930210&view=rev
Log:
Use released version of maven bundle plugin by hacking around the missing goal

Modified:
    incubator/aries/trunk/parent/default-parent/pom.xml

Modified: incubator/aries/trunk/parent/default-parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/parent/default-parent/pom.xml?rev=930210&r1=930209&r2=930210&view=diff
==============================================================================
--- incubator/aries/trunk/parent/default-parent/pom.xml (original)
+++ incubator/aries/trunk/parent/default-parent/pom.xml Fri Apr  2 09:43:38 2010
@@ -309,7 +309,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.1.0-SNAPSHOT</version>
+                <version>2.0.1</version>
                 <extensions>true</extensions>
                 <inherited>true</inherited>
                 <configuration>
@@ -341,7 +341,7 @@
                         <aries.osgi.version.clean>${project.version}</aries.osgi.version.clean>
                     </versions>
                 </configuration>
-                
+                <!--
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -350,8 +350,74 @@
                         </goals>
                     </execution>
                 </executions>
+				-->
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+				<version>1.2</version>
+		        <inherited>true</inherited>
+                <executions>
+                    <execution>
+                        <id>create-prop</id>
+			            <phase>initialize</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="${project.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="aries.osgi.version.clean = ${ov}" file="target/aries.osgi.version.txt"
/>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+		        <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>
+	      	<plugin>
+	        	<groupId>org.codehaus.mojo</groupId>
+	        	<artifactId>properties-maven-plugin</artifactId>
+	        	<inherited>true</inherited>
+	        	<executions>
+	          		<execution>
+	            		<phase>initialize</phase>
+	            		<goals>
+	              			<goal>read-project-properties</goal>
+	            		</goals>
+	            		<configuration>
+	              			<files>
+	                			<file>target/aries.osgi.version.txt</file>
+	              			</files>
+	            		</configuration>
+	          		</execution>
+	        	</executions>
+	      	</plugin>
         </plugins>
     </build>
 



Mime
View raw message