refactored POMs

jenkinsci · Jan 3, 2013 · e4424be · e4424be
1 parent 3c4479f
commit e4424be
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 59 deletions.
diff --git a/jenkow-activiti-designer/pom.xml b/jenkow-activiti-designer/pom.xml
@@ -61,12 +61,6 @@ THE SOFTWARE.
     <url>https://github.com/jenkinsci/jenkow-plugin</url>
   </scm>
 
-  <properties>
-    <build_id>${buildId}</build_id>
-    <mdep.stripVersion>true</mdep.stripVersion>
-    <jenkow.test.git>git</jenkow.test.git>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>com.cisco.step.jenkins.plugins</groupId>
@@ -91,29 +85,6 @@ THE SOFTWARE.
     </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>no-build-number-given</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <buildId>${maven.build.timestamp}-unknown</buildId>
-      </properties>
-    </profile>
-    <profile>
-      <id>build-number-given</id>
-      <activation>
-        <property>
-          <name>env.BUILD_NUMBER</name>
-        </property>
-      </activation>
-      <properties>
-        <buildId>${maven.build.timestamp}-${env.BUILD_NUMBER}</buildId>
-      </properties>
-    </profile>
-  </profiles>
-
   <build>
     <plugins>
       <plugin>

diff --git a/jenkow-plugin/pom.xml b/jenkow-plugin/pom.xml
@@ -61,12 +61,6 @@ THE SOFTWARE.
     <url>https://github.com/jenkinsci/jenkow-plugin</url>
   </scm>
 
-  <properties>
-    <build_id>${buildId}</build_id>
-    <mdep.stripVersion>true</mdep.stripVersion>
-    <jenkow.test.git>git</jenkow.test.git>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>com.cisco.step.jenkins.plugins</groupId>
@@ -143,29 +137,6 @@ THE SOFTWARE.
     </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>no-build-number-given</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <buildId>${maven.build.timestamp}-unknown</buildId>
-      </properties>
-    </profile>
-    <profile>
-      <id>build-number-given</id>
-      <activation>
-        <property>
-          <name>env.BUILD_NUMBER</name>
-        </property>
-      </activation>
-      <properties>
-        <buildId>${maven.build.timestamp}-${env.BUILD_NUMBER}</buildId>
-      </properties>
-    </profile>
-  </profiles>
-
   <build>
     <testResources>
       <testResource>

diff --git a/pom.xml b/pom.xml
@@ -80,8 +80,11 @@ THE SOFTWARE.
     <groovy.version>1.8.6</groovy.version>
     <spring.framework.version>3.1.2.RELEASE</spring.framework.version>
     <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
+    <build_id>${buildId}</build_id>
+    <mdep.stripVersion>true</mdep.stripVersion>
+    <jenkow.test.git>git</jenkow.test.git>
   </properties>
-  
+
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -282,4 +285,27 @@ THE SOFTWARE.
     </pluginRepository>
   </pluginRepositories>
 
+  <profiles>
+    <profile>
+      <id>no-build-number-given</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <buildId>${maven.build.timestamp}-unknown</buildId>
+      </properties>
+    </profile>
+    <profile>
+      <id>build-number-given</id>
+      <activation>
+        <property>
+          <name>env.BUILD_NUMBER</name>
+        </property>
+      </activation>
+      <properties>
+        <buildId>${maven.build.timestamp}-${env.BUILD_NUMBER}</buildId>
+      </properties>
+    </profile>
+  </profiles>
+
 </project>