[jboss-cvs] jboss-seam/build ...
Peter Muir
peter at bleepbleep.org.uk
Tue Sep 25 18:22:51 EDT 2007
User: pmuir
Date: 07/09/25 18:22:51
Modified: build remoting.pom.xml gen.pom.xml
common.build.xml mail.pom.xml readme.txt
ioc.pom.xml debug.pom.xml pdf.pom.xml ui.pom.xml
utilities.build.xml core.pom.xml root.pom.xml
build.xml
Added: build wagon.pom.xml ci.build.xml
parent.pom.xml
Log:
Add in a parent pom for Seam for storing project information. New ci targets
Revision Changes Path
1.8 +1 -1 jboss-seam/build/remoting.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: remoting.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/remoting.pom.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- remoting.pom.xml 25 Sep 2007 16:13:17 -0000 1.7
+++ remoting.pom.xml 25 Sep 2007 22:22:51 -0000 1.8
@@ -7,7 +7,7 @@
<artifactId>jboss-seam-remoting</artifactId>
<parent>
<groupId>org.jboss.seam</groupId>
- <artifactId>root</artifactId>
+ <artifactId>parent</artifactId>
<version>@seam.version@</version>
</parent>
1.5 +1 -1 jboss-seam/build/gen.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: gen.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/gen.pom.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gen.pom.xml 20 Sep 2007 18:36:02 -0000 1.4
+++ gen.pom.xml 25 Sep 2007 22:22:51 -0000 1.5
@@ -7,7 +7,7 @@
<artifactId>jboss-seam-gen</artifactId>
<parent>
<groupId>org.jboss.seam</groupId>
- <artifactId>root</artifactId>
+ <artifactId>parent</artifactId>
<version>@seam.version@</version>
</parent>
1.8 +18 -0 jboss-seam/build/common.build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: common.build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/common.build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- common.build.xml 25 Sep 2007 16:13:17 -0000 1.7
+++ common.build.xml 25 Sep 2007 22:22:51 -0000 1.8
@@ -84,6 +84,8 @@
<echo>Setting up dependencies</echo>
<pomfile name="root.pom" value="${build.dir}/root.pom.xml" />
<install pom="${root.pom}" />
+ <pomfile name="parent.pom" value="${build.dir}/parent.pom.xml" />
+ <install pom="${parent.pom}" />
<pomfile name="core.pom" value="${build.dir}/core.pom.xml" />
<pomfile name="debug.pom" value="${build.dir}/debug.pom.xml" />
<pomfile name="gen.pom" value="${build.dir}/gen.pom.xml" />
@@ -137,4 +139,20 @@
<property name="copyjbossembeddeddone" value="true" />
</target>
+ <macrodef name="deploySeam">
+ <attribute name="repositoryId" />
+ <sequential>
+ <deploy pom="${root.pom}" repositoryId="@{repositoryId}" />
+ <deploy pom="${parent.pom}" repositoryId="@{repositoryId}" />
+ <deploy pom="${core.pom}" jar="${seam.dir}/lib/jboss-seam.jar" repositoryId="@{repositoryId}" />
+ <deploy pom="${ui.pom}" jar="${seam.dir}/lib/jboss-seam-ui.jar" repositoryId="@{repositoryId}" />
+ <deploy pom="${remoting.pom}" jar="${seam.dir}/lib/jboss-seam-remoting.jar" repositoryId="@{repositoryId}" />
+ <deploy pom="${pdf.pom}" jar="${seam.dir}/lib/jboss-seam-pdf.jar" repositoryId="@{repositoryId}" />
+ <deploy pom="${mail.pom}" jar="${seam.dir}/lib/jboss-seam-mail.jar" repositoryId="@{repositoryId}" />
+ <deploy pom="${ioc.pom}" jar="${seam.dir}/lib/jboss-seam-ioc.jar" repositoryId="@{repositoryId}" />
+ <deploy pom="${gen.pom}" jar="${seam.dir}/lib/jboss-seam-gen.jar" repositoryId="@{repositoryId}" />
+ <deploy pom="${debug.pom}" jar="${seam.dir}/lib/jboss-seam-debug.jar" repositoryId="@{repositoryId}" />
+ </sequential>
+ </macrodef>
+
</project>
\ No newline at end of file
1.7 +1 -1 jboss-seam/build/mail.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: mail.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/mail.pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- mail.pom.xml 25 Sep 2007 16:13:17 -0000 1.6
+++ mail.pom.xml 25 Sep 2007 22:22:51 -0000 1.7
@@ -7,7 +7,7 @@
<artifactId>jboss-seam-mail</artifactId>
<parent>
<groupId>org.jboss.seam</groupId>
- <artifactId>root</artifactId>
+ <artifactId>parent</artifactId>
<version>@seam.version@</version>
</parent>
1.4 +1 -1 jboss-seam/build/readme.txt
(In the diff below, changes in quantity of whitespace are not shown.)
Index: readme.txt
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/readme.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- readme.txt 22 Sep 2007 13:41:43 -0000 1.3
+++ readme.txt 25 Sep 2007 22:22:51 -0000 1.4
@@ -24,7 +24,7 @@
* Find the dependency in a maven repository - check repository.jboss.org/maven2
first and then try mvnsearch.com.
* Add or update the entry in root.pom.xml including version information
-* If it's a new dependency, add an entry to the correct modul. If it's an
+* If it's a new dependency, add an entry to the correct module. If it's an
optional dependency (most are), mark it <optional>true</optional>. If it's
provided by JBoss AS (current targeted version), mark it <scope>provided</scope>
* Bear in mind that a released Seam shouldn't depend on a SNAPSHOT version, so
1.8 +1 -1 jboss-seam/build/ioc.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ioc.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/ioc.pom.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ioc.pom.xml 25 Sep 2007 16:13:17 -0000 1.7
+++ ioc.pom.xml 25 Sep 2007 22:22:51 -0000 1.8
@@ -7,7 +7,7 @@
<artifactId>jboss-seam-ioc</artifactId>
<parent>
<groupId>org.jboss.seam</groupId>
- <artifactId>root</artifactId>
+ <artifactId>parent</artifactId>
<version>@seam.version@</version>
</parent>
1.6 +1 -1 jboss-seam/build/debug.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: debug.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/debug.pom.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- debug.pom.xml 25 Sep 2007 16:13:17 -0000 1.5
+++ debug.pom.xml 25 Sep 2007 22:22:51 -0000 1.6
@@ -7,7 +7,7 @@
<artifactId>jboss-seam-debug</artifactId>
<parent>
<groupId>org.jboss.seam</groupId>
- <artifactId>root</artifactId>
+ <artifactId>parent</artifactId>
<version>@seam.version@</version>
</parent>
1.8 +1 -1 jboss-seam/build/pdf.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: pdf.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/pdf.pom.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- pdf.pom.xml 25 Sep 2007 16:13:17 -0000 1.7
+++ pdf.pom.xml 25 Sep 2007 22:22:51 -0000 1.8
@@ -7,7 +7,7 @@
<artifactId>jboss-seam-pdf</artifactId>
<parent>
<groupId>org.jboss.seam</groupId>
- <artifactId>root</artifactId>
+ <artifactId>parent</artifactId>
<version>@seam.version@</version>
</parent>
1.10 +1 -1 jboss-seam/build/ui.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ui.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/ui.pom.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ui.pom.xml 25 Sep 2007 16:13:17 -0000 1.9
+++ ui.pom.xml 25 Sep 2007 22:22:51 -0000 1.10
@@ -3,7 +3,7 @@
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>root</artifactId>
+ <artifactId>parent</artifactId>
<groupId>org.jboss.seam</groupId>
<version>@seam.version@</version>
</parent>
1.8 +0 -2 jboss-seam/build/utilities.build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: utilities.build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/utilities.build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- utilities.build.xml 24 Sep 2007 13:12:52 -0000 1.7
+++ utilities.build.xml 25 Sep 2007 22:22:51 -0000 1.8
@@ -109,7 +109,6 @@
<macrodef name="maven">
<attribute name="target" />
<attribute name="basedir" />
- <attribute name="pom" default="pom.xml" />
<element name="args" implicit="true" optional="true"/>
<sequential>
<java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}">
@@ -123,7 +122,6 @@
</classpath>
<sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
<sysproperty key="maven.home" value="${maven.dir}" />
- <arg line="-f @{pom}" />
<arg line="-Dseam.version=${complete.version}" />
<args />
<arg line="@{target}" />
1.19 +1 -1 jboss-seam/build/core.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: core.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/core.pom.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- core.pom.xml 25 Sep 2007 16:56:52 -0000 1.18
+++ core.pom.xml 25 Sep 2007 22:22:51 -0000 1.19
@@ -7,7 +7,7 @@
<artifactId>jboss-seam</artifactId>
<parent>
<groupId>org.jboss.seam</groupId>
- <artifactId>root</artifactId>
+ <artifactId>parent</artifactId>
<version>@seam.version@</version>
</parent>
1.13 +1 -21 jboss-seam/build/root.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: root.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/root.pom.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- root.pom.xml 25 Sep 2007 18:23:01 -0000 1.12
+++ root.pom.xml 25 Sep 2007 22:22:51 -0000 1.13
@@ -27,11 +27,6 @@
<name>JBoss Snapshot Repository</name>
<url>http://snapshots.jboss.org/maven2</url>
</pluginRepository>-->
- <!-- <pluginRepository>
- <snapshots />
- <id>m2-snapshot</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- </pluginRepository>-->
</pluginRepositories>
<repositories>
<repository>
@@ -53,21 +48,6 @@
</repository>
</repositories>
- <!-- Uncomment to enable newer version of dependency plugin which has the
- dependency:tree command useful for analyzing the dependency tree of a module
- You'll also need the m2-snapshot repository enabled -->
- <!-- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0-alpha-5-SNAPSHOT</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>-->
-
<dependencyManagement>
<!--
Used to specify which version of a dependency to use - this means that
@@ -195,7 +175,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>3.0.0.ga</version>
+ <version>3.0.0.GA</version>
</dependency>
<dependency>
1.15 +1 -15 jboss-seam/build/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- build.xml 24 Sep 2007 09:40:12 -0000 1.14
+++ build.xml 25 Sep 2007 22:22:51 -0000 1.15
@@ -125,25 +125,11 @@
<attribute name="repository" />
<sequential>
<maven basedir="${tmp.dir}/poms" target="dependency:go-offline" pom="@{pom}">
+ <arg line="-f @{pom}" />
<arg line="-s settings.xml" />
<arg line="-Dmaven.repo.local=@{repository}" />
</maven>
</sequential>
</macrodef>
- <macrodef name="deploySeam">
- <attribute name="repositoryId" />
- <sequential>
- <deploy pom="${root.pom}" repositoryId="@{repositoryId}" />
- <deploy pom="${core.pom}" jar="${seam.dir}/lib/jboss-seam.jar" repositoryId="@{repositoryId}" />
- <deploy pom="${ui.pom}" jar="${seam.dir}/lib/jboss-seam-ui.jar" repositoryId="@{repositoryId}" />
- <deploy pom="${remoting.pom}" jar="${seam.dir}/lib/jboss-seam-remoting.jar" repositoryId="@{repositoryId}" />
- <deploy pom="${pdf.pom}" jar="${seam.dir}/lib/jboss-seam-pdf.jar" repositoryId="@{repositoryId}" />
- <deploy pom="${mail.pom}" jar="${seam.dir}/lib/jboss-seam-mail.jar" repositoryId="@{repositoryId}" />
- <deploy pom="${ioc.pom}" jar="${seam.dir}/lib/jboss-seam-ioc.jar" repositoryId="@{repositoryId}" />
- <deploy pom="${gen.pom}" jar="${seam.dir}/lib/jboss-seam-gen.jar" repositoryId="@{repositoryId}" />
- <deploy pom="${debug.pom}" jar="${seam.dir}/lib/jboss-seam-debug.jar" repositoryId="@{repositoryId}" />
- </sequential>
- </macrodef>
-
</project>
\ No newline at end of file
1.1 date: 2007/09/25 22:22:51; author: pmuir; state: Exp;jboss-seam/build/wagon.pom.xml
Index: wagon.pom.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam</groupId>
<artifactId>wagon</artifactId>
<version>SNAPSHOT</version>
<packaging>pom</packaging>
<!-- This POM works around a bug in maven -->
<build>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav</artifactId>
<version>1.0-beta-2</version>
</extension>
</extensions>
</build>
</project>
1.1 date: 2007/09/25 22:22:51; author: pmuir; state: Exp;jboss-seam/build/ci.build.xml
Index: ci.build.xml
===================================================================
<?xml version="1.0"?>
<!-- Continuous integration related targets -->
<project name="Seam2 Continuous Integration Support" basedir="." xmlns:artifact="urn:maven-artifact-ant">
<property file="default.build.properties" />
<property file="build.properties" />
<property name="seam.dir" value="${basedir}/../" />
<import file="common.build.xml" />
<property name="snapshots.jboss.org" value="dav:https://snapshots.jboss.org/maven2" />
<target name="initdav">
<artifact:install-provider artifactId="wagon-webdav" version="1.0-beta-2" />
</target>
<target name="deploySeamSnapshot" description="Deploy a Seam snapshot to snapshots.jboss.org" depends="initdav, initpoms">
<pomfile name="wagon.pom" value="wagon.pom.xml" />
<maven target="deploy:deploy-file" basedir=".">
<arg line="-f ${wagon.pom}" />
<arg line="-DpomFile=${root.pom}" />
<arg line="-Dfile=${root.pom}" />
<arg line="-Durl=${snapshots.jboss.org}" />
<arg line="-DrepositoryId=snapshots.jboss.org" />
</maven>
<deploySnapshot pom="${parent.pom}" />
<deploySnapshot pom="${core.pom}" file="${lib.dir}/jboss-seam.jar" />
<deploySnapshot pom="${debug.pom}" file="${lib.dir}/jboss-seam-debug.jar" />
<deploySnapshot pom="${gen.pom}" file="${lib.dir}/jboss-seam-gen.jar" />
<deploySnapshot pom="${ioc.pom}" file="${lib.dir}/jboss-seam-ioc.jar" />
<deploySnapshot pom="${mail.pom}" file="${lib.dir}/jboss-seam-mail.jar" />
<deploySnapshot pom="${pdf.pom}" file="${lib.dir}/jboss-seam-pdf.jar" />
<deploySnapshot pom="${remoting.pom}" file="${lib.dir}/jboss-seam-remoting.jar" />
<deploySnapshot pom="${ui.pom}" file="${lib.dir}/jboss-seam-ui.jar" />
</target>
<target name="tests">
<build target="cleanall" />
<build target="coverageall" />
<build target="copytestoutput" />
<build target="testreport" />
<build target="validateall" />
</target>
<target name="snapshot">
<build target="cleanall" />
<build target="build" />
<antcall target="deploySeamSnapshot" />
<antcall target="tests" />
</target>
<macrodef name="build">
<attribute name="target" />
<sequential>
<ant antfile="${seam.dir}/build.xml" target="@{target}" inheritall="false" inheritrefs="false" dir="../">
<property name="dist.location" value="dist" />
<property name="qualifier" value="-SNAPSHOT" />
<property name="quietclean" value="true" />
<property name="coverage.ec" value="${build.dir}/coverage.ec" />
</ant>
</sequential>
</macrodef>
<macrodef name="deploySnapshot">
<attribute name="pom" />
<attribute name="file" default="" />
<sequential>
<artifact:deploy file="@{file}">
<pom file="@{pom}" />
</artifact:deploy>
</sequential>
</macrodef>
</project>
1.1 date: 2007/09/25 22:22:51; author: pmuir; state: Exp;jboss-seam/build/parent.pom.xml
Index: parent.pom.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam</groupId>
<artifactId>parent</artifactId>
<url>http://jboss.com/products/seam</url>
<version>@seam.version@</version>
<name>JBoss Seam</name>
<packaging>pom</packaging>
<parent>
<groupId>org.jboss.seam</groupId>
<artifactId>root</artifactId>
<version>@seam.version@</version>
</parent>
<pluginRepositories>
<!-- <pluginRepository>
<snapshots />
<id>m2-snapshot</id>
<url>http://people.apache.org/repo/m2-snapshot-repository/</url>
</pluginRepository>-->
</pluginRepositories>
<distributionManagement>
<snapshotRepository>
<id>snapshots.jboss.org</id>
<url>dav:https://snapshots.jboss.org/maven2</url>
</snapshotRepository>
</distributionManagement>
<!-- Uncomment to enable newer version of dependency plugin which has the
dependency:tree command useful for analyzing the dependency tree of a module
You'll also need the m2-snapshot repository enabled -->
<!-- <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0-alpha-5-SNAPSHOT</version>
</plugin>
</plugins>
</pluginManagement>
</build>-->
</project>
More information about the jboss-cvs-commits
mailing list