6:40 a.m.
Author: objectiser
Date: 2011-06-23 07:40:25 -0400 (Thu, 23 Jun 2011)
New Revision: 1387
Modified:
trunk/integration-tests/build.xml
trunk/integration-tests/pom.xml
trunk/pom.xml
trunk/qa/build.xml
trunk/qa/hudson-riftsaw-local.sh
Log:
Update uddi/scout and jbossesb versions for integration tests.
Modified: trunk/integration-tests/build.xml
===================================================================
--- trunk/integration-tests/build.xml 2011-06-22 12:34:13 UTC (rev 1386)
+++ trunk/integration-tests/build.xml 2011-06-23 11:40:25 UTC (rev 1387)
@@ -69,8 +69,10 @@
</target>
<target name="copy.rosetta.aop">
+ <!--
<copy file="${dependency.rosetta.aop}"
- tofile="${basedir}/target/rosetta.aop" />
+ tofile="${basedir}/target/rosetta.aop" />
+ -->
</target>
<target name="replace.jdbc.files"
if="is.replace.qa.jdbc">
Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml 2011-06-22 12:34:13 UTC (rev 1386)
+++ trunk/integration-tests/pom.xml 2011-06-23 11:40:25 UTC (rev 1387)
@@ -41,8 +41,7 @@
<dependency>
<groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
<artifactId>jbossesb-rosetta</artifactId>
- <!-- version>${jbossesb.version}</version -->
- <version>4.9</version>
+ <version>${jbossesb.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -278,10 +277,10 @@
</dependency>
-->
<dependency>
- <groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
+ <groupId>org.apache.ws.scout</groupId>
<artifactId>scout</artifactId>
- <version>1.2</version>
- <classifier>aop</classifier>
+ <version>1.2.2</version>
+ <!-- >classifier>aop</classifier -->
<type>jar</type>
</dependency>
<!--
@@ -291,29 +290,31 @@
<scope>test</scope> </dependency>
-->
<dependency>
- <groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
+ <groupId>org.apache.juddi</groupId>
<artifactId>juddi-client</artifactId>
- <version>3.0.0</version>
- <classifier>aop</classifier>
+ <version>${juddi.version}</version>
+ <!-- >classifier>aop</classifier -->
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
+ <groupId>org.apache.juddi</groupId>
<artifactId>juddi-core</artifactId>
- <version>3.0.0</version>
- <classifier>aop</classifier>
+ <version>${juddi.version}</version>
+ <!-- >classifier>aop</classifier -->
<type>jar</type>
</dependency>
+ <!-- Is this necessary?
<dependency>
<groupId>org.jboss.soa.bpel.dependencies.esb.aop</groupId>
<artifactId>rosetta</artifactId>
<version>4.7</version>
<type>aop</type>
</dependency>
+ -->
<dependency>
<groupId>org.apache.juddi</groupId>
<artifactId>uddi-ws</artifactId>
- <version>3.0.0</version>
+ <version>${juddi.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-06-22 12:34:13 UTC (rev 1386)
+++ trunk/pom.xml 2011-06-23 11:40:25 UTC (rev 1387)
@@ -112,6 +112,7 @@
<axiom.version>1.2.8</axiom.version>
<commons.codec.version>1.4</commons.codec.version>
<picketlink.version>1.0.3.final</picketlink.version>
+ <juddi.version>3.1.0-SNAPSHOT</juddi.version>
</properties>
<dependencyManagement>
Modified: trunk/qa/build.xml
===================================================================
--- trunk/qa/build.xml 2011-06-22 12:34:13 UTC (rev 1386)
+++ trunk/qa/build.xml 2011-06-23 11:40:25 UTC (rev 1387)
@@ -22,19 +22,12 @@
<property name="jboss.distro.url"
value="http://downloads.sourceforge.net/jboss/${jboss.filename}" />
<property name="jboss.distro.path"
value="${download.dir}/${jboss.filename}" />
- <property name="jbossesb.version" value="4.10" />
+ <property name="jbossesb.version" value="4.10-SNAPSHOT" />
<property name="jbossesb.distro.dir"
value="${riftsaw.home}/downloads" />
- <property name="jbossesb.filename"
value="jbossesb-${jbossesb.version}-snapshot.zip" />
+ <property name="jbossesb.filename"
value="jbossesb-${jbossesb.version}.zip" />
<property name="jbossesb.distro.url"
value="http://downloads.jboss.org/riftsaw/releases/dependencies/${jb...
/>
<property name="jbossesb.distro.path"
value="${download.dir}/${jbossesb.filename}" />
-<!--
- <property name="jbossesb.version" value="4.7" />
- <property name="jbossesb.distro.dir"
value="${riftsaw.home}/downloads" />
- <property name="jbossesb.filename"
value="jbossesb-${jbossesb.version}.zip" />
- <property name="jbossesb.distro.url"
value="http://download.jboss.org/jbossesb/${jbossesb.version}/binary...
/>
- <property name="jbossesb.distro.path"
value="${download.dir}/${jbossesb.filename}" />
--->
<property name="oracle.driver.path"
value="${download.dir}/ojdbc14.jar" />
<property name="db2.driver.path"
value="${download.dir}/db2jcc.jar" />
Modified: trunk/qa/hudson-riftsaw-local.sh
===================================================================
--- trunk/qa/hudson-riftsaw-local.sh 2011-06-22 12:34:13 UTC (rev 1386)
+++ trunk/qa/hudson-riftsaw-local.sh 2011-06-23 11:40:25 UTC (rev 1387)
@@ -12,14 +12,14 @@
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
AS_CONFIG="default"
REPLACE_QA_JDBC="true"
-JBOSS_ESB_VERSION="4.10"
+JBOSS_ESB_VERSION="4.10-SNAPSHOT"
JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION"
DATABASE="hsql"
STARTUP_TIME="3"
WS_STACK="native"
-WS_VERSION="3.4.0.GA"
+WS_VERSION="3.1.2.GA"
WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads"
ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE
-Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Ddownload.dir=$DOWNLOAD_DIR
-Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG
-Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION
-Dws.stack.dir=$WS_STACK_DIR -Dorg_jboss_esb_home=$JBOSS_ESB_HOME
-Dstartup.time=$STARTUP_TIME -Ddownload.dir=$DOWNLOAD_DIR"