[jboss-cvs] jboss-seam/build ...
Peter Muir
peter at bleepbleep.org.uk
Sat Sep 22 09:41:43 EDT 2007
User: pmuir
Date: 07/09/22 09:41:43
Modified: build mail.pom.xml readme.txt ioc.pom.xml
utilities.build.xml core.pom.xml common.build.xml
build.xml ui.pom.xml root.pom.xml
Log:
Trim dependencies, more stuff into jboss repo
Revision Changes Path
1.5 +64 -58 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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- mail.pom.xml 20 Sep 2007 18:36:02 -0000 1.4
+++ mail.pom.xml 22 Sep 2007 13:41:43 -0000 1.5
@@ -33,6 +33,12 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-pdf</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>com.lowagie</groupId>
+ <artifactId>itext</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
1.3 +10 -9 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- readme.txt 21 Sep 2007 20:29:21 -0000 1.2
+++ readme.txt 22 Sep 2007 13:41:43 -0000 1.3
@@ -37,25 +37,26 @@
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:
+To add a non-released dependency of Seam:
* If you need a dependency which isn't available in Maven, and don't want to add
it straight to repository.jboss.org or want to depend on a CVS/snapshot of a
- project which you're planning to upgrade before the next Seam release you can
- add a dependency to Seam's local (development) repository. These dependencies
- are (for now) just available when building Seam itself (or if a user adds the
- local repository to their pom).
+ project which you're planning to upgrade before the next Seam release you
+ should add it to snapshots.jboss.org.
* To add a jar to the local repository, you can, if you have a pom (that you
copied from an earlier version or have written) run:
- ant deployLocal -Dpom=foo.pom -Djar=foo.jar
+ ant deploySnapshot -Dpom=foo.pom -Djar=foo.jar
If you want maven to create a basic pom for you:
- ant deployLocalJar -Djar=foo.jar
+ ant deploySnapshotJar -Djar=foo.jar
-* If you need to alter the pom or jar in the local repository but don't change
- the version number, you'll need to delete the old copy from maven's cache
+ You will be prompted for your jboss.org username and pasword (WARNING your
+ password is echoed back to you!)
+
+* If you need to alter the pom or jar in a repository but don't change
+ the version number, you should delete the old copy from maven's cache
rm -rf ~/.m2/repository/group/id/artifactId/version
1.6 +185 -131 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ioc.pom.xml 20 Sep 2007 19:30:56 -0000 1.5
+++ ioc.pom.xml 22 Sep 2007 13:41:43 -0000 1.6
@@ -82,6 +82,18 @@
<groupId>apache-slide</groupId>
<artifactId>webdavlib</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -116,6 +128,10 @@
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -129,6 +145,44 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jbossxb</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
1.5 +4 -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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- utilities.build.xml 21 Sep 2007 20:29:21 -0000 1.4
+++ utilities.build.xml 22 Sep 2007 13:41:43 -0000 1.5
@@ -50,10 +50,13 @@
<attribute name="pom" default="" />
<attribute name="jar" default="" />
<attribute name="repositoryId" default="" />
+ <element name="credentials" implicit="true" optional="true" />
<sequential>
<artifact:deploy file="@{jar}">
<pom file="@{pom}" />
- <remoteRepository refId="@{repositoryId}" />
+ <remoteRepository refId="@{repositoryId}">
+ <credentials />
+ </remoteRepository>
</artifact:deploy>
</sequential>
</macrodef>
1.11 +440 -386 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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- core.pom.xml 21 Sep 2007 20:29:21 -0000 1.10
+++ core.pom.xml 22 Sep 2007 13:41:43 -0000 1.11
@@ -1,5 +1,7 @@
<?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">
+<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>jboss-seam</artifactId>
@@ -165,6 +167,14 @@
<groupId>quartz</groupId>
<artifactId>quartz</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -238,6 +248,42 @@
<groupId>mockobjects</groupId>
<artifactId>mockobjects-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>castor</groupId>
+ <artifactId>castor</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>openejb</groupId>
+ <artifactId>openejb</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-loader</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -321,6 +367,14 @@
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
1.3 +2 -1 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- common.build.xml 21 Sep 2007 15:55:48 -0000 1.2
+++ common.build.xml 22 Sep 2007 13:41:43 -0000 1.3
@@ -21,6 +21,7 @@
<property name="maven.dir" value="${build.dir}/maven" />
<artifact:remoteRepository id="local.repository" url="file://${build.dir}/repository" />
+ <artifact:remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
<target name="initcopy">
<mkdir dir="${lib.dir}" />
@@ -75,7 +76,7 @@
<dependency groupId="org.jboss.embedded" artifactId="jboss-embedded-all" version="beta2" />
<dependency groupId="org.jboss.embedded" artifactId="thirdparty-all" version="beta2" />
<dependency groupId="org.jboss.embedded" artifactId="hibernate-all" version="beta2" />
- <remoteRepository refId="local.repository" />
+ <remoteRepository refId="repository.jboss.org" />
</artifact:dependencies>
<copy todir="${lib.dir}/test">
<fileset refid="embeddedjboss.fileset" />
1.13 +44 -16 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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- build.xml 21 Sep 2007 20:29:21 -0000 1.12
+++ build.xml 22 Sep 2007 13:41:43 -0000 1.13
@@ -13,20 +13,50 @@
<import file="utilities.build.xml" />
<import file="common.build.xml" />
- <target name="deployLocal" description="Deploy a pom and jar to local (development) repository">
+ <artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2" />
+
+ <target name="initdav">
+ <artifact:install-provider artifactId="wagon-webdav" version="1.0-beta-2"/>
+ </target>
+
+ <target name="deployLocal">
<pomfile name="pom.file" value="${pom}" />
<deployLocal pom="${pom.file}" jar="${jar}" />
</target>
- <target name="deployLocalPom" description="Deploy a pom to the (development) repository">
+ <target name="deploySnapshot" description="Deploy a pom and jar to snapshots.jboss.org" depends="initdav">
+ <input addproperty="username"
+ message="JBoss.org username:" />
+ <input addproperty="password"
+ message="JBoss.org password:" />
+
+ <pomfile name="pom.file" value="${pom}" />
+ <deploy pom="${pom.file}" jar="${jar}" repositoryId="snapshots.jboss.org">
+ <authentication username="${username}" password="${password}" />
+ </deploy>
+ </target>
+
+ <target name="deploySnapshotJar" description="Deploy a jar (generating the pom) to snapshots.jboss.org" depends="initdav">
+ <input addproperty="username"
+ message="JBoss.org username:" />
+ <input addproperty="password"
+ message="JBoss.org password:" />
+
+ <pomfile name="pom.file" value="${pom}" />
+ <deploy pom="${pom.file}" jar="${jar}" repositoryId="snapshots.jboss.org">
+ <authentication username="${username}" password="${password}" />
+ </deploy>
+ </target>
+
+ <target name="deployLocalPom">
<deployLocal pom="${pom}" />
</target>
- <target name="deployLocalJar" description="Deploy a jar (generating the pom) to local (development) repository">
+ <target name="deployLocalJar" >
<deployLocal jar="${jar}" />
</target>
- <target name="installProfiles" description="Deploy all profiles to the local (development) repository">
+ <target name="installProfiles" >
<installProfile pom="profiles/seam-ajax.pom.xml" />
<installProfile pom="profiles/seam-async-timer-quartz.pom.xml" />
<installProfile pom="profiles/seam-cache.pom.xml" />
@@ -44,21 +74,18 @@
<installProfile pom="profiles/seam-urlrewrite.pom.xml" />
</target>
- <target name="help">
+ <target name="help" description="Show help">
+ <echo>Run ant -p</echo>
+ <echo />
+ <echo>You can set the location of your checked out maven repositoy for the offline targets in build.properties</echo>
+ <echo />
<echo>Examples:</echo>
<echo>---------</echo>
<echo />
<echo>Deploy both a pom and the associated jar: </echo>
- <echo> ant deployLocal -Dpom=jboss-el.pom.xml -Djar=jboss-el.jar</echo>
- <echo />
- <echo>Deploy a pom only (useful if packaging is set to pom):</echo>
- <echo> ant deployLocalPomOnly -Dpom=jboss-el.pom.xml</echo>
- <echo />
- <echo>Deploy a jar and generate a basic pom:</echo>
- <echo> ant deployLocal -Dpom=jboss-el.pom.xml -Djar=jboss-el.jar</echo>
- <echo />
- <echo>installProfile all profiles to ~/.m2/repository:</echo>
- <echo> ant installProfileProfiles</echo>
+ <echo> ant deploySnapshot -Dpom=jboss-el.pom.xml -Djar=jboss-el.jar</echo>
+ <echo>Deploy a snapshot jar and generate a basic pom:</echo>
+ <echo> ant deploySnapshotJar -Djar=jboss-el.jar</echo>
</target>
<macrodef name="installProfile">
@@ -94,7 +121,7 @@
<offline pom="debug.pom" repository="${offline.repository}" />
</target>
- <target name="offlineSeam" depends="initpoms">
+ <target name="offlineSeam" depends="initpoms" description="Build an offline snapshot of Seam jars">
<artifact:remoteRepository id="offline.repository" url="file://${offline.repository}" />
<deploySeam repositoryId="offline.repository" url="${offline.repository}" />
</target>
@@ -111,6 +138,7 @@
</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}" />
1.6 +218 -214 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ui.pom.xml 21 Sep 2007 10:13:10 -0000 1.5
+++ ui.pom.xml 22 Sep 2007 13:41:43 -0000 1.6
@@ -32,9 +32,7 @@
<configuration>
<library>
<prefix>org.jboss.seam.ui</prefix>
- <description>
- JSF controls for JBoss Seam
- </description>
+ <description>JSF controls for JBoss Seam</description>
<taglib>
<displayName>JBoss Seam UI</displayName>
<shortName>s</shortName>
@@ -134,6 +132,12 @@
<groupId>org.jbpm</groupId>
<artifactId>jbpm-jpdl</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
1.6 +410 -390 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- root.pom.xml 21 Sep 2007 20:29:21 -0000 1.5
+++ root.pom.xml 22 Sep 2007 13:41:43 -0000 1.6
@@ -27,6 +27,11 @@
<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>
@@ -34,12 +39,12 @@
<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>
@@ -48,6 +53,21 @@
</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
@@ -163,7 +183,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>3.0.0.ga</version>
+ <version>3.0.0.GA</version>
</dependency>
<dependency>
More information about the jboss-cvs-commits
mailing list