[jboss-cvs] JBossAS SVN: r68199 - in projects/javaee/trunk: build and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: pgier
Date: 2007-12-12 15:26:01 -0500 (Wed, 12 Dec 2007)
New Revision: 68199

Modified:
   projects/javaee/trunk/build/pom.xml
   projects/javaee/trunk/pom.xml
Log:
Moving the jboss deploy to the aggregate since the ant repo only needs the combined jar.  Moved the assembly to a profile so that hudson can skip it without crashing.

Modified: projects/javaee/trunk/build/pom.xml
===================================================================
--- projects/javaee/trunk/build/pom.xml	2007-12-12 20:12:23 UTC (rev 68198)
+++ projects/javaee/trunk/build/pom.xml	2007-12-12 20:26:01 UTC (rev 68199)
@@ -20,20 +20,7 @@
   </scm>
 
   <properties>
-    <!-- The unique build id for the javaee release -->
-    <build.id>-SNAPSHOT</build.id>
     <version.jboss.common.core>2.2.1.GA</version.jboss.common.core>
-    <version.jboss-ejb-api>3.0.0${build.id}</version.jboss-ejb-api>
-    <version.jboss-jacc-api>1.1.0${build.id}</version.jboss-jacc-api>
-    <version.jboss-jad-api>1.2.0${build.id}</version.jboss-jad-api>
-    <version.jboss-jaspi-api>1.0.0${build.id}</version.jboss-jaspi-api>
-    <version.jboss-jaxr-api>1.0.0${build.id}</version.jboss-jaxr-api>
-    <version.jboss-jaxs-api>1.2.0${build.id}</version.jboss-jaxs-api>
-    <version.jboss-jca-api>1.5.0${build.id}</version.jboss-jca-api>
-    <version.jboss-jms-api>1.1.0${build.id}</version.jboss-jms-api>
-    <version.jboss-persistence-api>3.0.0${build.id}</version.jboss-persistence-api>
-    <version.jboss-servlet-api>2.5.0${build.id}</version.jboss-servlet-api>
-    <version.jboss-transaction-api>1.0.1${build.id}</version.jboss-transaction-api>
   </properties>
 
   <build>
@@ -84,23 +71,6 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.jboss.maven.plugins</groupId>
-        <artifactId>maven-jboss-deploy-plugin</artifactId>
-        <version>1.4</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>jboss-deploy</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
-          <groupId>jboss</groupId>
-        </configuration>
-        <inherited>true</inherited>
-      </plugin>
-      <plugin>
         <artifactId>maven-release-plugin</artifactId>
         <configuration>
            <tagBase>https://svn.jboss.org/repos/jbossas/projects/javaee/tags</tagBase>

Modified: projects/javaee/trunk/pom.xml
===================================================================
--- projects/javaee/trunk/pom.xml	2007-12-12 20:12:23 UTC (rev 68198)
+++ projects/javaee/trunk/pom.xml	2007-12-12 20:26:01 UTC (rev 68199)
@@ -20,36 +20,6 @@
     <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/javaee/trunk</developerConnection>
   </scm>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-1</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>attached</goal>
-            </goals>
-            <phase>package</phase>
-          </execution>
-        </executions>
-        <configuration>
-          <descriptors>
-            <descriptor>build/assembly/bin.xml</descriptor>
-            <descriptor>build/assembly/sources.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <inherited>false</inherited>
-      </plugin>
-      <plugin>
-        <artifactId>maven-release-plugin</artifactId>
-        <configuration>
-           <tagBase>https://svn.jboss.org/repos/jbossas/projects/javaee/tags</tagBase>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
   <modules>
     <module>build</module>
     <module>jboss-ejb-api</module>
@@ -64,5 +34,62 @@
     <module>jboss-transaction-api</module>
     <module>jboss-jaspi-api</module>
   </modules>
-
+  
+  <profiles>
+    <profile>
+      <id>assembly</id>
+      <activation>
+        <property>
+          <name>!skip.assembly</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>2.2-beta-1</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>attached</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <descriptors>
+                <descriptor>build/assembly/bin.xml</descriptor>
+                <descriptor>build/assembly/sources.xml</descriptor>
+              </descriptors>
+            </configuration>
+            <inherited>false</inherited>
+          </plugin>
+          <plugin>
+            <artifactId>maven-release-plugin</artifactId>
+            <configuration>
+               <tagBase>https://svn.jboss.org/repos/jbossas/projects/javaee/tags</tagBase>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.jboss.maven.plugins</groupId>
+            <artifactId>maven-jboss-deploy-plugin</artifactId>
+            <version>1.4</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>jboss-deploy</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
+              <groupId>jboss</groupId>
+            </configuration>
+            <inherited>true</inherited>
+          </plugin>
+        </plugins>    
+      </build>
+    </profile>
+  </profiles>
 </project>
\ No newline at end of file