Skip to content

GitLab

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
Expand all Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ 7710e143
......@@ -20,4 +20,9 @@ build/
nbbuild/
dist/
nbdist/
.nb-gradle/
\ No newline at end of file
.nb-gradle/
### 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
.gitlab-ci.yml
View file @ 7710e143
This diff is collapsed.
adapter/pom.xml
View file @ 7710e143
......@@ -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>
......
cp-solver/pom.xml
View file @ 7710e143
......@@ -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>
......
cp-solver/src/main/java/eu/melodic/upperware/cpsolver/solver/parser/CommonConstraintProblemParser.java
View file @ 7710e143
......@@ -336,4 +336,4 @@ public class CommonConstraintProblemParser implements ConstraintProblemParser {
return expression instanceof ComposedExpression;
}
}
}
\ No newline at end of file
cp-solver/src/main/java/eu/melodic/upperware/cpsolver/solver/parser/SolverParsedData.java
View file @ 7710e143
......@@ -11,6 +11,7 @@ import org.chocosolver.solver.variables.Variable;
import org.chocosolver.solver.variables.impl.FixedIntVarImpl;
import org.chocosolver.solver.variables.impl.FixedRealVarImpl;
import java.time.Clock;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -35,6 +36,21 @@ public class SolverParsedData {
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() {
Map<String, IntVar> intResult = intVars.values()
......
cp_generator/pom.xml
View file @ 7710e143
......@@ -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>
......
dlms/DLMSController/pom.xml
View file @ 7710e143
......@@ -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>
......
dlms/DLMSUtility/pom.xml
View file @ 7710e143
......@@ -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>
......
dlms/DLMSWebService/pom.xml
View file @ 7710e143
......@@ -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>
......
dlms/pom.xml
View file @ 7710e143
......@@ -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>
......
dlmsAgent/pom.xml
View file @ 7710e143
......@@ -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>
......
event-management/baguette-client-install/pom.xml
View file @ 7710e143
......@@ -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>
......@@ -31,7 +31,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.20</version>
<version>1.18.16</version>
<scope>provided</scope>
</dependency>
......
event-management/baguette-client/pom.xml
View file @ 7710e143
......@@ -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>
......@@ -54,7 +54,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.20</version>
<version>1.18.16</version>
<scope>provided</scope>
</dependency>
......@@ -90,7 +90,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptor>src/assembly/vm.xml</descriptor>
<descriptor>src/main/assembly/baguette-client-installation-package.xml</descriptor>
<finalName>baguette-client</finalName>
</configuration>
<executions>
......@@ -156,11 +156,11 @@
<configuration>
<fileSets>
<fileSet>
<sourceFile>target/baguette-client-vm.tgz</sourceFile>
<sourceFile>target/baguette-client-installation-package.tgz</sourceFile>
<destinationFile>../config-files/resources/baguette-client.tgz</destinationFile>
</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>
</fileSet>
<fileSet>
......
event-management/baguette-client/src/assembly/vm.xml → event-management/baguette-client/src/main/assembly/baguette-client-installation-package.xml
View file @ 7710e143
......@@ -14,7 +14,7 @@
http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd"
>
<id>vm</id>
<id>installation-package</id>
<formats>
<format>tgz</format>
</formats>
......
event-management/baguette-server/pom.xml
View file @ 7710e143
......@@ -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>
......@@ -44,7 +44,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.20</version>
<version>1.18.16</version>
<scope>provided</scope>
</dependency>
<dependency>
......
event-management/bin/initialize-keystores.bat
View file @ 7710e143
......@@ -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
event-management/bin/initialize-keystores.sh
View file @ 7710e143
......@@ -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
event-management/broker-cep/pom.xml
View file @ 7710e143
......@@ -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>
......
event-management/broker-client/pom.xml
View file @ 7710e143
......@@ -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>
......
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