cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1429035 - in /cxf/branches/2.5.x-fixes: api/pom.xml common/common/pom.xml
Date Fri, 04 Jan 2013 19:00:34 GMT
Author: dkulp
Date: Fri Jan  4 19:00:34 2013
New Revision: 1429035

URL: http://svn.apache.org/viewvc?rev=1429035&view=rev
Log:
Fix buildnumber stuff on 2.5.x

Modified:
    cxf/branches/2.5.x-fixes/api/pom.xml
    cxf/branches/2.5.x-fixes/common/common/pom.xml

Modified: cxf/branches/2.5.x-fixes/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/api/pom.xml?rev=1429035&r1=1429034&r2=1429035&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/api/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/api/pom.xml Fri Jan  4 19:00:34 2013
@@ -33,10 +33,6 @@
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
-    <properties>
-        <buildnumber.connection.url>${project.scm.developerConnection}</buildnumber.connection.url>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -95,36 +91,7 @@
     </dependencies>
 
     <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>buildnumber-maven-plugin</artifactId>
-                <version>1.2</version>
-                <executions>
-                    <execution>
-                        <id>create-noncanonicalrev</id>
-                            <goals>
-                                <goal>create-timestamp</goal>
-                            </goals>
-                        <configuration>
-                            <timestampFormat>'NON-CANONICAL_'yyyy-MM-dd_HH-mm_'${user.name}'</timestampFormat>
-                            <timestampPropertyName>nonCanonicalRevision</timestampPropertyName>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>create-buildnumber</id>
-                            <goals>
-                                <goal>create</goal>
-                            </goals>
-                            <configuration>
-                                <doCheck>false</doCheck>
-                                <doUpdate>false</doUpdate>
-                                <urlScm>${buildnumber.connection.url}</urlScm>
-                                <revisionOnScmFailure>${nonCanonicalRevision}</revisionOnScmFailure>
-                            </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+        <plugins>  
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-xjc-plugin</artifactId>
@@ -272,18 +239,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <!-- default profile enables javadoc stuff -->
-            <id>git.build.number</id>
-            <activation>
-                <file>
-                    <exists>../.git</exists>
-                </file>
-            </activation>
-            <properties>
-                <buildnumber.connection.url>scm:git:http://</buildnumber.connection.url>
-            </properties>
-        </profile>
     </profiles>
 
 </project>

Modified: cxf/branches/2.5.x-fixes/common/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/common/common/pom.xml?rev=1429035&r1=1429034&r2=1429035&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/common/common/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/common/common/pom.xml Fri Jan  4 19:00:34 2013
@@ -32,7 +32,9 @@
         <version>2.5.8-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
-
+    <properties>
+        <buildnumber.connection.url>${project.scm.developerConnection}</buildnumber.connection.url>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -122,7 +124,39 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <version>1.2</version>
+                <executions>
+                    <execution>
+                        <id>create-noncanonicalrev</id>
+                            <goals>
+                                <goal>create-timestamp</goal>
+                            </goals>
+                        <configuration>
+                            <timestampFormat>'NON-CANONICAL_'yyyy-MM-dd_HH-mm_'${user.name}'</timestampFormat>
+                            <timestampPropertyName>nonCanonicalRevision</timestampPropertyName>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>create-buildnumber</id>
+                            <goals>
+                                <goal>create</goal>
+                            </goals>
+                            <configuration>
+                                <doCheck>false</doCheck>
+                                <doUpdate>false</doUpdate>
+                                <urlScm>${buildnumber.connection.url}</urlScm>
+                                <revisionOnScmFailure>${nonCanonicalRevision}</revisionOnScmFailure>
+                            </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
     <profiles>
         <profile>
             <id>jdk15</id>
@@ -176,6 +210,18 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <!-- default profile enables javadoc stuff -->
+            <id>git.build.number</id>
+            <activation>
+                <file>
+                    <exists>../../../.git</exists>
+                </file>
+            </activation>
+            <properties>
+                <buildnumber.connection.url>scm:git:http://</buildnumber.connection.url>
+            </properties>
+        </profile>
     </profiles>
 
 </project>



Mime
View raw message