<groupId>org.onap.vfc.nfvo.wfengine</groupId>\r
<modelVersion>4.0.0</modelVersion>\r
<artifactId>activiti-extension</artifactId>\r
+ <version>1.0.0-SNAPSHOT</version>\r
<name>vfc-nfvo-wfengine-activiti-extension</name>\r
<packaging>jar</packaging>\r
\r
<properties>\r
+ <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>\r
<ant.version>1.9.6</ant.version>\r
<apache-velocity.version>1.6.2</apache-velocity.version>\r
<jgrapht.version>0.9.1</jgrapht.version>\r
</properties>\r
-\r
+ <repositories>\r
+ <repository>\r
+ <id>wfengine-releases</id>\r
+ <url>https://nexus.onap.org/content/repositories/releases</url>\r
+ <releases>\r
+ <enabled>true</enabled>\r
+ <updatePolicy>never</updatePolicy>\r
+ <checksumPolicy>fail</checksumPolicy>\r
+ </releases>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ <updatePolicy>always</updatePolicy>\r
+ <checksumPolicy>warn</checksumPolicy>\r
+ </snapshots>\r
+ </repository>\r
+ <repository>\r
+ <id>wfengine-snapshots</id>\r
+ <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
+ <releases>\r
+ <enabled>false</enabled>\r
+ <updatePolicy>always</updatePolicy>\r
+ <checksumPolicy>warn</checksumPolicy>\r
+ </releases>\r
+ <snapshots>\r
+ <enabled>true</enabled>\r
+ <updatePolicy>never</updatePolicy>\r
+ <checksumPolicy>fail</checksumPolicy>\r
+ </snapshots>\r
+ </repository>\r
+ </repositories>\r
<build>\r
<plugins>\r
<plugin>\r
-#!/bin/bash
+#!/usr/bin/env /bin/bash
DIRNAME=`dirname $0`
DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`
POM_DIR="../../../"
cd ${POM_DIR}
-VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate|grep '^VER'|cut -f2|echo)
-#VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate)
+
+mvncmd=$(whereis mvn | grep ^mvn |awk '{print $2}')
+echo mvncmd=$mvncmd
+if [[ 1$mvncmd != 1 ]]; then
+ echo $mvncmd
+elif [ $MVN ]; then
+ mvncmd=$MVN
+elif [ $M2_HOME ]; then
+ mvncmd=$M2_HOME/bin/mvn
+elif [ -f "/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33/bin/mvn" ]; then
+ mvncmd="/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33/bin/mvn"
+elif [ -f "/usr/share/maven/bin/mvn" ]; then
+ mvncmd="/usr/share/maven/bin/mvn"
+else
+ echo "Maven is not installed, mvncmd=$mvncmd"
+ exit 1
+fi
+
+pwd
+#VERSION=$(printf 'VER\t${project.version}\n0'|$mvncmd help:evaluate)
+#echo "0VERSION=${VERSION}"
+VERSION=$(printf 'VER\t${project.version}'|$mvncmd help:evaluate|grep '^VER'|cut -f2)
echo "VERSION=${VERSION}"
cd ${DOCKER_BUILD_DIR}
cp -f activiti-extension*.jar ./temp/WEB-INF/lib/activiti-extension.jar
echo "update activiti-rest.war"
-$JAVA_HOME/bin/jar -uvf activiti-rest.war -C ./temp/ ./
+jarcmd=$(whereis jar | grep ^jar |awk '{print $2}')
+if [ 1$jarcmd != 1 ]; then
+ echo $jarcmd
+elif [ $JAVA_HOME ]; then
+ jarcmd=$JAVA_HOME/bin/jar
+elif [ -f "/usr/lib/jvm/java-8-openjdk-amd64/bin/jar" ]; then
+ jarcmd="/usr/lib/jvm/java-8-openjdk-amd64/bin/jar"
+else
+ exit 1
+fi
+echo "jarcmd=${jarcmd}"
+$jarcmd -uvf activiti-rest.war -C ./temp/ ./
#. >/dev/null 2>&1 -C ./temp
cp activiti-rest.war ./build/apache-tomcat/webapps/
cp -Rf bin/* ./build/apache-tomcat/bin
<packaging>pom</packaging>\r
<name>vfc-nfvo-wfengine</name>\r
<description>vfc/nfvo/wfengine</description>\r
+ <repositories>\r
+ <repository>\r
+ <id>wfengine-releases</id>\r
+ <url>https://nexus.onap.org/content/repositories/releases</url>\r
+ <releases>\r
+ <enabled>true</enabled>\r
+ <updatePolicy>never</updatePolicy>\r
+ <checksumPolicy>fail</checksumPolicy>\r
+ </releases>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ <updatePolicy>always</updatePolicy>\r
+ <checksumPolicy>warn</checksumPolicy>\r
+ </snapshots>\r
+ </repository>\r
+ <repository>\r
+ <id>wfengine-snapshots</id>\r
+ <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
+ <releases>\r
+ <enabled>false</enabled>\r
+ <updatePolicy>always</updatePolicy>\r
+ <checksumPolicy>warn</checksumPolicy>\r
+ </releases>\r
+ <snapshots>\r
+ <enabled>true</enabled>\r
+ <updatePolicy>never</updatePolicy>\r
+ <checksumPolicy>fail</checksumPolicy>\r
+ </snapshots>\r
+ </repository>\r
+ </repositories>\r
</project>\r
<groupId>org.onap.vfc.nfvo.wfengine</groupId>\r
<modelVersion>4.0.0</modelVersion>\r
<artifactId>workflow-engine-mgr-service</artifactId>\r
+ <version>1.0.0-SNAPSHOT</version>\r
<name>vfc-nfvo-wfengine-wfenginemgrservice</name>\r
<packaging>jar</packaging>\r
\r
<properties>\r
+ <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>\r
<ant.version>1.9.6</ant.version>\r
<apache-velocity.version>1.6.2</apache-velocity.version>\r
<jgrapht.version>0.9.1</jgrapht.version>\r
</properties>\r
-\r
+ <repositories>\r
+ <repository>\r
+ <id>wfengine-releases</id>\r
+ <url>https://nexus.onap.org/content/repositories/releases</url>\r
+ <releases>\r
+ <enabled>true</enabled>\r
+ <updatePolicy>never</updatePolicy>\r
+ <checksumPolicy>fail</checksumPolicy>\r
+ </releases>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ <updatePolicy>always</updatePolicy>\r
+ <checksumPolicy>warn</checksumPolicy>\r
+ </snapshots>\r
+ </repository>\r
+ <repository>\r
+ <id>wfengine-snapshots</id>\r
+ <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
+ <releases>\r
+ <enabled>false</enabled>\r
+ <updatePolicy>always</updatePolicy>\r
+ <checksumPolicy>warn</checksumPolicy>\r
+ </releases>\r
+ <snapshots>\r
+ <enabled>true</enabled>\r
+ <updatePolicy>never</updatePolicy>\r
+ <checksumPolicy>fail</checksumPolicy>\r
+ </snapshots>\r
+ </repository>\r
+ </repositories>\r
<build>\r
<plugins>\r
<plugin>\r
# Wait for MSB initialization
echo "Wait for MSB initialization"
for i in {1..5}; do
- curl -sS -m 1 ${OPENPALETTE_MSB_IP}:${OPENPALETTE_MSB_PORT} > /dev/null && break
+ curl -sS -m 1 $OPENPALETTE_MSB_IP:$OPENPALETTE_MSB_PORT > /dev/null && break
sleep $i
done
-#!/bin/bash\r
+#!/usr/bin/env /bin/bash\r
\r
DIRNAME=`dirname $0`\r
DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`\r
\r
POM_DIR="../../../"\r
cd ${POM_DIR}\r
-VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate|grep '^VER'|cut -f2|echo)\r
-# VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate)\r
+\r
+mvncmd=$(whereis mvn | grep ^mvn |awk '{print $2}')\r
+echo mvncmd=$mvncmd\r
+if [[ 1$mvncmd != 1 ]]; then\r
+ echo $mvncmd\r
+elif [ $MVN ]; then\r
+ mvncmd=$MVN\r
+elif [ $M2_HOME ]; then\r
+ mvncmd=$M2_HOME/bin/mvn\r
+elif [ -f "/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33/bin/mvn" ]; then\r
+ mvncmd="/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33/bin/mvn"\r
+elif [ -f "/usr/share/maven/bin/mvn" ]; then\r
+ mvncmd="/usr/share/maven/bin/mvn"\r
+else\r
+ echo "Maven is not installed, mvncmd=$mvncmd"\r
+ exit 1\r
+fi\r
+\r
+pwd\r
+VERSION=$(printf 'VER\t${project.version}'|$mvncmd help:evaluate|grep '^VER'|cut -f2)\r
echo "VERSION=${VERSION}"\r
\r
cd ${DOCKER_BUILD_DIR}\r