JBTM-2721 Updated to build with WFLY 10

gytis · Aug 11, 2016 · ad3c9b1 · ad3c9b1
1 parent 1bfae1a
commit ad3c9b1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/blacktie/pom.xml b/blacktie/pom.xml
@@ -325,11 +325,9 @@
         </dependencies>
     </dependencyManagement>
     <properties>
-        <version.org.wildfly.wildfly-parent>11.0.0.Alpha1-SNAPSHOT</version.org.wildfly.wildfly-parent>
-        <version.org.wildfly.core>3.0.0.Alpha4</version.org.wildfly.core>
-        <version.org.wildfly.build-tools>1.1.3.Final</version.org.wildfly.build-tools>
-        <version.suffix.org.jboss.javaee>.GA</version.suffix.org.jboss.javaee>
-        <version.org.jboss.integration>5.1.0.GA</version.org.jboss.integration>
+        <version.org.wildfly.wildfly-parent>10.0.0.Final</version.org.wildfly.wildfly-parent>
+        <version.org.wildfly.core>2.0.10.Final</version.org.wildfly.core>
+        <version.org.wildfly.build-tools>1.1.0.Final</version.org.wildfly.build-tools>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <src.main>src/main/cpp</src.main>
         <failOnErrorTests>true</failOnErrorTests>

diff --git a/scripts/hudson/narayana.bat b/scripts/hudson/narayana.bat
@@ -51,11 +51,11 @@ if not defined JBOSSAS_IP_ADDR echo "JBOSSAS_IP_ADDR not set" & for /f "delims="
 rem INITIALIZE JBOSS
 for /f "usebackq delims=<,> tokens=3" %%i in (`findstr "version.org.wildfly.wildfly-parent" blacktie\pom.xml`) do @set WILDFLY_MASTER_VERSION=%%i
 echo "Set WILDFLY_MASTER_VERSION=%WILDFLY_MASTER_VERSION%"
-if not "%WILDFLY_MASTER_VERSION%" == "%WILDFLY_VERSION_FROM_JBOSS_AS%" (call:comment_on_pull "Need to upgrade the version.org.wildfly.wildfly-parent in the narayana\blacktie pom.xml to %WILDFLY_VRESION_FROM_JBOSS_AS% - Check AS Version Failed %BUILD_URL%" & exit -1)
+if not "%WILDFLY_MASTER_VERSION%" == "%WILDFLY_VERSION_FROM_JBOSS_AS%" (echo "WARN: May need to upgrade the version.org.wildfly.wildfly-parent in the narayana\blacktie pom.xml to %WILDFLY_VRESION_FROM_JBOSS_AS% - Check AS Version Failed %BUILD_URL%")
 
-call ant -f blacktie\scripts\hudson\initializeJBoss.xml -DJBOSS_HOME=%WORKSPACE%\blacktie\wildfly-%WILDFLY_MASTER_VERSION% initializeJBoss -debug || (call:fail_build & exit -1)
+call ant -f blacktie\scripts\hudson\initializeJBoss.xml -DJBOSS_HOME=%WORKSPACE%\blacktie\wildfly-%WILDFLY_VERSION_FROM_JBOSS_AS% initializeJBoss -debug || (call:fail_build & exit -1)
 
-set JBOSS_HOME=%WORKSPACE%\blacktie\wildfly-%WILDFLY_MASTER_VERSION%
+set JBOSS_HOME=%WORKSPACE%\blacktie\wildfly-%WILDFLY_VERSION_FROM_JBOSS_AS%
 
 rem START JBOSS
 rem set JAVA_OPTS="%JAVA_OPTS% -Xmx1024m -XX:MaxPermSize=512m"

diff --git a/scripts/hudson/narayana.sh b/scripts/hudson/narayana.sh
@@ -354,25 +354,25 @@ function blacktie {
   cd ${WORKSPACE}
   WILDFLY_MASTER_VERSION=`grep 'version.org.wildfly.wildfly-parent' blacktie/pom.xml | cut -d \< -f 2|cut -d \> -f 2`
   echo "SET WILDFLY_MASTER_VERSION=${WILDFLY_MASTER_VERSION}"
-  [ ${WILDFLY_MASTER_VERSION} == ${WILDFLY_VERSION_FROM_JBOSS_AS} ] || fatal "Need to upgrade version.org.wildfly.wildfly-parent in the narayana/blacktie pom.xml to ${WILDFLY_VERSION_FROM_JBOSS_AS}"
+  [ ${WILDFLY_MASTER_VERSION} == ${WILDFLY_VERSION_FROM_JBOSS_AS} ] || echo "WARN: May need to upgrade version.org.wildfly.wildfly-parent in the narayana/blacktie pom.xml to ${WILDFLY_VERSION_FROM_JBOSS_AS}"
 
   ./build.sh -f blacktie/wildfly-blacktie/pom.xml clean install "$@"
   [ $? = 0 ] || fatal "Blacktie Subsystem build failed"
-  rm -rf ${WORKSPACE}/blacktie/wildfly-${WILDFLY_MASTER_VERSION}
-  cp -rp ${WORKSPACE}/jboss-as/build/target/wildfly-${WILDFLY_MASTER_VERSION} -d $PWD/blacktie
+  rm -rf ${WORKSPACE}/blacktie/wildfly-${WILDFLY_VERSION_FROM_JBOSS_AS}
+  cp -rp ${WORKSPACE}/jboss-as/build/target/wildfly-${WILDFLY_VERSION_FROM_JBOSS_AS} -d $PWD/blacktie
   [ $? = 0 ] || fatal "Could not unzip wildfly"
-  unzip ${WORKSPACE}/blacktie/wildfly-blacktie/build/target/wildfly-blacktie-build-5.3.4.Final-SNAPSHOT-bin.zip -d $PWD/blacktie/wildfly-${WILDFLY_MASTER_VERSION}
+  unzip ${WORKSPACE}/blacktie/wildfly-blacktie/build/target/wildfly-blacktie-build-5.3.4.Final-SNAPSHOT-bin.zip -d $PWD/blacktie/wildfly-${WILDFLY_VERSION_FROM_JBOSS_AS}
   [ $? = 0 ] || fatal "Could not unzip blacktie into widfly"
   # INITIALIZE JBOSS
-  ant -f blacktie/scripts/hudson/initializeJBoss.xml -DJBOSS_HOME=$WORKSPACE/blacktie/wildfly-${WILDFLY_MASTER_VERSION} initializeJBoss
+  ant -f blacktie/scripts/hudson/initializeJBoss.xml -DJBOSS_HOME=$WORKSPACE/blacktie/wildfly-${WILDFLY_VERSION_FROM_JBOSS_AS} initializeJBoss
   if [ "$?" != "0" ]; then
 	  fatal "Failed to init JBoss: $BUILD_URL"
   fi
-  chmod u+x $WORKSPACE/blacktie/wildfly-${WILDFLY_MASTER_VERSION}/bin/standalone.sh
+  chmod u+x $WORKSPACE/blacktie/wildfly-${WILDFLY_VERSION_FROM_JBOSS_AS}/bin/standalone.sh
 
   if [[ $# == 0 || $# > 0 && "$1" != "-DskipTests" ]]; then
     # START JBOSS
-    JBOSS_HOME=`pwd`/blacktie/wildfly-${WILDFLY_MASTER_VERSION} JAVA_OPTS="-Xmx256m -XX:MaxPermSize=256m $JAVA_OPTS" blacktie/wildfly-${WILDFLY_MASTER_VERSION}/bin/standalone.sh -c standalone-blacktie.xml -Djboss.bind.address=$JBOSSAS_IP_ADDR -Djboss.bind.address.unsecure=$JBOSSAS_IP_ADDR -Djboss.bind.address.management=$JBOSSAS_IP_ADDR&
+    JBOSS_HOME=`pwd`/blacktie/wildfly-${WILDFLY_VERSION_FROM_JBOSS_AS} JAVA_OPTS="-Xmx256m -XX:MaxPermSize=256m $JAVA_OPTS" blacktie/wildfly-${WILDFLY_VERSION_FROM_JBOSS_AS}/bin/standalone.sh -c standalone-blacktie.xml -Djboss.bind.address=$JBOSSAS_IP_ADDR -Djboss.bind.address.unsecure=$JBOSSAS_IP_ADDR -Djboss.bind.address.management=$JBOSSAS_IP_ADDR&
     sleep 5
   fi