dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7781
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-07-31 11:03:22 +0200
message:
  moved ant-task to create build.properties (revno) from dhis-web-commons to dhis-2 (workaround for a bug in jenkins clone workspace)
modified:
  dhis-2/dhis-web/dhis-web-commons/pom.xml
  dhis-2/pom.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-commons/pom.xml'
--- dhis-2/dhis-web/dhis-web-commons/pom.xml	2012-05-10 09:57:03 +0000
+++ dhis-2/dhis-web/dhis-web-commons/pom.xml	2012-07-31 09:03:22 +0000
@@ -11,37 +11,6 @@
   <packaging>jar</packaging>
   <name>DHIS Common Functionality for Web</name>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.6</version>
-        <executions>
-          <execution>
-            <phase>generate-resources</phase>
-            <configuration>
-              <target>
-                <tstamp>
-                  <format property="now" pattern="yyyy-MM-dd HH:mm:ss" />
-                </tstamp>
-                <mkdir dir="${project.build.outputDirectory}" />
-                <exec executable="bzr" outputproperty="revision" failifexecutionfails="false">
-                  <arg value="revno" />
-                </exec>
-                <echo file="${project.build.outputDirectory}/build.properties"
-                  message="build.version = ${project.version}&#10;build.time = ${now}&#10;build.revision = ${revision}&#10;" />
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
   <dependencies>
 
     <!-- DHIS -->

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2012-07-20 10:26:03 +0000
+++ dhis-2/pom.xml	2012-07-31 09:03:22 +0000
@@ -127,6 +127,7 @@
 
   <build>
     <plugins>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -137,6 +138,7 @@
           <encoding>${project.build.sourceEncoding}</encoding>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -151,6 +153,7 @@
           <argLine>-Xmx256m</argLine>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
@@ -159,6 +162,7 @@
           <encoding>${project.build.sourceEncoding}</encoding>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
@@ -170,6 +174,34 @@
           <excludeFilterFile>${rootDir}findbugs-exclude.xml</excludeFilterFile>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.6</version>
+        <executions>
+          <execution>
+            <phase>generate-resources</phase>
+            <configuration>
+              <target>
+                <tstamp>
+                  <format property="now" pattern="yyyy-MM-dd HH:mm:ss" />
+                </tstamp>
+                <mkdir dir="${project.build.outputDirectory}" />
+                <exec executable="bzr" outputproperty="revision" failifexecutionfails="false">
+                  <arg value="revno" />
+                </exec>
+                <echo file="${project.build.outputDirectory}/build.properties"
+                  message="build.version = ${project.version}&#10;build.time = ${now}&#10;build.revision = ${revision}&#10;" />
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>