Seam SVN: r8221 - branches/Seam_2_0/build.
by seam-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-05-17 17:10:48 -0400 (Sat, 17 May 2008)
New Revision: 8221
Modified:
branches/Seam_2_0/build/root.pom.xml
Log:
test to see if having snapshots repo defined here effects hudson issue.
Modified: branches/Seam_2_0/build/root.pom.xml
===================================================================
--- branches/Seam_2_0/build/root.pom.xml 2008-05-17 19:15:30 UTC (rev 8220)
+++ branches/Seam_2_0/build/root.pom.xml 2008-05-17 21:10:48 UTC (rev 8221)
@@ -28,12 +28,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>
</repositories>
<!-- Externalize some version numbers here -->
16 years
Seam SVN: r8220 - branches/Seam_2_0/build.
by seam-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-05-17 15:15:30 -0400 (Sat, 17 May 2008)
New Revision: 8220
Modified:
branches/Seam_2_0/build/common.build.xml
Log:
Backport of hudson/maven build fix
Modified: branches/Seam_2_0/build/common.build.xml
===================================================================
--- branches/Seam_2_0/build/common.build.xml 2008-05-16 20:36:17 UTC (rev 8219)
+++ branches/Seam_2_0/build/common.build.xml 2008-05-17 19:15:30 UTC (rev 8220)
@@ -269,6 +269,7 @@
<propertyref name="debug.pom" />
<propertyref name="jbas5.pom" />
<propertyref name="testng.jvmargs"/>
+ <propertyref name="maven.settings.xml" />
</propertyset>
</ant>
<pomfile name="example.pom" value="@{path}/pom.xml" />
16 years
Seam SVN: r8219 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-05-16 16:36:17 -0400 (Fri, 16 May 2008)
New Revision: 8219
Modified:
trunk/build/common.build.xml
Log:
another one
Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml 2008-05-16 20:12:55 UTC (rev 8218)
+++ trunk/build/common.build.xml 2008-05-16 20:36:17 UTC (rev 8219)
@@ -274,9 +274,10 @@
<propertyref name="ioc.pom" />
<propertyref name="mail.pom" />
<propertyref name="debug.pom" />
- <propertyref name="jbas5.pom" />
- <propertyref name="wicket.pom" />
+ <propertyref name="jbas5.pom" />
+ <propertyref name="wicket.pom" />
<propertyref name="testng.jvmargs"/>
+ <propertyref name="maven.settings.xml" />
</propertyset>
</ant>
<pomfile name="example.pom" value="@{path}/pom.xml" />
16 years
Seam SVN: r8218 - branches/Seam_2_0/build.
by seam-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-05-16 16:12:55 -0400 (Fri, 16 May 2008)
New Revision: 8218
Modified:
branches/Seam_2_0/build/ci.build.xml
branches/Seam_2_0/build/common.build.xml
Log:
one more back port for hudson/maven
Modified: branches/Seam_2_0/build/ci.build.xml
===================================================================
--- branches/Seam_2_0/build/ci.build.xml 2008-05-16 20:01:31 UTC (rev 8217)
+++ branches/Seam_2_0/build/ci.build.xml 2008-05-16 20:12:55 UTC (rev 8218)
@@ -81,7 +81,7 @@
</target>
<target name="deployDocumentation" depends="initdav, initpoms">
- <artifact:deploy uniqueVersion="false" file="${docs.pom}">
+ <artifact:deploy uniqueVersion="false" file="${docs.pom}" settingsFile="${maven.settings.xml}">
<pom file="${docs.pom}" settingsFile="${maven.settings.xml}"/>
<remoteRepository refId="snapshots.jboss.org" />
<attach file="${doc.ref.dir}/target/docbook/publish/en-US/pdf/seam_reference.pdf" classifier="pdf" type="pdf" />
Modified: branches/Seam_2_0/build/common.build.xml
===================================================================
--- branches/Seam_2_0/build/common.build.xml 2008-05-16 20:01:31 UTC (rev 8217)
+++ branches/Seam_2_0/build/common.build.xml 2008-05-16 20:12:55 UTC (rev 8218)
@@ -206,8 +206,8 @@
</propertyset>
</ant>
<pomfile name="example.pom" value="@{path}/pom.xml" />
- <artifact:deploy file="@{path}/dist/jboss-seam-(a){name}.ear" uniqueVersion="false">
- <pom file="${example.pom}" />
+ <artifact:deploy file="@{path}/dist/jboss-seam-(a){name}.ear" uniqueVersion="false" settingsFile="${maven.settings.xml}">
+ <pom file="${example.pom}" settingsFile="${maven.settings.xml}"/>
<attach file="@{path}/resources/jboss-seam-(a){name}-ds.xml" classifier="ds" type="xml" />
<remoteRepository refid="@{repositoryId}" />
</artifact:deploy>
@@ -272,8 +272,8 @@
</propertyset>
</ant>
<pomfile name="example.pom" value="@{path}/pom.xml" />
- <artifact:deploy file="@{path}/dist/jboss-seam-(a){name}.ear" uniqueVersion="false">
- <pom file="${example.pom}" />
+ <artifact:deploy file="@{path}/dist/jboss-seam-(a){name}.ear" uniqueVersion="false" settingsFile="${maven.settings.xml}">
+ <pom file="${example.pom}" settingsFile="${maven.settings.xml}"/>
<remoteRepository refid="@{repositoryId}" />
</artifact:deploy>
</sequential>
16 years
Seam SVN: r8217 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-05-16 16:01:31 -0400 (Fri, 16 May 2008)
New Revision: 8217
Modified:
trunk/build/ci.build.xml
Log:
oops
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-05-16 19:58:20 UTC (rev 8216)
+++ trunk/build/ci.build.xml 2008-05-16 20:01:31 UTC (rev 8217)
@@ -83,7 +83,7 @@
</target>
<target name="deployDocumentation" depends="initdav, initpoms">
- <artifact:deploy uniqueVersion="false" file="${docs.pom}">
+ <artifact:deploy uniqueVersion="false" file="${docs.pom}" settingsFile="${maven.settings.xml}">
<pom file="${docs.pom}" settingsFile="${maven.settings.xml}"/>
<remoteRepository refId="snapshots.jboss.org" />
<attach file="${doc.ref.dir}/target/docbook/publish/en-US/pdf/seam_reference.pdf" classifier="pdf" type="pdf" />
16 years
Seam SVN: r8216 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-05-16 15:58:20 -0400 (Fri, 16 May 2008)
New Revision: 8216
Modified:
trunk/build/common.build.xml
Log:
Oops
Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml 2008-05-16 19:42:15 UTC (rev 8215)
+++ trunk/build/common.build.xml 2008-05-16 19:58:20 UTC (rev 8216)
@@ -212,8 +212,8 @@
</propertyset>
</ant>
<pomfile name="example.pom" value="@{path}/pom.xml" />
- <artifact:deploy file="@{path}/dist/jboss-seam-(a){name}.ear" uniqueVersion="false">
- <pom file="${example.pom}" />
+ <artifact:deploy file="@{path}/dist/jboss-seam-(a){name}.ear" uniqueVersion="false" settingsFile="${maven.settings.xml}">
+ <pom file="${example.pom}" settingsFile="${maven.settings.xml}" />
<attach file="@{path}/resources/jboss-seam-(a){name}-ds.xml" classifier="ds" type="xml" />
<remoteRepository refid="@{repositoryId}" />
</artifact:deploy>
@@ -280,8 +280,8 @@
</propertyset>
</ant>
<pomfile name="example.pom" value="@{path}/pom.xml" />
- <artifact:deploy file="@{path}/dist/jboss-seam-(a){name}.ear" uniqueVersion="false">
- <pom file="${example.pom}" />
+ <artifact:deploy file="@{path}/dist/jboss-seam-(a){name}.ear" uniqueVersion="false" settingsFile="${maven.settings.xml}">
+ <pom file="${example.pom}" settingsFile="${maven.settings.xml}" />
<remoteRepository refid="@{repositoryId}" />
</artifact:deploy>
</sequential>
16 years
Seam SVN: r8215 - branches/Seam_2_0/build.
by seam-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-05-16 15:42:15 -0400 (Fri, 16 May 2008)
New Revision: 8215
Modified:
branches/Seam_2_0/build/common.build.xml
Log:
another maven/hudson build back port
Modified: branches/Seam_2_0/build/common.build.xml
===================================================================
--- branches/Seam_2_0/build/common.build.xml 2008-05-16 19:26:06 UTC (rev 8214)
+++ branches/Seam_2_0/build/common.build.xml 2008-05-16 19:42:15 UTC (rev 8215)
@@ -202,6 +202,7 @@
<propertyref name="debug.pom" />
<propertyref name="jbas5.pom" />
<propertyref name="testng.jvmargs"/>
+ <propertyref name="maven.settings.xml" />
</propertyset>
</ant>
<pomfile name="example.pom" value="@{path}/pom.xml" />
16 years
Seam SVN: r8214 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-05-16 15:26:06 -0400 (Fri, 16 May 2008)
New Revision: 8214
Modified:
trunk/build/common.build.xml
Log:
pass property across
Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml 2008-05-16 19:22:43 UTC (rev 8213)
+++ trunk/build/common.build.xml 2008-05-16 19:26:06 UTC (rev 8214)
@@ -205,9 +205,10 @@
<propertyref name="ioc.pom" />
<propertyref name="mail.pom" />
<propertyref name="debug.pom" />
- <propertyref name="jbas5.pom" />
- <propertyref name="wicket.pom" />
+ <propertyref name="jbas5.pom" />
+ <propertyref name="wicket.pom" />
<propertyref name="testng.jvmargs"/>
+ <propertyref name="maven.settings.xml" />
</propertyset>
</ant>
<pomfile name="example.pom" value="@{path}/pom.xml" />
16 years
Seam SVN: r8213 - in branches/Seam_2_0: examples and 1 other directories.
by seam-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-05-16 15:22:43 -0400 (Fri, 16 May 2008)
New Revision: 8213
Modified:
branches/Seam_2_0/build/ci.build.xml
branches/Seam_2_0/examples/build.xml
branches/Seam_2_0/examples/wiki/build.xml
Log:
more back port changes for hudson/maven build issues.
Modified: branches/Seam_2_0/build/ci.build.xml
===================================================================
--- branches/Seam_2_0/build/ci.build.xml 2008-05-16 18:59:01 UTC (rev 8212)
+++ branches/Seam_2_0/build/ci.build.xml 2008-05-16 19:22:43 UTC (rev 8213)
@@ -14,8 +14,10 @@
<import file="common.build.xml" />
- <artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2" />
-
+ <artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2">
+ <authentication username="hudson-services" password="${snapshots.password}" />
+ </artifact:remoteRepository>
+
<target name="deploySeamSnapshot" description="Deploy a Seam snapshot to snapshots.jboss.org" depends="initdav, initpoms">
<deploySnapshotPom pom="${root.pom}" />
<deploySnapshotPom pom="${parent.pom}" />
@@ -79,7 +81,7 @@
</target>
<target name="deployDocumentation" depends="initdav, initpoms">
- <artifact:deploy uniqueVersion="false" file="${docs.pom}" settingsFile="${maven.settings.xml}">
+ <artifact:deploy uniqueVersion="false" file="${docs.pom}">
<pom file="${docs.pom}" settingsFile="${maven.settings.xml}"/>
<remoteRepository refId="snapshots.jboss.org" />
<attach file="${doc.ref.dir}/target/docbook/publish/en-US/pdf/seam_reference.pdf" classifier="pdf" type="pdf" />
@@ -105,7 +107,7 @@
<macrodef name="deploySnapshotPom">
<attribute name="pom" />
<sequential>
- <artifact:deploy uniqueVersion="true" settingsFile="${maven.settings.xml}">
+ <artifact:deploy uniqueVersion="true">
<pom file="@{pom}" settingsFile="${maven.settings.xml}"/>
<remoteRepository refid="snapshots.jboss.org" />
</artifact:deploy>
@@ -117,7 +119,7 @@
<attribute name="jar" />
<attribute name="srcjar" />
<sequential>
- <artifact:deploy file="@{jar}" uniqueVersion="true" settingsFile="${maven.settings.xml}">
+ <artifact:deploy file="@{jar}" uniqueVersion="true">
<pom file="@{pom}" settingsFile="${maven.settings.xml}" />
<attach file="@{srcjar}" classifier="sources" />
<remoteRepository refid="snapshots.jboss.org" />
Modified: branches/Seam_2_0/examples/build.xml
===================================================================
--- branches/Seam_2_0/examples/build.xml 2008-05-16 18:59:01 UTC (rev 8212)
+++ branches/Seam_2_0/examples/build.xml 2008-05-16 19:22:43 UTC (rev 8213)
@@ -930,16 +930,16 @@
</target>
<target name="test" depends="buildtest, copyjbossembedded,getemma" description="Run the tests">
- <taskdef resource="testngtasks" classpathref="build.classpath" />
+ <taskdef resource="testngtasks" classpathref="test.classpath" />
<testng outputdir="${test-report.dir}">
- <jvmarg value="-Xmx800M" />
- <jvmarg value="-Djava.awt.headless=true" />
- <jvmarg value="-Demma.coverage.out.file=${coverage.ec}" />
- <jvmarg value="-Djava.endorsed.dirs=${endorsed.dir}" />
- <jvmarg value="${testng.jvmargs}" />
+ <jvmarg line="-Xmx800M" />
+ <jvmarg line="-Djava.awt.headless=true" />
+ <jvmarg line="-Demma.coverage.out.file=${coverage.ec}" />
+ <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir}" />
+ <jvmarg line="${testng.jvmargs}" />
<classpath>
- <path refid="test.classpath" />
- <path refid="runtime.emma.path" />
+ <path refid="test.classpath" />
+ <path refid="runtime.emma.path" />
</classpath>
<xmlfileset dir="${src.test.dir}" includes="**/testng.xml" />
</testng>
Modified: branches/Seam_2_0/examples/wiki/build.xml
===================================================================
--- branches/Seam_2_0/examples/wiki/build.xml 2008-05-16 18:59:01 UTC (rev 8212)
+++ branches/Seam_2_0/examples/wiki/build.xml 2008-05-16 19:22:43 UTC (rev 8213)
@@ -48,7 +48,7 @@
<exclude name="hibernate*"/>
<exclude name="ejb3-persistence*"/>
<exclude name="jboss-seam-gen.jar" />
- </fileset>
+ </fileset>
<path id="build.classpath">
<fileset refid="globallibs" />
@@ -72,6 +72,7 @@
<!-- Don't use that Hibernate either... -->
<exclude name="hibernate*.jar"/>
<exclude name="jboss-seam-jbas5.jar" />
+ <exclude name="ehcache.jar" />
</fileset>
<fileset dir="${local.lib.dir}">
<!-- This has the Hibernate we want -->
@@ -534,9 +535,9 @@
</classpath>
<xmlfileset dir="${src.test.dir}" includes="*.tng.xml" />
<jvmarg line="${testng.jvmargs}"/>
- <jvmarg value="-Demma.coverage.out.file=${coverage.ec}" />
+ <jvmarg line="-Demma.coverage.out.file=${coverage.ec}" />
<!-- Needed for running Embedded JBoss under JDK 6 -->
- <jvmarg value="-Djava.endorsed.dirs=${seam.dir}/classes/endorsed" />
+ <jvmarg line="-Djava.endorsed.dirs=${seam.dir}/classes/endorsed" />
</testng>
<echo message="Please read the test output in directory: ${test.output.dir}"/>
</target>
16 years
Seam SVN: r8212 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-05-16 14:59:01 -0400 (Fri, 16 May 2008)
New Revision: 8212
Modified:
trunk/build/ci.build.xml
Log:
Try specifying password manually
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-05-16 18:19:16 UTC (rev 8211)
+++ trunk/build/ci.build.xml 2008-05-16 18:59:01 UTC (rev 8212)
@@ -14,8 +14,10 @@
<import file="common.build.xml" />
- <artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2" />
-
+ <artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2">
+ <authentication username="hudson-services" password="${snapshots.password}" />
+ </artifact:remoteRepository>
+
<target name="deploySeamSnapshot" description="Deploy a Seam snapshot to snapshots.jboss.org" depends="initdav, initpoms">
<deploySnapshotPom pom="${root.pom}" />
<deploySnapshotPom pom="${parent.pom}" />
16 years