aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/policy-clamp-docker/pom.xml2
-rw-r--r--packages/policy-clamp-docker/src/main/docker/ClRuntimeDockerfile2
-rw-r--r--packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile2
-rw-r--r--packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile2
-rw-r--r--packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile2
-rw-r--r--packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh6
-rw-r--r--packages/policy-clamp-tarball/pom.xml2
-rw-r--r--packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml4
-rw-r--r--packages/pom.xml2
9 files changed, 15 insertions, 9 deletions
diff --git a/packages/policy-clamp-docker/pom.xml b/packages/policy-clamp-docker/pom.xml
index 451be1ec4..62181b9a2 100644
--- a/packages/policy-clamp-docker/pom.xml
+++ b/packages/policy-clamp-docker/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.clamp</groupId>
<artifactId>clamp-packages</artifactId>
- <version>6.1.3-SNAPSHOT</version>
+ <version>6.2.0-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
diff --git a/packages/policy-clamp-docker/src/main/docker/ClRuntimeDockerfile b/packages/policy-clamp-docker/src/main/docker/ClRuntimeDockerfile
index 1b9cb251a..9167b226a 100644
--- a/packages/policy-clamp-docker/src/main/docker/ClRuntimeDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/ClRuntimeDockerfile
@@ -21,7 +21,7 @@
#
# Docker file to build an image that runs CLAMP on Java 11 or better in alpine
#
-FROM onap/policy-jre-alpine:2.3.0
+FROM onap/policy-jre-alpine:2.3.1
LABEL maintainer="Policy Team"
diff --git a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile
index fe14f7d7c..88bf34579 100644
--- a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile
@@ -22,7 +22,7 @@
# Docker file to build an image that runs CLAMP on Java 11 or better in alpine
#
-FROM onap/policy-jre-alpine:2.3.0
+FROM onap/policy-jre-alpine:2.3.1
LABEL maintainer="Policy Team"
diff --git a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile
index 26fb66f22..e107b45af 100644
--- a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile
@@ -21,7 +21,7 @@
#
# Docker file to build an image that runs CLAMP on Java 11 or better in alpine
#
-FROM onap/policy-jre-alpine:2.3.0
+FROM onap/policy-jre-alpine:2.3.1
LABEL maintainer="Policy Team"
diff --git a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile
index 916ec2328..08a731c0c 100644
--- a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile
@@ -21,7 +21,7 @@
#
# Docker file to build an image that runs CLAMP on Java 11 or better in alpine
#
-FROM onap/policy-jre-alpine:2.3.0
+FROM onap/policy-jre-alpine:2.3.1
LABEL maintainer="Policy Team"
diff --git a/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh b/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh
index 59d31dc8e..c428fd553 100644
--- a/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh
+++ b/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh
@@ -61,5 +61,11 @@ $JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \
-Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \
-Djavax.net.ssl.trustStore="${TRUSTSTORE}" \
-Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \
+ -Dcom.sun.management.jmxremote.rmi.port=9090 \
+ -Dcom.sun.management.jmxremote=true \
+ -Dcom.sun.management.jmxremote.port=9090 \
+ -Dcom.sun.management.jmxremote.ssl=false \
+ -Dcom.sun.management.jmxremote.authenticate=false \
+ -Dcom.sun.management.jmxremote.local.only=false \
-jar /app/app.jar \
--spring.config.location="${POLICY_HOME}/config/ClRuntimeParameters.yaml"
diff --git a/packages/policy-clamp-tarball/pom.xml b/packages/policy-clamp-tarball/pom.xml
index ea564c4dc..8db94f87c 100644
--- a/packages/policy-clamp-tarball/pom.xml
+++ b/packages/policy-clamp-tarball/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.clamp</groupId>
<artifactId>clamp-packages</artifactId>
- <version>6.1.3-SNAPSHOT</version>
+ <version>6.2.0-SNAPSHOT</version>
</parent>
<artifactId>policy-clamp-tarball</artifactId>
diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml
index c8601cbdd..d399b82ba 100644
--- a/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml
+++ b/packages/policy-clamp-tarball/src/main/resources/etc/ClRuntimeParameters.yaml
@@ -33,8 +33,8 @@ runtime:
implementation: org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl
databaseDriver: org.mariadb.jdbc.Driver
databaseUrl: jdbc:mariadb://${mariadb.host:mariadb}:${mariadb.port:3306}/controlloop
- databaseUser: policy
- databasePassword: P01icY
+ databaseUser: policy_user
+ databasePassword: policy_user
persistenceUnit: CommissioningMariaDb
topicParameterGroup:
topicSources:
diff --git a/packages/pom.xml b/packages/pom.xml
index 07258cd44..0a913dc52 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.clamp</groupId>
<artifactId>policy-clamp</artifactId>
- <version>6.1.3-SNAPSHOT</version>
+ <version>6.2.0-SNAPSHOT</version>
</parent>
<artifactId>clamp-packages</artifactId>