[jboss-svn-commits] JBL Code SVN: r12775 - in labs/jbossbuild/maven-build-test/trunk: module1 and 16 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jun 22 11:28:36 EDT 2007
Author: pgier
Date: 2007-06-22 11:28:35 -0400 (Fri, 22 Jun 2007)
New Revision: 12775
Added:
labs/jbossbuild/maven-build-test/trunk/module2/module2-1/
labs/jbossbuild/maven-build-test/trunk/module2/module2-1/pom.xml
labs/jbossbuild/maven-build-test/trunk/module2/module2-1/src/
labs/jbossbuild/maven-build-test/trunk/module2/module2-1/src/main/
labs/jbossbuild/maven-build-test/trunk/module2/module2-1/src/main/java/
labs/jbossbuild/maven-build-test/trunk/module2/module2-1/src/main/java/org/
labs/jbossbuild/maven-build-test/trunk/module2/module2-1/src/main/java/org/jboss/
labs/jbossbuild/maven-build-test/trunk/module2/module2-1/src/main/java/org/jboss/build/
labs/jbossbuild/maven-build-test/trunk/module2/module2-1/src/main/java/org/jboss/build/module2_1/
labs/jbossbuild/maven-build-test/trunk/module2/module2-1/src/main/java/org/jboss/build/module2_1/Junk2_1.java
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/module2/module2-2/src/
labs/jbossbuild/maven-build-test/trunk/module2/module2-2/src/main/
labs/jbossbuild/maven-build-test/trunk/module2/module2-2/src/main/java/
labs/jbossbuild/maven-build-test/trunk/module2/module2-2/src/main/java/Junk2_2.java
labs/jbossbuild/maven-build-test/trunk/module2/module2-2/src/main/java/org/
labs/jbossbuild/maven-build-test/trunk/module2/module2-2/src/main/java/org/jboss/
labs/jbossbuild/maven-build-test/trunk/module2/module2-2/src/main/java/org/jboss/build/
labs/jbossbuild/maven-build-test/trunk/module2/module2-2/src/main/java/org/jboss/build/module2_2/
Removed:
labs/jbossbuild/maven-build-test/trunk/module2/src/
Modified:
labs/jbossbuild/maven-build-test/trunk/
labs/jbossbuild/maven-build-test/trunk/module1/pom.xml
labs/jbossbuild/maven-build-test/trunk/module2/pom.xml
labs/jbossbuild/maven-build-test/trunk/pom.xml
Log:
Adding sub-modules
Property changes on: labs/jbossbuild/maven-build-test/trunk
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
+ .classpath
.project
junk
Modified: labs/jbossbuild/maven-build-test/trunk/module1/pom.xml
===================================================================
--- labs/jbossbuild/maven-build-test/trunk/module1/pom.xml 2007-06-22 15:03:43 UTC (rev 12774)
+++ labs/jbossbuild/maven-build-test/trunk/module1/pom.xml 2007-06-22 15:28:35 UTC (rev 12775)
@@ -1,18 +1,22 @@
<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>
- <artifactId>maven-build-test</artifactId>
<groupId>org.jboss.maven.test</groupId>
+ <artifactId>maven-build-test-parent</artifactId>
<version>1.0.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.maven.test</groupId>
<artifactId>maven-build-test-module1</artifactId>
- <name>Module 1</name>
+ <version>1.0</version>
+ <name>Maven Build Test Module 1</name>
<description>A project to test the release and packaging features of maven</description>
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/labs/labs/jbossbuild/maven-build-test/trunk/module1</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/labs/labs/jbossbuild/maven-build-test/trunk/module1</developerConnection>
</scm>
+ <issueManagement>
+ <url>http://jira.jboss.org</url>
+ </issueManagement>
<build>
<plugins>
<!--<plugin>
@@ -71,7 +75,9 @@
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>${antlrVersion}</version>
+ <optional>true</optional>
</dependency>
+
</dependencies>
<!--<distributionManagement>
<relocation>
Added: labs/jbossbuild/maven-build-test/trunk/module2/module2-1/pom.xml
===================================================================
--- labs/jbossbuild/maven-build-test/trunk/module2/module2-1/pom.xml (rev 0)
+++ labs/jbossbuild/maven-build-test/trunk/module2/module2-1/pom.xml 2007-06-22 15:28:35 UTC (rev 12775)
@@ -0,0 +1,73 @@
+<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.maven.test</groupId>
+ <artifactId>maven-build-test-module2</artifactId>
+ <version>1.0.5-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>maven-build-test-module2-1</artifactId>
+ <name>Module 2-1</name>
+ <description>A project to test the release and packaging features of maven</description>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/labs/labs/jbossbuild/maven-build-test/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/labs/labs/jbossbuild/maven-build-test/trunk</developerConnection>
+ </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources2</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>attach-sources3</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <inherited>true</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>-->
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>jboss</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>jboss-snapshots</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <properties>
+ <antlrVersion>2.7.7</antlrVersion>
+ </properties>
+</project>
Added: labs/jbossbuild/maven-build-test/trunk/module2/module2-1/src/main/java/org/jboss/build/module2_1/Junk2_1.java
===================================================================
--- labs/jbossbuild/maven-build-test/trunk/module2/module2-1/src/main/java/org/jboss/build/module2_1/Junk2_1.java (rev 0)
+++ labs/jbossbuild/maven-build-test/trunk/module2/module2-1/src/main/java/org/jboss/build/module2_1/Junk2_1.java 2007-06-22 15:28:35 UTC (rev 12775)
@@ -0,0 +1,12 @@
+/*
+ * JBoss, the OpenSource J2EE webOS
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.build.module2_1;
+
+public class Junk2_1
+{
+
+}
Added: labs/jbossbuild/maven-build-test/trunk/module2/module2-2/pom.xml
===================================================================
--- labs/jbossbuild/maven-build-test/trunk/module2/module2-2/pom.xml (rev 0)
+++ labs/jbossbuild/maven-build-test/trunk/module2/module2-2/pom.xml 2007-06-22 15:28:35 UTC (rev 12775)
@@ -0,0 +1,80 @@
+<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.maven.test</groupId>
+ <artifactId>maven-build-test-module2</artifactId>
+ <version>1.0.5-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>maven-build-test-module2-2</artifactId>
+ <name>Module 2-2</name>
+ <description>A project to test the release and packaging features of maven</description>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/labs/labs/jbossbuild/maven-build-test/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/labs/labs/jbossbuild/maven-build-test/trunk</developerConnection>
+ </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources2</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>attach-sources3</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <inherited>true</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>-->
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>jboss</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>jboss-snapshots</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <dependencies>
+ <!--<dependency>
+ <groupId>org.jboss.maven.test</groupId>
+ <artifactId>maven-build-test-module1</artifactId>
+ <version>1.0.5-SNAPSHOT</version>
+ </dependency>-->
+ </dependencies>
+ <properties>
+ <antlrVersion>2.7.7</antlrVersion>
+ </properties>
+</project>
Added: labs/jbossbuild/maven-build-test/trunk/module2/module2-2/src/main/java/Junk2_2.java
===================================================================
--- labs/jbossbuild/maven-build-test/trunk/module2/module2-2/src/main/java/Junk2_2.java (rev 0)
+++ labs/jbossbuild/maven-build-test/trunk/module2/module2-2/src/main/java/Junk2_2.java 2007-06-22 15:28:35 UTC (rev 12775)
@@ -0,0 +1,21 @@
+/*
+ * JBoss, the OpenSource J2EE webOS
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+public class Junk2_2
+{
+
+ /** FIXME Comment this
+ *
+ * @param args
+ */
+ public static void main(String[] args)
+ {
+ // FIXME main
+
+ }
+
+}
Modified: labs/jbossbuild/maven-build-test/trunk/module2/pom.xml
===================================================================
--- labs/jbossbuild/maven-build-test/trunk/module2/pom.xml 2007-06-22 15:03:43 UTC (rev 12774)
+++ labs/jbossbuild/maven-build-test/trunk/module2/pom.xml 2007-06-22 15:28:35 UTC (rev 12775)
@@ -1,53 +1,20 @@
<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>
- <artifactId>maven-build-test</artifactId>
- <groupId>jboss.maven-test</groupId>
+ <parent>
+ <groupId>org.jboss.maven.test</groupId>
+ <artifactId>maven-build-test-parent</artifactId>
<version>1.0.5-SNAPSHOT</version>
- </parent>-->
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.maven.test</groupId>
<artifactId>maven-build-test-module2</artifactId>
- <name>Module 2</name>
- <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Maven Build Test Module 2 Parent</name>
+ <version>1.0.5-SNAPSHOT</version>
<description>A project to test the release and packaging features of maven</description>
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/labs/labs/jbossbuild/maven-build-test/trunk</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/labs/labs/jbossbuild/maven-build-test/trunk</developerConnection>
</scm>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources2</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- <execution>
- <id>attach-sources3</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <inherited>true</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>
- </plugins>
- </build>
<repositories>
<repository>
<id>jboss</id>
@@ -70,15 +37,17 @@
</repository>
</repositories>
<dependencies>
- <dependency>
+ <!--<dependency>
<groupId>org.jboss.maven.test</groupId>
<artifactId>maven-build-test-module1</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
+ <version>1.0.5-SNAPSHOT</version>
+ </dependency>-->
</dependencies>
+ <modules>
+ <module>module2-1</module>
+ <module>module2-2</module>
+ </modules>
<properties>
<antlrVersion>2.7.7</antlrVersion>
-
</properties>
-
-</project>
\ No newline at end of file
+</project>
Modified: labs/jbossbuild/maven-build-test/trunk/pom.xml
===================================================================
--- labs/jbossbuild/maven-build-test/trunk/pom.xml 2007-06-22 15:03:43 UTC (rev 12774)
+++ labs/jbossbuild/maven-build-test/trunk/pom.xml 2007-06-22 15:28:35 UTC (rev 12775)
@@ -6,14 +6,15 @@
</parent>-->
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.maven.test</groupId>
- <artifactId>maven-build-test</artifactId>
+ <artifactId>maven-build-test-parent</artifactId>
<packaging>pom</packaging>
- <name>JBoss Build Junk</name>
+ <name>JBoss Build Test Parent</name>
<version>1.0.5-SNAPSHOT</version>
<description>A project to test the release and packaging features of maven</description>
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/labs/labs/jbossbuild/maven-build-test/trunk</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/labs/labs/jbossbuild/maven-build-test/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/repos/jbossbuild/trunk</url>
</scm>
<build>
<plugins>
@@ -43,7 +44,47 @@
</executions>
<inherited>true</inherited>
</plugin>-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-5</version>
+ <!--<configuration>
+ <tagBase>https://svn.jboss.org/repos/labs/labs/jbossbuild/maven-build-test/tags</tagBase>
+ </configuration>-->
+ </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>
@@ -107,6 +148,11 @@
<enabled>true</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Maven snapshot repo</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@@ -170,4 +216,20 @@
</plugin>
</plugins>
</reporting>-->
+ <distributionManagement>
+ <repository>
+ <!-- Copy the distribution jar file to a local checkout of the maven repository
+ - This variable can be set in $MAVEN_HOME/conf/settings.xml -->
+ <id>repository.jboss.org</id>
+ <url>file://${maven.repository.root}</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <!--<properties>
+ <junk>paul</junk>
+ </properties>-->
</project>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list