Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Melodic
melodic-upperware
Commits
5a9d5feb
Commit
5a9d5feb
authored
Mar 30, 2021
by
Alicja Reniewicz
Browse files
Merge branch 'rc3.1--checking-ems' into 'rc3.1'
Rc3.1 checking ems See merge request
!12
parents
933335d3
b84c7354
Changes
8
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
5a9d5feb
...
@@ -127,8 +127,8 @@ build:dlms:
...
@@ -127,8 +127,8 @@ build:dlms:
script
:
script
:
-
$DLMS_CLI -Pwithout-docker clean install
-
$DLMS_CLI -Pwithout-docker clean install
artifacts
:
artifacts
:
paths
:
paths
:
-
$CI_PROJECT_DIR/dlms/target
-
$CI_PROJECT_DIR/dlms/target
build:dlms-utility:
build:dlms-utility:
stage
:
build
stage
:
build
...
@@ -136,8 +136,17 @@ build:dlms-utility:
...
@@ -136,8 +136,17 @@ build:dlms-utility:
script
:
script
:
-
$DLMS_UTILITY_CLI -Pwithout-docker clean install
-
$DLMS_UTILITY_CLI -Pwithout-docker clean install
artifacts
:
artifacts
:
paths
:
paths
:
-
$CI_PROJECT_DIR/dlms/DLMSUtility/target
-
$CI_PROJECT_DIR/dlms/DLMSUtility/target
build:dlms-agent:
stage
:
build
image
:
$MAVEN_IMAGE
script
:
-
$DLMS_AGENT_CLI -Pwithout-docker clean install
artifacts
:
paths
:
-
$CI_PROJECT_DIR/dlmsAgent/target
build:penalty-calculator:
build:penalty-calculator:
stage
:
build
stage
:
build
...
@@ -175,15 +184,6 @@ build:zpp-solver:
...
@@ -175,15 +184,6 @@ build:zpp-solver:
paths
:
paths
:
-
$CI_PROJECT_DIR/zpp-solver/target
-
$CI_PROJECT_DIR/zpp-solver/target
build:dlms-agent:
stage
:
build
image
:
$MAVEN_IMAGE
script
:
-
$DLMS_AGENT_CLI -Pwithout-docker clean install
artifacts
:
paths
:
-
$CI_PROJECT_DIR/dlmsAgent/target
build:ems:
build:ems:
stage
:
build
stage
:
build
image
:
$MAVEN_IMAGE
image
:
$MAVEN_IMAGE
...
@@ -225,10 +225,7 @@ build:ems-baguette-client:
...
@@ -225,10 +225,7 @@ build:ems-baguette-client:
image
:
$MAVEN_IMAGE
image
:
$MAVEN_IMAGE
script
:
script
:
-
$EMS_BAGUETTE_CLIENT_CLI -Pwithout-docker clean install
-
$EMS_BAGUETTE_CLIENT_CLI -Pwithout-docker clean install
artifacts
:
paths
:
-
$CI_PROJECT_DIR/event-management/baguette-client/target
build:ems-baguette-server:
build:ems-baguette-server:
stage
:
build
stage
:
build
image
:
$MAVEN_IMAGE
image
:
$MAVEN_IMAGE
...
@@ -256,6 +253,15 @@ build:ems-translator:
...
@@ -256,6 +253,15 @@ build:ems-translator:
paths
:
paths
:
-
$CI_PROJECT_DIR/event-management/translator/target
-
$CI_PROJECT_DIR/event-management/translator/target
build:ems-server:
stage
:
build
image
:
$MAVEN_IMAGE
script
:
-
$EMS_SERVER_CLI -Pwithout-docker clean install
artifacts
:
paths
:
-
$CI_PROJECT_DIR/event-management/control-service/target
deploy:melodic-upperware:
deploy:melodic-upperware:
stage
:
deploy
stage
:
deploy
only
:
only
:
...
@@ -314,56 +320,56 @@ deploy:melodic-commons:
...
@@ -314,56 +320,56 @@ deploy:melodic-commons:
deploy:melodic-cache:
deploy:melodic-cache:
stage
:
deploy
stage
:
deploy
only
:
only
:
-
master
-
master
-
rc3.0
-
rc3.0
-
rc3.1
-
rc3.1
image
:
$DOCKER_DIND_IMAGE
image
:
$DOCKER_DIND_IMAGE
services
:
services
:
-
$DOCKER_DIND_SERVICE
-
$DOCKER_DIND_SERVICE
dependencies
:
dependencies
:
-
build:melodic-cache
-
build:melodic-cache
script
:
script
:
-
$DOCKER_CLI $MELODIC_CACHE_CLI deploy
-
$DOCKER_CLI $MELODIC_CACHE_CLI deploy
deploy:dlms:
deploy:dlms:
stage
:
deploy
stage
:
deploy
only
:
only
:
-
master
-
master
-
rc3.0
-
rc3.0
-
rc3.1
-
rc3.1
image
:
$DOCKER_DIND_IMAGE
image
:
$DOCKER_DIND_IMAGE
services
:
services
:
-
$DOCKER_DIND_SERVICE
-
$DOCKER_DIND_SERVICE
dependencies
:
dependencies
:
-
build:dlms
-
build:dlms
script
:
script
:
-
$DOCKER_CLI $DLMS_CLI deploy
-
$DOCKER_CLI $DLMS_CLI deploy
deploy:dlms-utility:
deploy:dlms-utility:
stage
:
deploy
stage
:
deploy
only
:
only
:
-
master
-
master
-
rc3.0
-
rc3.0
-
rc3.1
-
rc3.1
image
:
$DOCKER_DIND_IMAGE
image
:
$DOCKER_DIND_IMAGE
services
:
services
:
-
$DOCKER_DIND_SERVICE
-
$DOCKER_DIND_SERVICE
dependencies
:
dependencies
:
-
build:dlms-utility
-
build:dlms-utility
script
:
script
:
-
$DOCKER_CLI $DLMS_UTILITY_CLI deploy
-
$DOCKER_CLI $DLMS_UTILITY_CLI deploy
deploy:dlms-controller:
deploy:dlms-controller:
stage
:
deploy
stage
:
deploy
only
:
only
:
-
master
-
master
-
rc3.0
-
rc3.0
-
rc3.1
-
rc3.1
image
:
$DOCKER_DIND_IMAGE
image
:
$DOCKER_DIND_IMAGE
services
:
services
:
-
$DOCKER_DIND_SERVICE
-
$DOCKER_DIND_SERVICE
script
:
script
:
-
$DOCKER_CLI $DLMS_CONTROLLER_CLI -Ddocker.imagePrefix=melodic/ clean install
-
$DOCKER_CLI $DLMS_CONTROLLER_CLI -Ddocker.imagePrefix=melodic/ clean install
-
echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
-
echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
-
docker tag $LOCAL_REPO/melodic/dlms-controller:unknown $CI_REGISTRY_IMAGE/dlms-controller:$CI_COMMIT_BRANCH
-
docker tag $LOCAL_REPO/melodic/dlms-controller:unknown $CI_REGISTRY_IMAGE/dlms-controller:$CI_COMMIT_BRANCH
...
@@ -371,14 +377,14 @@ deploy:dlms-controller:
...
@@ -371,14 +377,14 @@ deploy:dlms-controller:
deploy:dlms-webservice:
deploy:dlms-webservice:
stage
:
deploy
stage
:
deploy
only
:
only
:
-
master
-
master
-
rc3.0
-
rc3.0
-
rc3.1
-
rc3.1
image
:
$DOCKER_DIND_IMAGE
image
:
$DOCKER_DIND_IMAGE
services
:
services
:
-
$DOCKER_DIND_SERVICE
-
$DOCKER_DIND_SERVICE
script
:
script
:
-
$DOCKER_CLI $DLMS_WEB_SERVICE_CLI -Ddocker.imagePrefix=melodic/ clean install
-
$DOCKER_CLI $DLMS_WEB_SERVICE_CLI -Ddocker.imagePrefix=melodic/ clean install
-
echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
-
echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
-
docker tag $LOCAL_REPO/melodic/dlms-webservice:unknown $CI_REGISTRY_IMAGE/dlms-webservice:$CI_COMMIT_BRANCH
-
docker tag $LOCAL_REPO/melodic/dlms-webservice:unknown $CI_REGISTRY_IMAGE/dlms-webservice:$CI_COMMIT_BRANCH
...
@@ -386,14 +392,14 @@ deploy:dlms-webservice:
...
@@ -386,14 +392,14 @@ deploy:dlms-webservice:
deploy:penalty-calculator:
deploy:penalty-calculator:
stage
:
deploy
stage
:
deploy
only
:
only
:
-
master
-
master
-
rc3.0
-
rc3.0
-
rc3.1
-
rc3.1
image
:
$DOCKER_DIND_IMAGE
image
:
$DOCKER_DIND_IMAGE
services
:
services
:
-
$DOCKER_DIND_SERVICE
-
$DOCKER_DIND_SERVICE
dependencies
:
dependencies
:
-
build:penalty-calculator
-
build:penalty-calculator
script
:
script
:
-
$DOCKER_CLI $PENALTY_CALCULATOR_CLI deploy
-
$DOCKER_CLI $PENALTY_CALCULATOR_CLI deploy
...
@@ -415,28 +421,28 @@ deploy:jwt-server:
...
@@ -415,28 +421,28 @@ deploy:jwt-server:
deploy:utility-generator:
deploy:utility-generator:
stage
:
deploy
stage
:
deploy
only
:
only
:
-
master
-
master
-
rc3.0
-
rc3.0
-
rc3.1
-
rc3.1
image
:
$DOCKER_DIND_IMAGE
image
:
$DOCKER_DIND_IMAGE
services
:
services
:
-
$DOCKER_DIND_SERVICE
-
$DOCKER_DIND_SERVICE
dependencies
:
dependencies
:
-
build:utility-generator
-
build:utility-generator
script
:
script
:
-
$DOCKER_CLI $UTILITY_GENERATOR_CLI deploy
-
$DOCKER_CLI $UTILITY_GENERATOR_CLI deploy
deploy:zpp-solver:
deploy:zpp-solver:
stage
:
deploy
stage
:
deploy
only
:
only
:
-
master
-
master
-
rc3.0
-
rc3.0
-
rc3.1
-
rc3.1
image
:
$DOCKER_DIND_IMAGE
image
:
$DOCKER_DIND_IMAGE
services
:
services
:
-
$DOCKER_DIND_SERVICE
-
$DOCKER_DIND_SERVICE
dependencies
:
dependencies
:
-
build:zpp-solver
-
build:zpp-solver
script
:
script
:
-
$DOCKER_CLI $ZPP_SOLVER_CLI deploy
-
$DOCKER_CLI $ZPP_SOLVER_CLI deploy
...
@@ -473,14 +479,14 @@ deploy:cp-generator:
...
@@ -473,14 +479,14 @@ deploy:cp-generator:
deploy:cp-solver:
deploy:cp-solver:
stage
:
deploy
stage
:
deploy
only
:
only
:
-
master
-
master
-
rc3.0
-
rc3.0
-
rc3.1
-
rc3.1
image
:
$DOCKER_DIND_IMAGE
image
:
$DOCKER_DIND_IMAGE
services
:
services
:
-
$DOCKER_DIND_SERVICE
-
$DOCKER_DIND_SERVICE
script
:
script
:
-
$DOCKER_CLI $CP_SOLVER_CLI -Ddocker.imagePrefix=melodic/ clean install
-
$DOCKER_CLI $CP_SOLVER_CLI -Ddocker.imagePrefix=melodic/ clean install
-
echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
-
echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
-
docker tag $LOCAL_REPO/melodic/cpsolver:unknown $CI_REGISTRY_IMAGE/cpsolver:$CI_COMMIT_BRANCH
-
docker tag $LOCAL_REPO/melodic/cpsolver:unknown $CI_REGISTRY_IMAGE/cpsolver:$CI_COMMIT_BRANCH
...
@@ -488,14 +494,14 @@ deploy:cp-solver:
...
@@ -488,14 +494,14 @@ deploy:cp-solver:
deploy:dlms-agent:
deploy:dlms-agent:
stage
:
deploy
stage
:
deploy
only
:
only
:
-
master
-
master
-
rc3.0
-
rc3.0
-
rc3.1
-
rc3.1
image
:
"
python:latest"
image
:
"
python:latest"
before_script
:
before_script
:
-
pip install awscli
-
pip install awscli
dependencies
:
dependencies
:
-
build:dlms-agent
-
build:dlms-agent
script
:
script
:
-
export AWS_ACCESS_KEY_ID=$K8S_SECRET_AWS_USER
-
export AWS_ACCESS_KEY_ID=$K8S_SECRET_AWS_USER
...
@@ -648,7 +654,7 @@ deploy:cp-parser:
...
@@ -648,7 +654,7 @@ deploy:cp-parser:
deploy:gen-solver:
deploy:gen-solver:
stage
:
deploy
stage
:
deploy
only
:
only
:
-
master
-
master
-
rc3.0
-
rc3.0
-
rc3.1
-
rc3.1
...
@@ -657,7 +663,7 @@ deploy:gen-solver:
...
@@ -657,7 +663,7 @@ deploy:gen-solver:
-
$DOCKER_DIND_SERVICE
-
$DOCKER_DIND_SERVICE
dependencies
:
dependencies
:
-
build:cp-solver
-
build:cp-solver
script
:
script
:
-
$DOCKER_CLI $GEN_SOLVER_CLI -Ddocker.imagePrefix=melodic/ clean install
-
$DOCKER_CLI $GEN_SOLVER_CLI -Ddocker.imagePrefix=melodic/ clean install
-
echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
-
echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
-
docker tag $LOCAL_REPO/melodic/geneticsolver:unknown $CI_REGISTRY_IMAGE/geneticsolver:$CI_COMMIT_BRANCH
-
docker tag $LOCAL_REPO/melodic/geneticsolver:unknown $CI_REGISTRY_IMAGE/geneticsolver:$CI_COMMIT_BRANCH
...
@@ -695,7 +701,7 @@ deploy:mq-adapter:
...
@@ -695,7 +701,7 @@ deploy:mq-adapter:
deploy:nc-solver:
deploy:nc-solver:
stage
:
deploy
stage
:
deploy
only
:
only
:
-
master
-
master
-
rc3.0
-
rc3.0
-
rc3.1
-
rc3.1
...
@@ -704,7 +710,7 @@ deploy:nc-solver:
...
@@ -704,7 +710,7 @@ deploy:nc-solver:
-
$DOCKER_DIND_SERVICE
-
$DOCKER_DIND_SERVICE
dependencies
:
dependencies
:
-
build:cp-solver
-
build:cp-solver
script
:
script
:
-
$DOCKER_CLI $NC_SOLVER_CLI -Ddocker.imagePrefix=melodic/ clean install
-
$DOCKER_CLI $NC_SOLVER_CLI -Ddocker.imagePrefix=melodic/ clean install
-
echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
-
echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
-
docker tag $LOCAL_REPO/melodic/ncsolver:unknown $CI_REGISTRY_IMAGE/ncsolver:$CI_COMMIT_BRANCH
-
docker tag $LOCAL_REPO/melodic/ncsolver:unknown $CI_REGISTRY_IMAGE/ncsolver:$CI_COMMIT_BRANCH
...
@@ -712,7 +718,7 @@ deploy:nc-solver:
...
@@ -712,7 +718,7 @@ deploy:nc-solver:
deploy:pt-solver:
deploy:pt-solver:
stage
:
deploy
stage
:
deploy
only
:
only
:
-
master
-
master
-
rc3.0
-
rc3.0
-
rc3.1
-
rc3.1
...
@@ -721,7 +727,7 @@ deploy:pt-solver:
...
@@ -721,7 +727,7 @@ deploy:pt-solver:
-
$DOCKER_DIND_SERVICE
-
$DOCKER_DIND_SERVICE
dependencies
:
dependencies
:
-
build:cp-solver
-
build:cp-solver
script
:
script
:
-
$DOCKER_CLI $PT_SOLVER_CLI -Ddocker.imagePrefix=melodic/ clean install
-
$DOCKER_CLI $PT_SOLVER_CLI -Ddocker.imagePrefix=melodic/ clean install
-
echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
-
echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
-
docker tag $LOCAL_REPO/melodic/ptsolver:unknown $CI_REGISTRY_IMAGE/ptsolver:$CI_COMMIT_BRANCH
-
docker tag $LOCAL_REPO/melodic/ptsolver:unknown $CI_REGISTRY_IMAGE/ptsolver:$CI_COMMIT_BRANCH
...
@@ -729,7 +735,7 @@ deploy:pt-solver:
...
@@ -729,7 +735,7 @@ deploy:pt-solver:
deploy:mcts-solver:
deploy:mcts-solver:
stage
:
deploy
stage
:
deploy
only
:
only
:
-
master
-
master
-
rc3.0
-
rc3.0
-
rc3.1
-
rc3.1
...
@@ -738,7 +744,7 @@ deploy:mcts-solver:
...
@@ -738,7 +744,7 @@ deploy:mcts-solver:
-
$DOCKER_DIND_SERVICE
-
$DOCKER_DIND_SERVICE
dependencies
:
dependencies
:
-
build:cp-solver
-
build:cp-solver
script
:
script
:
-
$DOCKER_CLI $MCTS_SOLVER_CLI -Ddocker.imagePrefix=melodic/ clean install
-
$DOCKER_CLI $MCTS_SOLVER_CLI -Ddocker.imagePrefix=melodic/ clean install
-
echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
-
echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
-
docker tag $LOCAL_REPO/melodic/mctssolver:unknown $CI_REGISTRY_IMAGE/mctssolver:$CI_COMMIT_BRANCH
-
docker tag $LOCAL_REPO/melodic/mctssolver:unknown $CI_REGISTRY_IMAGE/mctssolver:$CI_COMMIT_BRANCH
...
...
event-management/baguette-client-install/pom.xml
View file @
5a9d5feb
...
@@ -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.1
6.20
</version>
<version>
1.1
8.16
</version>
<scope>
provided
</scope>
<scope>
provided
</scope>
</dependency>
</dependency>
...
...
event-management/baguette-client/pom.xml
View file @
5a9d5feb
...
@@ -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.1
6.20
</version>
<version>
1.1
8.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>
...
...
event-management/baguette-client/src/assembly/
vm
.xml
→
event-management/baguette-client/src/
main/
assembly/
baguette-client-installation-package
.xml
View file @
5a9d5feb
...
@@ -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>
...
...
event-management/baguette-server/pom.xml
View file @
5a9d5feb
...
@@ -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.1
6.20
</version>
<version>
1.1
8.16
</version>
<scope>
provided
</scope>
<scope>
provided
</scope>
</dependency>
</dependency>
<dependency>
<dependency>
...
...
event-management/config-files/eu.melodic.event.control.properties
View file @
5a9d5feb
...
@@ -101,7 +101,8 @@ melodic.security.enabled=false
...
@@ -101,7 +101,8 @@ melodic.security.enabled=false
### Web configuration - Resources
### Web configuration - Resources
static.favicon.path
=
classpath:/public/favicon.ico
static.favicon.path
=
classpath:/public/favicon.ico
static.resource.path
=
file:${MELODIC_CONFIG_DIR}/resources/
static.resource.path
=
file:resources/
#static.resource.path=file:${MELODIC_CONFIG_DIR}/resources/
#static.resource.path=file:/opt/ems-server/resources/
#static.resource.path=file:/opt/ems-server/resources/
static.resource.context
=
/resources/**
static.resource.context
=
/resources/**
#static.resource.redirect=/resources/index.html
#static.resource.redirect=/resources/index.html
...
...
event-management/control-service/pom.xml
View file @
5a9d5feb
...
@@ -163,11 +163,85 @@
...
@@ -163,11 +163,85 @@
<type>
jar
</type>
<type>
jar
</type>
<outputDirectory>
${project.build.directory}
</outputDirectory>
<outputDirectory>
${project.build.directory}
</outputDirectory>
</artifactItem>
</artifactItem>
<artifactItem>
<groupId>
eu.melodic.event
</groupId>
<artifactId>
baguette-client
</artifactId>
<version>
${project.version}
</version>
<type>
tgz
</type>
<classifier>
installation-package
</classifier>
<outputDirectory>
${project.build.directory}
</outputDirectory>
<destFileName>
baguette-client.tgz
</destFileName>
</artifactItem>
</artifactItems>
</artifactItems>
</configuration>
</configuration>
</execution>
</execution>
</executions>
</executions>
</plugin>
</plugin>
<!-- Checksum Maven plugin (http://checksum-maven-plugin.nicoulaj.net) -->
<plugin>
<groupId>
net.nicoulaj.maven.plugins
</groupId>
<artifactId>
checksum-maven-plugin
</artifactId>
<version>
1.8
</version>
<executions>
<execution>
<phase>
package
</phase>
<goals>
<goal>
files
</goal>
</goals>
</execution>
</executions>
<configuration>
<fileSets>
<fileSet>
<directory>
${project.build.directory}
</directory>
<!--<directory>target</directory>-->
<includes>
<include>
*.zip
</include>
<include>
*.tar
</include>
<include>
*.tar.gz
</include>
<include>
*.tgz
</include>
</includes>
<excludes>
<exclude>
*.jar
</exclude>
</excludes>
</fileSet>
</fileSets>
<algorithms>
<algorithm>
MD5
</algorithm>
</algorithms>
<individualFiles>
true
</individualFiles>
<failOnError>
true
</failOnError>
<failIfNoFiles>
false
</failIfNoFiles>
</configuration>
</plugin>
<!-- Copy-Rename Maven plugin (https://coderplus.github.io/copy-rename-maven-plugin/) -->
<plugin>
<groupId>
com.coderplus.maven.plugins
</groupId>
<artifactId>
copy-rename-maven-plugin
</artifactId>
<version>
1.0
</version>
<executions>
<execution>
<id>
copy-files
</id>
<phase>
package
</phase>
<goals>
<goal>
copy
</goal>
</goals>
<configuration>