Commit 7710e143 authored by Alicja Reniewicz's avatar Alicja Reniewicz
Browse files

Merge branch 'rc3.1' into 'master'

Rc3.1

See merge request melodic/melodic-upperware!14
parents 6b78216f ba1fa74e
Pipeline #19882 passed with stages
in 22 minutes and 19 seconds
...@@ -20,4 +20,9 @@ build/ ...@@ -20,4 +20,9 @@ build/
nbbuild/ nbbuild/
dist/ dist/
nbdist/ nbdist/
.nb-gradle/ .nb-gradle/
\ No newline at end of file
### MCTS tree printing ###
zpp-solver/testing_module/src/main/resources/nodes*
zpp-solver/testing_module/src/main/resources/tree*
\ No newline at end of file
This diff is collapsed.
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>eu.melodic</groupId> <groupId>eu.melodic</groupId>
<artifactId>adapter</artifactId> <artifactId>adapter</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
<name>Upperware - Adapter</name> <name>Upperware - Adapter</name>
<description> <description>
The component of PaaSage responsible for generating, validating and applying deployment plan based on CAMEL The component of PaaSage responsible for generating, validating and applying deployment plan based on CAMEL
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<parent> <parent>
<groupId>org.ow2.paasage</groupId> <groupId>org.ow2.paasage</groupId>
<artifactId>upperware</artifactId> <artifactId>upperware</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
<colloseum-client.version>0.2.0-SNAPSHOT</colloseum-client.version> <colloseum-client.version>0.2.0-SNAPSHOT</colloseum-client.version>
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<dependency> <dependency>
<groupId>eu.melodic.security.authorization</groupId> <groupId>eu.melodic.security.authorization</groupId>
<artifactId>authorization-service-client</artifactId> <artifactId>authorization-service-client</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>${melodic.version}</version>
</dependency> </dependency>
<!--dependencies for higher version required by Spring boot 2 for Cloudiator Colosseum--> <!--dependencies for higher version required by Spring boot 2 for Cloudiator Colosseum-->
<dependency> <dependency>
......
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
<parent> <parent>
<groupId>org.ow2.paasage</groupId> <groupId>org.ow2.paasage</groupId>
<artifactId>upperware</artifactId> <artifactId>upperware</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
</parent> </parent>
<groupId>eu.melodic</groupId> <groupId>eu.melodic</groupId>
<artifactId>cp-solver</artifactId> <artifactId>cp-solver</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
<name>Upperware - CP Solver</name> <name>Upperware - CP Solver</name>
<properties> <properties>
......
...@@ -336,4 +336,4 @@ public class CommonConstraintProblemParser implements ConstraintProblemParser { ...@@ -336,4 +336,4 @@ public class CommonConstraintProblemParser implements ConstraintProblemParser {
return expression instanceof ComposedExpression; return expression instanceof ComposedExpression;
} }
} }
\ No newline at end of file
...@@ -11,6 +11,7 @@ import org.chocosolver.solver.variables.Variable; ...@@ -11,6 +11,7 @@ import org.chocosolver.solver.variables.Variable;
import org.chocosolver.solver.variables.impl.FixedIntVarImpl; import org.chocosolver.solver.variables.impl.FixedIntVarImpl;
import org.chocosolver.solver.variables.impl.FixedRealVarImpl; import org.chocosolver.solver.variables.impl.FixedRealVarImpl;
import java.time.Clock;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -35,6 +36,21 @@ public class SolverParsedData { ...@@ -35,6 +36,21 @@ public class SolverParsedData {
return result; return result;
} }
public List<CpSolution> solve(int timeLimit) {
Solver solver = model.getSolver();
solver.limitTime(timeLimit + "s");
List<CpSolution> result = new ArrayList<>();
Clock clock = Clock.systemDefaultZone();
long startTime = clock.millis();
long currentTime = startTime;
while (currentTime - startTime <= 1000*timeLimit && solver.solve()) {
result.add(createCpSolution());
solver.limitTime(timeLimit + "s");
currentTime = clock.millis();
}
return result;
}
private CpSolution createCpSolution() { private CpSolution createCpSolution() {
Map<String, IntVar> intResult = intVars.values() Map<String, IntVar> intResult = intVars.values()
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<parent> <parent>
<groupId>org.ow2.paasage</groupId> <groupId>org.ow2.paasage</groupId>
<artifactId>upperware</artifactId> <artifactId>upperware</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>generator</artifactId> <artifactId>generator</artifactId>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>eu.melodic</groupId> <groupId>eu.melodic</groupId>
<artifactId>dlms</artifactId> <artifactId>dlms</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>eu.melodic</groupId> <groupId>eu.melodic</groupId>
<artifactId>dlms</artifactId> <artifactId>dlms</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<parent> <parent>
<groupId>eu.melodic</groupId> <groupId>eu.melodic</groupId>
<artifactId>dlms</artifactId> <artifactId>dlms</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<groupId>eu.melodic</groupId> <groupId>eu.melodic</groupId>
<artifactId>dlms</artifactId> <artifactId>dlms</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
<name>Upperware - DLMS</name> <name>Upperware - DLMS</name>
<packaging>pom</packaging> <packaging>pom</packaging>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<parent> <parent>
<groupId>org.ow2.paasage</groupId> <groupId>org.ow2.paasage</groupId>
<artifactId>upperware</artifactId> <artifactId>upperware</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<groupId>eu.melodic.dlms</groupId> <groupId>eu.melodic.dlms</groupId>
<artifactId>DLMSAgent</artifactId> <artifactId>DLMSAgent</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Upperware - DLMS - Agent</name> <name>Upperware - DLMS - Agent</name>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<parent> <parent>
<groupId>org.ow2.paasage</groupId> <groupId>org.ow2.paasage</groupId>
<artifactId>upperware</artifactId> <artifactId>upperware</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<parent> <parent>
<groupId>eu.melodic.event</groupId> <groupId>eu.melodic.event</groupId>
<artifactId>event-management</artifactId> <artifactId>event-management</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>baguette-client-install</artifactId> <artifactId>baguette-client-install</artifactId>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<dependency> <dependency>
<groupId>eu.melodic.event</groupId> <groupId>eu.melodic.event</groupId>
<artifactId>baguette-server</artifactId> <artifactId>baguette-server</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>${project.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.16.20</version> <version>1.18.16</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<parent> <parent>
<groupId>eu.melodic.event</groupId> <groupId>eu.melodic.event</groupId>
<artifactId>event-management</artifactId> <artifactId>event-management</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>baguette-client</artifactId> <artifactId>baguette-client</artifactId>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.16.20</version> <version>1.18.16</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<configuration> <configuration>
<descriptor>src/assembly/vm.xml</descriptor> <descriptor>src/main/assembly/baguette-client-installation-package.xml</descriptor>
<finalName>baguette-client</finalName> <finalName>baguette-client</finalName>
</configuration> </configuration>
<executions> <executions>
...@@ -156,11 +156,11 @@ ...@@ -156,11 +156,11 @@
<configuration> <configuration>
<fileSets> <fileSets>
<fileSet> <fileSet>
<sourceFile>target/baguette-client-vm.tgz</sourceFile> <sourceFile>target/baguette-client-installation-package.tgz</sourceFile>
<destinationFile>../config-files/resources/baguette-client.tgz</destinationFile> <destinationFile>../config-files/resources/baguette-client.tgz</destinationFile>
</fileSet> </fileSet>
<fileSet> <fileSet>
<sourceFile>target/baguette-client-vm.tgz.md5</sourceFile> <sourceFile>target/baguette-client-installation-package.tgz.md5</sourceFile>
<destinationFile>../config-files/resources/baguette-client.tgz.md5</destinationFile> <destinationFile>../config-files/resources/baguette-client.tgz.md5</destinationFile>
</fileSet> </fileSet>
<fileSet> <fileSet>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd" http://maven.apache.org/xsd/assembly-1.1.2.xsd"
> >
<id>vm</id> <id>installation-package</id>
<formats> <formats>
<format>tgz</format> <format>tgz</format>
</formats> </formats>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<parent> <parent>
<groupId>eu.melodic.event</groupId> <groupId>eu.melodic.event</groupId>
<artifactId>event-management</artifactId> <artifactId>event-management</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>baguette-server</artifactId> <artifactId>baguette-server</artifactId>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.16.20</version> <version>1.18.16</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -16,7 +16,7 @@ IF NOT DEFINED MELODIC_CONFIG_DIR set MELODIC_CONFIG_DIR=%BASEDIR%\config-files ...@@ -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 IF NOT DEFINED PAASAGE_CONFIG_DIR set PAASAGE_CONFIG_DIR=%BASEDIR%\config-files
:: Get IP addresses :: 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_0=util\target\%UTIL_FILE%
set UTIL_PATH_1=jars\util\%UTIL_FILE% set UTIL_PATH_1=jars\util\%UTIL_FILE%
set UTIL_PATH_2=..\util\target\%UTIL_FILE% set UTIL_PATH_2=..\util\target\%UTIL_FILE%
...@@ -33,7 +33,7 @@ if exist %UTIL_PATH_0% ( ...@@ -33,7 +33,7 @@ if exist %UTIL_PATH_0% (
if exist %UTIL_PATH_3% ( if exist %UTIL_PATH_3% (
set UTIL_JAR=%UTIL_PATH_3% set UTIL_JAR=%UTIL_PATH_3%
) else ( ) 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 echo ERROR: Skipping keystore initialization
goto the_end goto the_end
) )
...@@ -82,4 +82,4 @@ keytool -import -noprompt -file %CERTIFICATE% -alias %KEY_ALIAS% -keystore %TRUS ...@@ -82,4 +82,4 @@ keytool -import -noprompt -file %CERTIFICATE% -alias %KEY_ALIAS% -keystore %TRUS
echo Key store, trust stores and certificate are ready. echo Key store, trust stores and certificate are ready.
:the_end :the_end
cd %PWD% cd %PWD%
endlocal endlocal
\ No newline at end of file
...@@ -15,7 +15,7 @@ if [[ -z $MELODIC_CONFIG_DIR ]]; then MELODIC_CONFIG_DIR=$BASEDIR/config-files; ...@@ -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 if [[ -z $PAASAGE_CONFIG_DIR ]]; then PAASAGE_CONFIG_DIR=$BASEDIR/config-files; export PAASAGE_CONFIG_DIR; fi
# Get IP addresses # 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_0=util/target/${UTIL_FILE}
UTIL_PATH_1=jars/util/${UTIL_FILE} UTIL_PATH_1=jars/util/${UTIL_FILE}
UTIL_PATH_2=../util/target/${UTIL_FILE} UTIL_PATH_2=../util/target/${UTIL_FILE}
...@@ -29,7 +29,7 @@ elif [ -f ${UTIL_PATH_2} ]; then ...@@ -29,7 +29,7 @@ elif [ -f ${UTIL_PATH_2} ]; then
elif [ -f ${UTIL_PATH_3} ]; then elif [ -f ${UTIL_PATH_3} ]; then
UTIL_JAR=${UTIL_PATH_3} UTIL_JAR=${UTIL_PATH_3}
else 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" echo "ERROR: Skipping keystore initialization"
cd ${PREVWORKDIR} cd ${PREVWORKDIR}
exit 1 exit 1
...@@ -78,4 +78,4 @@ keytool -delete -alias ${KEY_ALIAS} -keystore ${TRUSTSTORE} -storetype ${KEYSTOR ...@@ -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} 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. echo Key store, trust stores and certificate are ready.
cd $PREVWORKDIR cd $PREVWORKDIR
\ No newline at end of file
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<parent> <parent>
<groupId>eu.melodic.event</groupId> <groupId>eu.melodic.event</groupId>
<artifactId>event-management</artifactId> <artifactId>event-management</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>broker-cep</artifactId> <artifactId>broker-cep</artifactId>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<dependency> <dependency>
<groupId>org.ow2.paasage</groupId> <groupId>org.ow2.paasage</groupId>
<artifactId>melodic-commons</artifactId> <artifactId>melodic-commons</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>${melodic.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<parent> <parent>
<groupId>eu.melodic.event</groupId> <groupId>eu.melodic.event</groupId>
<artifactId>event-management</artifactId> <artifactId>event-management</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>broker-client</artifactId> <artifactId>broker-client</artifactId>
......
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