[jboss-cvs] jboss-seam/build ...
Peter Muir
peter at bleepbleep.org.uk
Fri Sep 21 16:29:21 EDT 2007
User: pmuir
Date: 07/09/21 16:29:21
Modified: build readme.txt utilities.build.xml core.pom.xml
build.xml remoting.pom.xml root.pom.xml
Added: build settings.xml build.properties
Log:
Updates to dependency management (repositories)
Revision Changes Path
1.2 +25 -2 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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- readme.txt 21 Sep 2007 12:52:57 -0000 1.1
+++ readme.txt 21 Sep 2007 20:29:21 -0000 1.2
@@ -34,7 +34,7 @@
repository.jboss.org (no thirdparty repositories should be used for released
versions) - so if you are adding a dependency which is stable, and you aren't
planning to change the dependency before the next release you should consider
- adding it to repository.jboss.org straight away. The proceedure for this is
+ adding it to repository.jboss.org straight away. The procedure for this is
outlined at http://wiki.jboss.org/wiki/Wiki.jsp?page=MavenThirdPartyJars
To add a dependency of Seam to the development repository stored in CVS:
@@ -63,7 +63,30 @@
Release Instructions
--------------------
-TBD
+All dependencies for a released version of Seam should be available in
+repository.jboss.org. Only released versions of software should be present in
+repository.jboss.org.
+
+Release dependencies:
+
+* If you are adding a couple of dependencies its easier to follow the wiki page
+ http://wiki.jboss.org/wiki/Wiki.jsp?page=MavenThirdPartyJars option 2
+* If you need to add a lot of dependencies, you can use the offlineDependencies target in
+ the build/ directory, and set the offline.repository property to point at your
+ svn checkout of repository.jboss.org/maven2. This task downloads all
+ dependencies of Seam into your checked out repository.jboss.org - you can then
+ commit those that are necessary. (N.B. This will include some Seam jars, don't
+ include these in your commit!)
+* Edit the root.pom.xml to remove all references to other repositories if
+ possible
+* Delete the contents of the build/repository directory (the development
+ repository) as this should not have anything in for releases.
+
+Add Seam to repository.jboss.org:
+
+* Run the offlineSeam target
+* Commit the release to repository.jboss.org
+
Examples
--------
1.4 +25 -1 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- utilities.build.xml 21 Sep 2007 11:02:31 -0000 1.3
+++ utilities.build.xml 21 Sep 2007 20:29:21 -0000 1.4
@@ -51,7 +51,6 @@
<attribute name="jar" default="" />
<attribute name="repositoryId" default="" />
<sequential>
- <echo>@{jar}</echo>
<artifact:deploy file="@{jar}">
<pom file="@{pom}" />
<remoteRepository refId="@{repositoryId}" />
@@ -101,4 +100,29 @@
</sequential>
</macrodef>
+ <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}">
+ <classpath>
+ <fileset dir="${maven.dir}/core/boot">
+ <include name="*.jar" />
+ </fileset>
+ <fileset dir="${maven.dir}/bin">
+ <include name="*.*" />
+ </fileset>
+ </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=${version}.${patchlevel}" />
+ <args />
+ <arg line="@{target}" />
+ </java>
+ </sequential>
+ </macrodef>
+
</project>
\ No newline at end of file
1.10 +9 -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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- core.pom.xml 21 Sep 2007 11:02:31 -0000 1.9
+++ core.pom.xml 21 Sep 2007 20:29:21 -0000 1.10
@@ -154,9 +154,17 @@
<artifactId>xmlParserAPIs</artifactId>
</exclusion>
<exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -169,7 +177,7 @@
<dependency>
<groupId>javax.jms</groupId>
- <artifactId>jms-api</artifactId>
+ <artifactId>jms</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
1.12 +58 -2 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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- build.xml 20 Sep 2007 18:36:02 -0000 1.11
+++ build.xml 21 Sep 2007 20:29:21 -0000 1.12
@@ -8,6 +8,7 @@
<property name="tmp.dir" value="${seam.dir}/classes" />
<property name="build.dir" value="${basedir}" />
<property file="${seam.dir}/build.properties" />
+ <property file="build.properties" />
<import file="utilities.build.xml" />
<import file="common.build.xml" />
@@ -61,11 +62,66 @@
</target>
<macrodef name="installProfile">
- <attribute name="pom"/>
+ <attribute name="pom" />
<sequential>
<pomfile name="pomfile" value="@{pom}" />
<install pom="${pomfile}" />
</sequential>
</macrodef>
+ <target name="offlineDependencies" description="Build an offline snapshot of all depndencies required by Seam" depends="initpoms">
+ <delete dir="${tmp.dir}/tmp-repository" />
+
+ <copy tofile="${tmp.dir}/poms/settings.xml">
+ <fileset file="${build.dir}/settings.xml" />
+ <filterset>
+ <filter token="tmp.dir" value="${tmp.dir}" />
+ <filter token="build.dir" value="${build.dir}" />
+ </filterset>
+ </copy>
+
+ <artifact:remoteRepository id="tmp.repository" url="file://${tmp.dir}/tmp-repository" />
+
+ <deploySeam repositoryId="tmp.repository" />
+
+ <offline pom="core.pom" repository="${offline.repository}" />
+ <offline pom="ui.pom" repository="${offline.repository}" />
+ <offline pom="remoting.pom" repository="${offline.repository}" />
+ <offline pom="pdf.pom" repository="${offline.repository}" />
+ <offline pom="mail.pom" repository="${offline.repository}" />
+ <offline pom="ioc.pom" repository="${offline.repository}" />
+ <offline pom="gen.pom" repository="${offline.repository}" />
+ <offline pom="debug.pom" repository="${offline.repository}" />
+ </target>
+
+ <target name="offlineSeam" depends="initpoms">
+ <artifact:remoteRepository id="offline.repository" url="file://${offline.repository}" />
+ <deploySeam repositoryId="offline.repository" url="${offline.repository}" />
+ </target>
+
+ <macrodef name="offline">
+ <attribute name="pom" />
+ <attribute name="repository" />
+ <sequential>
+ <maven basedir="${tmp.dir}/poms" target="dependency:go-offline" pom="@{pom}">
+ <arg line="-s settings.xml" />
+ <arg line="-Dmaven.repo.local=@{repository}" />
+ </maven>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="deploySeam">
+ <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.6 +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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- remoting.pom.xml 20 Sep 2007 18:36:03 -0000 1.5
+++ remoting.pom.xml 21 Sep 2007 20:29:21 -0000 1.6
@@ -69,7 +69,7 @@
<dependency>
<groupId>javax.jms</groupId>
- <artifactId>jms-api</artifactId>
+ <artifactId>jms</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
1.5 +6 -29 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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- root.pom.xml 21 Sep 2007 11:02:31 -0000 1.4
+++ root.pom.xml 21 Sep 2007 20:29:21 -0000 1.5
@@ -9,9 +9,6 @@
<version>@seam.version@</version>
<name>JBoss Seam</name>
<packaging>pom</packaging>
- <modules>
- <module>ui</module>
- </modules>
<pluginRepositories>
<pluginRepository>
<id>repository.jboss.org</id>
@@ -24,12 +21,12 @@
<name>Exadel Repository</name>
<url>http://maven.exadel.com</url>
</pluginRepository>
- <pluginRepository>
+ <!-- <pluginRepository>
<snapshots />
<id>snapshots.jboss.org</id>
<name>JBoss Snapshot Repository</name>
<url>http://snapshots.jboss.org/maven2</url>
- </pluginRepository>
+ </pluginRepository>-->
</pluginRepositories>
<repositories>
<repository>
@@ -37,38 +34,18 @@
<name>JBoss Repository</name>
<url>http://repository.jboss.org/maven2</url>
</repository>
- <repository>
+ <!-- <repository>
<snapshots />
<id>snapshots.jboss.org</id>
<name>JBoss Snapshot Repository</name>
<url>http://snapshots.jboss.org/maven2</url>
- </repository>
+ </repository>-->
<repository>
<snapshots />
<id>maven.exadel.com</id>
<name>Exadel Repository</name>
<url>http://maven.exadel.com</url>
</repository>
- <repository>
- <id>maven1.java.net</id>
- <name>Java.net Maven1 Repositiory</name>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>gwt-maven</id>
- <url>
- http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/
- </url>
- </repository>
- <repository>
- <id>glassfish.java.net</id>
- <url>http://download.java.net/maven/glassfish/</url>
- </repository>
- <repository>
- <id>maven2.java.net</id>
- <url>http://download.java.net/maven/2/</url>
- </repository>
</repositories>
<dependencyManagement>
@@ -288,7 +265,7 @@
<dependency>
<groupId>javax.jms</groupId>
- <artifactId>jms-api</artifactId>
+ <artifactId>jms</artifactId>
<version>1.1</version>
</dependency>
@@ -343,7 +320,7 @@
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-el</artifactId>
- <version>2.0.0.BETA</version>
+ <version>2.0.0.CR1</version>
</dependency>
<dependency>
1.1 date: 2007/09/21 20:29:21; author: pmuir; state: Exp;jboss-seam/build/settings.xml
Index: settings.xml
===================================================================
<settings 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/xsd/settings-1.0.0.xsd">
<profiles>
<profile>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
<id>temporary</id>
<name>Temporary Local Repository</name>
<url>file://@tmp.dir@/tmp-repository</url>
</repository>
<repository>
<id>development</id>
<name>Development Repository</name>
<url>file://@build.dir@/repository</url>
</repository>
</repositories>
</profile>
</profiles>
</settings>
1.1 date: 2007/09/21 20:29:21; author: pmuir; state: Exp;jboss-seam/build/build.properties
Index: build.properties
===================================================================
offline.repository=/Users/pmuir/workspace/maven2.repository.jboss.org
More information about the jboss-cvs-commits
mailing list