[jboss-svn-commits] JBL Code SVN: r15982 - in labs/jbossbuild/maven-build-test/trunk: module1 and 1 other directories.

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

Author: pgier
Date: 2007-10-22 11:34:51 -0400 (Mon, 22 Oct 2007)
New Revision: 15982

Modified:
   labs/jbossbuild/maven-build-test/trunk/module1/pom.xml
   labs/jbossbuild/maven-build-test/trunk/module2/module2-2/pom.xml
   labs/jbossbuild/maven-build-test/trunk/pom.xml
Log:


Modified: labs/jbossbuild/maven-build-test/trunk/module1/pom.xml
===================================================================
--- labs/jbossbuild/maven-build-test/trunk/module1/pom.xml	2007-10-22 15:28:58 UTC (rev 15981)
+++ labs/jbossbuild/maven-build-test/trunk/module1/pom.xml	2007-10-22 15:34:51 UTC (rev 15982)
@@ -19,55 +19,6 @@
   </issueManagement>
   <build>
     <plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>javacc-maven-plugin</artifactId>
-				<version>2.2-SNAPSHOT</version>
-				<executions>
-					<execution>
-						<id>jjtree-jbossql</id>
-						<goals>
-							<goal>jjtree</goal>
-						</goals>
-						<phase>generate-sources</phase>
-						<configuration>
-							<sourceDirectory>${project.basedir}/src/main/stuff</sourceDirectory>
-							<!--<nodePackage>goofy</nodePackage>-->
-							<includes>
-								<include>**/JBossQLParser.jjt</include>
-                        <include>**/EJBQLParser.jjt</include>
-							</includes>
-							<staleMillis>0</staleMillis>
-						</configuration>
-					</execution>
-					<execution>
-						<id>jjtree-ejbql</id>
-						<goals>
-							<goal>jjtree</goal>
-						</goals>
-						<phase>generate-sources</phase>
-						<configuration>
-							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-							<nodePackage>org.jboss.ejb.plugins.cmp.ejbql</nodePackage>
-							<includes>
-								<include>**/EJBQLParser.jjt</include>
-							</includes>
-							<staleMillis>1000000000</staleMillis>
-						</configuration>
-					</execution>
-					<execution>
-						<id>javacc</id>
-						<goals>
-							<goal>javacc</goal>
-						</goals>
-						<phase>generate-sources</phase>
-						<configuration>
-							<sourceDirectory>${basedir}/target/generated-sources/jjtree</sourceDirectory>
-							<staleMillis>0</staleMillis>
-						</configuration>						
-					</execution>
-				</executions>
-			</plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
@@ -87,17 +38,6 @@
         <artifactId>maven-source-plugin</artifactId>
         <executions>
           <execution>
-            <id>attach-sources2</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
             <id>attach-sources3</id>
             <goals>
               <goal>jar</goal>
@@ -109,12 +49,12 @@
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
+            <id>test-jar</id>
             <goals>
-              <goal>jar</goal>
+              <goal>test-jar</goal>
             </goals>
             <configuration>
               <classifier>jdk14</classifier>
-              
             </configuration>
           </execution>
         </executions>

Modified: labs/jbossbuild/maven-build-test/trunk/module2/module2-2/pom.xml
===================================================================
--- labs/jbossbuild/maven-build-test/trunk/module2/module2-2/pom.xml	2007-10-22 15:28:58 UTC (rev 15981)
+++ labs/jbossbuild/maven-build-test/trunk/module2/module2-2/pom.xml	2007-10-22 15:34:51 UTC (rev 15982)
@@ -73,6 +73,8 @@
       <groupId>org.jboss.maven.test</groupId>
       <artifactId>maven-build-test-module1</artifactId>
       <version>1.0.6-SNAPSHOT</version>
+      <type>test-jar</type>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.antlr</groupId>

Modified: labs/jbossbuild/maven-build-test/trunk/pom.xml
===================================================================
--- labs/jbossbuild/maven-build-test/trunk/pom.xml	2007-10-22 15:28:58 UTC (rev 15981)
+++ labs/jbossbuild/maven-build-test/trunk/pom.xml	2007-10-22 15:34:51 UTC (rev 15982)
@@ -60,7 +60,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>        
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.0-beta-5</version>          
+        <version>2.0-beta-7-jboss-1</version>          
         <!--<configuration>
           <tagBase>https://svn.jboss.org/repos/labs/labs/jbossbuild/maven-build-test/tags</tagBase>
         </configuration>-->