Commit c9086790 authored by Alicja Reniewicz's avatar Alicja Reniewicz
Browse files

version upgrade to 3.1.0 for RC3.1

parent a0b65032
......@@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>eu.melodic</groupId>
<artifactId>adapter</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<name>Upperware - Adapter</name>
<description>
The component of PaaSage responsible for generating, validating and applying deployment plan based on CAMEL
......@@ -20,7 +20,7 @@
<parent>
<groupId>org.ow2.paasage</groupId>
<artifactId>upperware</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<properties>
<colloseum-client.version>0.2.0-SNAPSHOT</colloseum-client.version>
......@@ -148,7 +148,7 @@
<dependency>
<groupId>eu.melodic.security.authorization</groupId>
<artifactId>authorization-service-client</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>${melodic.version}</version>
</dependency>
<!--dependencies for higher version required by Spring boot 2 for Cloudiator Colosseum-->
<dependency>
......
......@@ -5,13 +5,13 @@
<parent>
<groupId>org.ow2.paasage</groupId>
<artifactId>upperware</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>eu.melodic</groupId>
<artifactId>cp-solver</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<name>Upperware - CP Solver</name>
<properties>
......
......@@ -13,7 +13,7 @@
<parent>
<groupId>org.ow2.paasage</groupId>
<artifactId>upperware</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>generator</artifactId>
......
......@@ -12,7 +12,7 @@
<parent>
<groupId>eu.melodic</groupId>
<artifactId>dlms</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<properties>
......
......@@ -12,7 +12,7 @@
<parent>
<groupId>eu.melodic</groupId>
<artifactId>dlms</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<dependencies>
......
......@@ -13,7 +13,7 @@
<parent>
<groupId>eu.melodic</groupId>
<artifactId>dlms</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<properties>
......
......@@ -5,7 +5,7 @@
<groupId>eu.melodic</groupId>
<artifactId>dlms</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<name>Upperware - DLMS</name>
<packaging>pom</packaging>
......@@ -15,7 +15,7 @@
<parent>
<groupId>org.ow2.paasage</groupId>
<artifactId>upperware</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<modules>
......
......@@ -6,7 +6,7 @@
<groupId>eu.melodic.dlms</groupId>
<artifactId>DLMSAgent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Upperware - DLMS - Agent</name>
......@@ -15,7 +15,7 @@
<parent>
<groupId>org.ow2.paasage</groupId>
<artifactId>upperware</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<properties>
......
......@@ -13,7 +13,7 @@
<parent>
<groupId>eu.melodic.event</groupId>
<artifactId>event-management</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>baguette-client-install</artifactId>
......@@ -23,7 +23,7 @@
<dependency>
<groupId>eu.melodic.event</groupId>
<artifactId>baguette-server</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
......
......@@ -13,7 +13,7 @@
<parent>
<groupId>eu.melodic.event</groupId>
<artifactId>event-management</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>baguette-client</artifactId>
......
......@@ -13,7 +13,7 @@
<parent>
<groupId>eu.melodic.event</groupId>
<artifactId>event-management</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>baguette-server</artifactId>
......
......@@ -16,7 +16,7 @@ IF NOT DEFINED MELODIC_CONFIG_DIR set MELODIC_CONFIG_DIR=%BASEDIR%\config-files
IF NOT DEFINED PAASAGE_CONFIG_DIR set PAASAGE_CONFIG_DIR=%BASEDIR%\config-files
:: Get IP addresses
set UTIL_FILE=util-3.0.0-SNAPSHOT-jar-with-dependencies.jar
set UTIL_FILE=util-3.1.0-SNAPSHOT-jar-with-dependencies.jar
set UTIL_PATH_0=util\target\%UTIL_FILE%
set UTIL_PATH_1=jars\util\%UTIL_FILE%
set UTIL_PATH_2=..\util\target\%UTIL_FILE%
......@@ -33,7 +33,7 @@ if exist %UTIL_PATH_0% (
if exist %UTIL_PATH_3% (
set UTIL_JAR=%UTIL_PATH_3%
) else (
echo ERROR: Couldn't find 'util-3.0.0-SNAPSHOT-jar-with-dependencies.jar'
echo ERROR: Couldn't find 'util-3.1.0-SNAPSHOT-jar-with-dependencies.jar'
echo ERROR: Skipping keystore initialization
goto the_end
)
......@@ -82,4 +82,4 @@ keytool -import -noprompt -file %CERTIFICATE% -alias %KEY_ALIAS% -keystore %TRUS
echo Key store, trust stores and certificate are ready.
:the_end
cd %PWD%
endlocal
\ No newline at end of file
endlocal
......@@ -15,7 +15,7 @@ if [[ -z $MELODIC_CONFIG_DIR ]]; then MELODIC_CONFIG_DIR=$BASEDIR/config-files;
if [[ -z $PAASAGE_CONFIG_DIR ]]; then PAASAGE_CONFIG_DIR=$BASEDIR/config-files; export PAASAGE_CONFIG_DIR; fi
# Get IP addresses
UTIL_FILE=util-3.0.0-SNAPSHOT-jar-with-dependencies.jar
UTIL_FILE=util-3.1.0-SNAPSHOT-jar-with-dependencies.jar
UTIL_PATH_0=util/target/${UTIL_FILE}
UTIL_PATH_1=jars/util/${UTIL_FILE}
UTIL_PATH_2=../util/target/${UTIL_FILE}
......@@ -29,7 +29,7 @@ elif [ -f ${UTIL_PATH_2} ]; then
elif [ -f ${UTIL_PATH_3} ]; then
UTIL_JAR=${UTIL_PATH_3}
else
echo "ERROR: Couldn't find 'util-3.0.0-SNAPSHOT-jar-with-dependencies.jar'"
echo "ERROR: Couldn't find 'util-3.1.0-SNAPSHOT-jar-with-dependencies.jar'"
echo "ERROR: Skipping keystore initialization"
cd ${PREVWORKDIR}
exit 1
......@@ -78,4 +78,4 @@ keytool -delete -alias ${KEY_ALIAS} -keystore ${TRUSTSTORE} -storetype ${KEYSTOR
keytool -import -noprompt -file ${CERTIFICATE} -alias ${KEY_ALIAS} -keystore ${TRUSTSTORE} -storetype ${KEYSTORE_TYPE} -storepass ${KEYSTORE_PASS}
echo Key store, trust stores and certificate are ready.
cd $PREVWORKDIR
\ No newline at end of file
cd $PREVWORKDIR
......@@ -13,7 +13,7 @@
<parent>
<groupId>eu.melodic.event</groupId>
<artifactId>event-management</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>broker-cep</artifactId>
......@@ -23,7 +23,7 @@
<dependency>
<groupId>org.ow2.paasage</groupId>
<artifactId>melodic-commons</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>${melodic.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
......
......@@ -13,7 +13,7 @@
<parent>
<groupId>eu.melodic.event</groupId>
<artifactId>event-management</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>broker-client</artifactId>
......
......@@ -13,7 +13,7 @@
<parent>
<groupId>eu.melodic.event</groupId>
<artifactId>event-management</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>control-service</artifactId>
......@@ -38,7 +38,7 @@
<dependency>
<groupId>eu.melodic.security.authorization</groupId>
<artifactId>authorization-service-client</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>${melodic.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
......
......@@ -14,12 +14,12 @@
<parent>
<groupId>org.ow2.paasage</groupId>
<artifactId>upperware</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>eu.melodic.event</groupId>
<artifactId>event-management</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Upperware - Event Management System</name>
......@@ -35,6 +35,7 @@
<esper-version>7.1.0</esper-version>
<!-- MathParser version -->
<mathparser-version>4.2.0</mathparser-version>
<melodic.version>3.1.0-SNAPSHOT</melodic.version>
</properties>
<modules>
......@@ -47,4 +48,4 @@
<module>translator</module>
<module>control-service</module>
</modules>
</project>
\ No newline at end of file
</project>
......@@ -13,7 +13,7 @@
<parent>
<groupId>eu.melodic.event</groupId>
<artifactId>event-management</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>translator</artifactId>
......@@ -55,22 +55,22 @@
<dependency>
<groupId>org.ow2.paasage</groupId>
<artifactId>melodic-commons</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>${melodic.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.paasage</groupId>
<artifactId>upperware-metamodel</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>${melodic.version}</version>
</dependency>
<dependency>
<groupId>camel</groupId>
<artifactId>camel</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>${melodic.version}</version>
</dependency>
<dependency>
<groupId>camel</groupId>
<artifactId>camel.dsl</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>${melodic.version}</version>
</dependency>
<dependency>
<groupId>eu.melodic</groupId>
......
......@@ -13,7 +13,7 @@
<parent>
<groupId>eu.melodic.event</groupId>
<artifactId>event-management</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>util</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>upperware</artifactId>
<groupId>org.ow2.paasage</groupId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -15,8 +15,8 @@
<properties>
<java.version>1.8</java.version>
<cdo.version>3.0.0-SNAPSHOT</cdo.version>
<upperware.version>3.0.0-SNAPSHOT</upperware.version>
<cdo.version>3.1.0-SNAPSHOT</cdo.version>
<upperware.version>3.1.0-SNAPSHOT</upperware.version>
<!--DOCKER plugin properties-->
<docker.imageName>gui-backend</docker.imageName>
</properties>
......@@ -83,7 +83,7 @@
<dependency>
<groupId>eu.melodic</groupId>
<artifactId>interfaces</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>${melodic.version}</version>
</dependency>
<dependency>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment