diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b5210f0..529e9a49 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,10 +13,11 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - name: Set up JDK + uses: actions/setup-java@v3 with: - java-version: 11 + distribution: 'temurin' + java-version: 17 - name: Cache SonarCloud packages uses: actions/cache@v1 with: diff --git a/Dockerfile b/Dockerfile index 8a14f447..93e3be11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # First layer: dependencies for the project, cached in the /root/.m2 directory -FROM maven:3.6-jdk-11 as m2repo +FROM maven:3.8.6-eclipse-temurin-17 as m2repo ARG MAVEN_OPTS WORKDIR /project/ @@ -13,7 +13,7 @@ COPY wls-exporter-sidecar/pom.xml wls-exporter-sidecar/ RUN mvn -B -e -C org.apache.maven.plugins:maven-dependency-plugin:3.1.2:go-offline -Ddocker-build # Now build the project on top of that first layer -FROM maven:3.6-jdk-11 as build +FROM maven:3.8.6-eclipse-temurin-17 as build ARG MAVEN_OPTS WORKDIR /project/ @@ -26,7 +26,7 @@ RUN mvn -B -e -C install -Ddocker-build -DskipTests=true FROM ghcr.io/oracle/oraclelinux:8-slim AS jre-build -ENV JAVA_URL="https://download.java.net/java/GA/jdk18.0.1.1/65ae32619e2f40f3a9af3af1851d6e19/2/GPL/openjdk-18.0.1.1_linux-x64_bin.tar.gz" +ENV JAVA_URL="https://download.java.net/java/GA/jdk18.0.2/f6ad4b4450fd4d298113270ec84f30ee/9/GPL/openjdk-18.0.2_linux-x64_bin.tar.gz" RUN set -eux; \ microdnf -y install gzip tar; \ diff --git a/build-helper-mojo/pom.xml b/build-helper-mojo/pom.xml index a89607f3..cb510265 100644 --- a/build-helper-mojo/pom.xml +++ b/build-helper-mojo/pom.xml @@ -50,4 +50,50 @@ test + + + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin-version} + + + + org.apache.maven.plugins + maven-plugin-plugin + ${maven-plugin-plugin-version} + + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin-version} + + + + org.apache.maven.plugins + maven-site-plugin + ${maven-site-plugin-version} + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven-deploy-plugin-version} + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin-version} + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin-version} + + + diff --git a/pom.xml b/pom.xml index 9103cea9..55d922d3 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ scm:git:https://github.com/oracle/weblogic-monitoring-exporter.git scm:git:https://github.com/oracle/weblogic-monitoring-exporter.git HEAD - + @@ -49,14 +49,67 @@ 3.0.0-M7 8 ${maven.compiler.source} + 3.1.0 + 3.2.0 + 3.10.1 + 3.0.1 + 3.0.0 + 3.0.0 + 3.6.4 + 3.12.1 + 3.2.2 + 3.3.2 + 3.3.0 + 3.3.0 + + 17 + [3.6.1,) + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin-version} + + + enforce-maven + + enforce + + + + + ${maven.version.range} + + + ${java.version.range} + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin-version} + + 11 + + -Xpkginfo:always + -Xlint:all + + + + maven-war-plugin - 2.6 + ${maven-war-plugin-version} false ${configuration.directory} @@ -97,6 +150,61 @@ + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin-version} + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin-version} + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin-version} + + + + org.apache.maven.plugins + maven-plugin-plugin + ${maven-plugin-plugin-version} + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin-version} + + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin-version} + + + + org.apache.maven.plugins + maven-site-plugin + ${maven-site-plugin-version} + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven-deploy-plugin-version} + + @@ -130,7 +238,7 @@ com.google.code.gson gson - 2.9.0 + 2.9.1 commons-io @@ -166,13 +274,13 @@ org.junit.jupiter junit-jupiter - 5.8.2 + 5.9.0 test com.meterware.simplestub simplestub - 1.3.0 + 1.3.2 test @@ -219,5 +327,4 @@ - diff --git a/samples/kubernetes/end2end/demo-domains/domainBuilder/test-webapp/pom.xml b/samples/kubernetes/end2end/demo-domains/domainBuilder/test-webapp/pom.xml index ac2943f5..2c4cc785 100644 --- a/samples/kubernetes/end2end/demo-domains/domainBuilder/test-webapp/pom.xml +++ b/samples/kubernetes/end2end/demo-domains/domainBuilder/test-webapp/pom.xml @@ -35,7 +35,6 @@ org.apache.maven.plugins maven-war-plugin - 2.3 false diff --git a/wls-exporter-core/pom.xml b/wls-exporter-core/pom.xml index cdec6f70..d550102a 100644 --- a/wls-exporter-core/pom.xml +++ b/wls-exporter-core/pom.xml @@ -88,6 +88,42 @@ org.jacoco jacoco-maven-plugin + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin-version} + + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin-version} + + + + org.apache.maven.plugins + maven-site-plugin + ${maven-site-plugin-version} + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven-deploy-plugin-version} + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin-version} + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin-version} + @@ -99,7 +135,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + 3.3.0 add-source diff --git a/wls-exporter-sidecar/pom.xml b/wls-exporter-sidecar/pom.xml index 0a5227cf..9cdd7e3b 100644 --- a/wls-exporter-sidecar/pom.xml +++ b/wls-exporter-sidecar/pom.xml @@ -14,10 +14,10 @@ WebLogic Monitoring Exporter Sidecar - 2.5.1 + 3.0.0 com.oracle.wls.exporter.sidecar.Main - 11 + 17 ${maven.compiler.source} 2.3.5 @@ -109,6 +109,7 @@ org.apache.maven.plugins maven-dependency-plugin + ${maven-dependency-plugin-version} copy-libs @@ -123,11 +124,11 @@ true true runtime - test + io.helidon.build-tools helidon-maven-plugin @@ -137,10 +138,47 @@ + org.jacoco jacoco-maven-plugin + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin-version} + + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin-version} + + + + org.apache.maven.plugins + maven-site-plugin + ${maven-site-plugin-version} + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven-deploy-plugin-version} + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin-version} + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin-version} + diff --git a/wls-exporter-war/pom.xml b/wls-exporter-war/pom.xml index a3b9b9b5..bac21db2 100644 --- a/wls-exporter-war/pom.xml +++ b/wls-exporter-war/pom.xml @@ -35,6 +35,45 @@ + + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin-version} + + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin-version} + + + + org.apache.maven.plugins + maven-site-plugin + ${maven-site-plugin-version} + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven-deploy-plugin-version} + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin-version} + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin-version} + + + initial-configuration