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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Apr 24 14:20:38 EDT 2008


Author: pgier
Date: 2008-04-24 14:20:37 -0400 (Thu, 24 Apr 2008)
New Revision: 19708

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



Property changes on: labs/jbossbuild/maven-build-test/trunk/module1
___________________________________________________________________
Name: svn:ignore
   + target


Modified: labs/jbossbuild/maven-build-test/trunk/module1/pom.xml
===================================================================
--- labs/jbossbuild/maven-build-test/trunk/module1/pom.xml	2008-04-24 14:38:20 UTC (rev 19707)
+++ labs/jbossbuild/maven-build-test/trunk/module1/pom.xml	2008-04-24 18:20:37 UTC (rev 19708)
@@ -18,65 +18,55 @@
     <url>http://jira.jboss.org</url>
   </issueManagement>
   <build>
+    <finalName>junk.ejb1</finalName>
     <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <forkMode>never</forkMode>
-          
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources1</id>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources3</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.2-jboss-1</version>
-        <executions>
-          <execution>
-            <id>test-jar</id>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-            <configuration>
-              <classifier>jdk14</classifier>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      
-        <!--<plugin>
-          <groupId>org.jboss.maven.plugins</groupId>
-          <artifactId>maven-jboss-deploy-plugin</artifactId>
-          <version>1.3-SNAPSHOT</version>
-          <executions>
-            <execution>
-              <goals>
-                <goal>jboss-deploy</goal>
-              </goals>
-            </execution>
-          </executions>
-          <configuration>
-            <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
-          </configuration>
-        </plugin>-->
+			<!--<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>javacc-maven-plugin</artifactId>
+				<version>2.3-SNAPSHOT</version>
+				<executions>
+					<execution>
+						<id>jjtree-jbossql</id>
+						<goals>
+							<goal>jjtree</goal>
+						</goals>
+						<phase>generate-sources</phase>
+						<configuration>
+							<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+							<nodePackage>org.jboss.ejb.plugins.cmp.ejbql</nodePackage>
+							<excludes>
+								<exclude>**/EJBQLParser.jjt</exclude>
+							</excludes>
+						</configuration>
+					</execution>
+					<execution>
+						<id>jjtree-ejbql</id>
+						<goals>
+							<goal>jjtree</goal>
+						</goals>
+						<phase>generate-sources</phase>
+						<configuration>
+							<sourceDirectory>src/main/stuff</sourceDirectory>
+							<nodePackage>org.jboss.ejb.plugins.cmp.ejbql</nodePackage>
+							<excludes>
+								<exclude>**/JBossQLParser.jjt</exclude>
+							</excludes>
+						</configuration>
+					</execution>
+					<execution>
+						<id>javacc</id>
+						<goals>
+							<goal>javacc</goal>
+						</goals>
+						<phase>generate-sources</phase>
+						<configuration>
+							<sourceDirectory>${project.build.directory}/generated-sources/jjtree/</sourceDirectory>
+							<packageName>org.jboss.ejb.plugins.cmp.ejbql</packageName>
+							<staleMillis>0</staleMillis>
+						</configuration>						
+					</execution>
+				</executions>
+			</plugin>-->
       <!--<plugin>
         <groupId>org.apache.maven.plugins</groupId>        
         <artifactId>maven-release-plugin</artifactId>
@@ -159,11 +149,20 @@
         </dependency>
       </dependencies>-->
     </profile>
-    
+    <profile>
+      <id>junk-profile</id>
+      <activation>
+        <property>
+          <name>activateJunk</name>
+          <value>something</value>
+        </property>
+        
+      </activation>
+    </profile>
   </profiles>
   <properties>
     <antlrVersion>2.7.5</antlrVersion>
-    
+    <activateJunk>something</activateJunk>
   </properties>
    <pluginRepositories>
       <pluginRepository>


Property changes on: labs/jbossbuild/maven-build-test/trunk/module2/module2-1
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: labs/jbossbuild/maven-build-test/trunk/module2/module2-2
___________________________________________________________________
Name: svn:ignore
   + target


Modified: labs/jbossbuild/maven-build-test/trunk/module2/module2-2/pom.xml
===================================================================
--- labs/jbossbuild/maven-build-test/trunk/module2/module2-2/pom.xml	2008-04-24 14:38:20 UTC (rev 19707)
+++ labs/jbossbuild/maven-build-test/trunk/module2/module2-2/pom.xml	2008-04-24 18:20:37 UTC (rev 19708)
@@ -75,13 +75,13 @@
       <version>1.0.6-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
+    <!--<dependency>
       <groupId>org.jboss.maven.test</groupId>
       <artifactId>maven-build-test-module1</artifactId>
       <version>1.0.6-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>compile</scope>
-    </dependency>
+    </dependency>-->
     <!--<dependency>
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-kernel</artifactId>

Modified: labs/jbossbuild/maven-build-test/trunk/pom.xml
===================================================================
--- labs/jbossbuild/maven-build-test/trunk/pom.xml	2008-04-24 14:38:20 UTC (rev 19707)
+++ labs/jbossbuild/maven-build-test/trunk/pom.xml	2008-04-24 18:20:37 UTC (rev 19708)
@@ -1,9 +1,4 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <!--<parent>
-    <groupId>org.jboss</groupId>
-    <artifactId>jboss-parent</artifactId>
-    <version>3-SNAPSHOT</version>
-  </parent>-->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jboss.maven.test</groupId>
   <artifactId>maven-build-test-parent</artifactId>
@@ -31,114 +26,11 @@
   </scm>
   <build>
     <plugins>
-      <!--<plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources2</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <inherited>true</inherited>
-      </plugin>-->
-      <!--<plugin>
-        <groupId>org.jboss.maven.plugins</groupId>
-        <artifactId>maven-test-plugin</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <id>test</id>
-            <goals>
-              <goal>test</goal>
-            </goals>
-          </execution>
-        </executions>
-        <inherited>true</inherited>
-      </plugin>-->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>        
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.0-beta-7-jboss-1</version>          
-        <!--<configuration>
-          <tagBase>https://svn.jboss.org/repos/labs/labs/jbossbuild/maven-build-test/tags</tagBase>
-        </configuration>-->
+        <version>2.0-beta-8-SNAPSHOT</version>          
       </plugin>
-      <!--<plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.0-alpha-3-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <id>enforce-versions</id>
-            <goals>
-               <goal>enforce-once</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireMavenVersion>
-                  <version>2.0.6</version>
-                </requireMavenVersion>
-                <requireJavaVersion>
-                  <version>1.6</version>
-                </requireJavaVersion>   
-                <requireProperty>
-                  <property>junk</property>
-                  <warning>Junk is not set, if you don't set this you are so dead!</warning>
-                </requireProperty>
-                <requireProperty>
-                  <property>another</property>
-                  <regex>[^abc]</regex>
-                </requireProperty>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-        <inherited>false</inherited>
-      </plugin>-->
-      <!--<plugin>
-        <artifactId>maven-release-plugin</artifactId>
-        <configuration>
-          <tagBase>https://svn.jboss.org/repos/labs/labs/jbossbuild/maven-build-test/tags</tagBase>
-        </configuration>
-      </plugin>-->
-      <!--<plugin>
-        <groupId>jboss.maven-plugins</groupId>
-        <artifactId>jboss-deploy-maven-plugin</artifactId>
-        <version>1.3-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <phase>install</phase>
-            <goals>
-              <goal>jboss-deploy</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
-        </configuration>
-      </plugin>-->
-      <!--<plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.3-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>javadoc</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <aggregate>false</aggregate>
-          <links>
-            <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-          </links>
-          <minmemory>128m</minmemory>
-          <maxmemory>512</maxmemory>
-        </configuration>
-      </plugin>-->
     </plugins>
   </build>
   <repositories>
@@ -188,7 +80,10 @@
       </build>
     </profile>
   </profiles>
-  
+  <properties>
+    <activateJunk>something</activateJunk>
+    
+  </properties>
   <modules>
     <module>module1</module>
     <module>module2</module>
@@ -217,11 +112,11 @@
       <id>repository.jboss.org</id>
       <url>file://${maven.repository.root}</url>
     </repository>
-    <snapshotRepository>
+    <!--<snapshotRepository>
       <id>snapshots.jboss.org</id>
       <name>JBoss Snapshot Repository</name>
       <url>dav:https://snapshots.jboss.org/maven2</url>
-    </snapshotRepository>
+    </snapshotRepository>-->
     <site>
       <id>www.jboss.org</id>
       <name>JBoss.org site freezone</name>




More information about the jboss-svn-commits mailing list