diff --git a/jkube-java-11.yaml b/jkube-java-11.yaml index 95ccee1..b8998d1 100644 --- a/jkube-java-11.yaml +++ b/jkube-java-11.yaml @@ -51,7 +51,7 @@ modules: - name: jboss.container.util.logging.bash - name: jboss.container.java.jvm.bash.debug-options-override - name: jboss.container.prometheus-override - - name: jolokia-download + - name: org.eclipse.jkube.jolokia # Removes any other Java JDK that might have been downloaded by other packages (run last) - name: org.eclipse.jkube.jvm.singleton-jdk diff --git a/jkube-java.yaml b/jkube-java.yaml index 1fcdcdc..cf0c2d9 100644 --- a/jkube-java.yaml +++ b/jkube-java.yaml @@ -55,7 +55,7 @@ modules: - name: jboss.container.util.logging.bash - name: jboss.container.java.jvm.bash.debug-options-override - name: jboss.container.prometheus-override - - name: jolokia-download + - name: org.eclipse.jkube.jolokia # Removes any other Java JDK that might have been downloaded by other packages (run last) - name: org.eclipse.jkube.jvm.singleton-jdk diff --git a/modules/jolokia-download/configure b/modules/org.eclipse.jkube.jolokia/configure similarity index 100% rename from modules/jolokia-download/configure rename to modules/org.eclipse.jkube.jolokia/configure diff --git a/modules/jolokia-download/module.yaml b/modules/org.eclipse.jkube.jolokia/module.yaml similarity index 73% rename from modules/jolokia-download/module.yaml rename to modules/org.eclipse.jkube.jolokia/module.yaml index 14cbcbd..13deef6 100644 --- a/modules/jolokia-download/module.yaml +++ b/modules/org.eclipse.jkube.jolokia/module.yaml @@ -1,15 +1,15 @@ schema_version: 1 version: 1.0.0 -name: jolokia-download +name: org.eclipse.jkube.jolokia description: "Downloads the latest Jolokia JVM agent overwriting the one provided by the dnf package." envs: - description: Version of Jolokia being used. name: JOLOKIA_VERSION - value: 1.7.1 + value: 1.7.2 artifacts: - name: jolokia-jvm.jar target: jolokia-jvm.jar - url: https://search.maven.org/remotecontent?filepath=org/jolokia/jolokia-jvm/1.7.1/jolokia-jvm-1.7.1.jar - md5: fd48948a8df5ff63ca0bd3624866f967 + url: https://search.maven.org/remotecontent?filepath=org/jolokia/jolokia-jvm/1.7.2/jolokia-jvm-1.7.2.jar + md5: d489d62d1143e6a2e85a869a4b824a67 execute: - script: configure diff --git a/scripts/test-jkube-java-11.sh b/scripts/test-jkube-java-11.sh index d80759d..a67e8ff 100755 --- a/scripts/test-jkube-java-11.sh +++ b/scripts/test-jkube-java-11.sh @@ -58,7 +58,7 @@ assertContains "$env_variables" "JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE=/opt/jboss || reportError "JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE invalid" assertContains "$env_variables" "JBOSS_CONTAINER_S2I_CORE_MODULE=/opt/jboss/container/s2i/core/$" \ || reportError "JBOSS_CONTAINER_S2I_CORE_MODULE invalid" -assertContains "$env_variables" "JOLOKIA_VERSION=1.7.1$" \ +assertContains "$env_variables" "JOLOKIA_VERSION=1.7.2$" \ || reportError "JOLOKIA_VERSION invalid" assertContains "$env_variables" "AB_JOLOKIA_PASSWORD_RANDOM=true$" \ || reportError "AB_JOLOKIA_PASSWORD_RANDOM invalid" diff --git a/scripts/test-jkube-java.sh b/scripts/test-jkube-java.sh index 51ea6c8..7cccf73 100755 --- a/scripts/test-jkube-java.sh +++ b/scripts/test-jkube-java.sh @@ -58,7 +58,7 @@ assertContains "$env_variables" "JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE=/opt/jboss || reportError "JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE invalid" assertContains "$env_variables" "JBOSS_CONTAINER_S2I_CORE_MODULE=/opt/jboss/container/s2i/core/$" \ || reportError "JBOSS_CONTAINER_S2I_CORE_MODULE invalid" -assertContains "$env_variables" "JOLOKIA_VERSION=1.7.1$" \ +assertContains "$env_variables" "JOLOKIA_VERSION=1.7.2$" \ || reportError "JOLOKIA_VERSION invalid" assertContains "$env_variables" "AB_JOLOKIA_PASSWORD_RANDOM=true$" \ || reportError "AB_JOLOKIA_PASSWORD_RANDOM invalid"