[jboss-cvs] JBossAS SVN: r68386 - in projects/ejb3/trunk: ejb3-cache and 2 other directories.

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

Author: pgier
Date: 2007-12-18 15:28:35 -0500 (Tue, 18 Dec 2007)
New Revision: 68386

Modified:
   projects/ejb3/trunk/build/pom.xml
   projects/ejb3/trunk/ejb3-cache/pom.xml
   projects/ejb3/trunk/ejb3-ext-api/pom.xml
   projects/ejb3/trunk/ejb3-impl/pom.xml
Log:
Remove jboss-deploy profile, to fix issue with conflicting profiles

Modified: projects/ejb3/trunk/build/pom.xml
===================================================================
--- projects/ejb3/trunk/build/pom.xml	2007-12-18 19:14:41 UTC (rev 68385)
+++ projects/ejb3/trunk/build/pom.xml	2007-12-18 20:28:35 UTC (rev 68386)
@@ -100,6 +100,24 @@
           <argLine>${maven.test.jvmargs}</argLine>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.jboss.maven.plugins</groupId>
+        <artifactId>maven-jboss-deploy-plugin</artifactId>
+        <version>1.5</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>jboss-deploy</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
+          <groupId>jboss</groupId>
+          <removeArtifactVersion>true</removeArtifactVersion>
+        </configuration>
+        <inherited>true</inherited>
+      </plugin>
     </plugins>
   </build>
 
@@ -213,34 +231,5 @@
         <ejb3.testOutputDirectory>eclipse-target/tests-classes</ejb3.testOutputDirectory>
       </properties>
     </profile>
-    <profile>
-      <!-- This profile is on by default.  To de-activate it, pass the property "skip.jboss.deploy" -->
-      <id>jboss-deploy</id>
-      <activation>
-        <property>
-          <name>!skip.jboss.deploy</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <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>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 </project>

Modified: projects/ejb3/trunk/ejb3-cache/pom.xml
===================================================================
--- projects/ejb3/trunk/ejb3-cache/pom.xml	2007-12-18 19:14:41 UTC (rev 68385)
+++ projects/ejb3/trunk/ejb3-cache/pom.xml	2007-12-18 20:28:35 UTC (rev 68386)
@@ -24,25 +24,7 @@
   </scm>
   <build>
     <plugins>
-      <!-- Normally defined in the parent -->
       <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>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
         <configuration>

Modified: projects/ejb3/trunk/ejb3-ext-api/pom.xml
===================================================================
--- projects/ejb3/trunk/ejb3-ext-api/pom.xml	2007-12-18 19:14:41 UTC (rev 68385)
+++ projects/ejb3/trunk/ejb3-ext-api/pom.xml	2007-12-18 20:28:35 UTC (rev 68386)
@@ -52,28 +52,6 @@
             </configuration>
          </plugin>
 
-         <!-- JBoss Deploy Plugin -->
-         <plugin>
-            <groupId>org.jboss.maven.plugins</groupId>
-            <artifactId>maven-jboss-deploy-plugin</artifactId>
-            <version>1.5</version>
-            <executions>
-               <execution>
-                  <goals>
-                     <goal>jboss-deploy</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <configuration>
-               <jbossDeployRoot>
-                  ${jboss.repository.root}
-               </jbossDeployRoot>
-               <removeArtifactVersion>true</removeArtifactVersion>
-               <groupId>jboss</groupId>
-            </configuration>
-            <inherited>true</inherited>
-         </plugin>
-
       </plugins>
    </build>
 

Modified: projects/ejb3/trunk/ejb3-impl/pom.xml
===================================================================
--- projects/ejb3/trunk/ejb3-impl/pom.xml	2007-12-18 19:14:41 UTC (rev 68385)
+++ projects/ejb3/trunk/ejb3-impl/pom.xml	2007-12-18 20:28:35 UTC (rev 68386)
@@ -54,28 +54,6 @@
             </configuration>
          </plugin>
 
-         <!-- JBoss Deploy Plugin -->
-         <plugin>
-            <groupId>org.jboss.maven.plugins</groupId>
-            <artifactId>maven-jboss-deploy-plugin</artifactId>
-            <version>1.5</version>
-            <executions>
-               <execution>
-                  <goals>
-                     <goal>jboss-deploy</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <configuration>
-               <jbossDeployRoot>
-                  ${jboss.repository.root}
-               </jbossDeployRoot>
-               <removeArtifactVersion>true</removeArtifactVersion>
-               <groupId>jboss</groupId>
-            </configuration>
-            <inherited>true</inherited>
-         </plugin>
-
       </plugins>
    </build>