From eca64f3cb433d3f6c0094eeb153883353887743a Mon Sep 17 00:00:00 2001 From: Ryan Eberhard Date: Tue, 30 Jan 2024 13:40:40 -0500 Subject: [PATCH] Prepare for WME 2.1.9 --- build-helper-mojo/pom.xml | 2 +- build-helper-mojo/pom.xml.versionsBackup | 115 ++++++ pom.xml | 2 +- pom.xml.versionsBackup | 407 ++++++++++++++++++++ wls-exporter-core/pom.xml | 2 +- wls-exporter-core/pom.xml.versionsBackup | 190 +++++++++ wls-exporter-sidecar/pom.xml | 2 +- wls-exporter-sidecar/pom.xml.versionsBackup | 232 +++++++++++ wls-exporter-war/pom.xml | 2 +- wls-exporter-war/pom.xml.versionsBackup | 160 ++++++++ 10 files changed, 1109 insertions(+), 5 deletions(-) create mode 100644 build-helper-mojo/pom.xml.versionsBackup create mode 100644 pom.xml.versionsBackup create mode 100644 wls-exporter-core/pom.xml.versionsBackup create mode 100644 wls-exporter-sidecar/pom.xml.versionsBackup create mode 100644 wls-exporter-war/pom.xml.versionsBackup diff --git a/build-helper-mojo/pom.xml b/build-helper-mojo/pom.xml index 0e2234b..dc8da7a 100644 --- a/build-helper-mojo/pom.xml +++ b/build-helper-mojo/pom.xml @@ -9,7 +9,7 @@ wls-exporter-parent com.oracle.wls.exporter - 2.1.9-SNAPSHOT + 2.1.9 build-helper-mojo diff --git a/build-helper-mojo/pom.xml.versionsBackup b/build-helper-mojo/pom.xml.versionsBackup new file mode 100644 index 0000000..0e2234b --- /dev/null +++ b/build-helper-mojo/pom.xml.versionsBackup @@ -0,0 +1,115 @@ + + + + 4.0.0 + + + wls-exporter-parent + com.oracle.wls.exporter + 2.1.9-SNAPSHOT + + + build-helper-mojo + maven-plugin + + Exporter Build Helper Maven Mojo + + + + org.apache.maven + maven-plugin-api + 3.9.6 + provided + + + org.apache.maven + maven-model + 3.9.6 + provided + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.11.0 + + + org.junit.jupiter + junit-jupiter + test + + + org.ow2.asm + asm + 9.6 + test + + + org.hamcrest + java-hamcrest + test + + + com.meterware.simplestub + simplestub + test + + + com.google.guava + guava + + + + + + + org.jacoco + jacoco-maven-plugin + + + + 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 310f6fa..adfd197 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.oracle.wls.exporter wls-exporter-parent - 2.1.9-SNAPSHOT + 2.1.9 build-helper-mojo wls-exporter-core diff --git a/pom.xml.versionsBackup b/pom.xml.versionsBackup new file mode 100644 index 0000000..310f6fa --- /dev/null +++ b/pom.xml.versionsBackup @@ -0,0 +1,407 @@ + + + 4.0.0 + + com.oracle.wls.exporter + wls-exporter-parent + 2.1.9-SNAPSHOT + + build-helper-mojo + wls-exporter-core + + pom + + WebLogic Monitoring Exporter + A Prometheus exporter that takes advantage of WebLogic Server-specific features. + + https://github.com/oracle/weblogic-monitoring-exporter + + + + Oracle Universal Permissive License, Version 1.0 + https://oss.oracle.com/licenses/upl + + + + + https://github.com/oracle/weblogic-monitoring-exporter.git + scm:git:https://github.com/oracle/weblogic-monitoring-exporter.git + scm:git:https://github.com/oracle/weblogic-monitoring-exporter.git + wls-exporter-parent-2.1.5 + + + + + russgold + Russell Gold + http://russgold.net/ + Oracle + + + + + oracle + https://sonarcloud.io + UTF-8 + 4.5.3 + 3.2.5 + 3.4.1 + 3.3.2 + 3.11.0 + 3.1.1 + 3.1.1 + 3.0.0 + 3.10.2 + 3.12.1 + 3.3.0 + 3.4.0 + 3.3.1 + 3.6.1 + 9.0.9 + 4.1.106.Final + + false + + 21 + [3.8.1,) + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin-version} + + + enforce-maven + + enforce + + + + + ${maven.version.range} + + + ${java.version.range} + + + com.oracle.wls.exporter:build-helper-mojo + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin-version} + + 1.8 + 1.8 + + -Xpkginfo:always + -Xlint:all + + + + + + maven-war-plugin + ${maven-war-plugin-version} + + + notices + package + + war + + + false + ${configuration.directory} + + + ${project.basedir}/../src/main/notices + + + + + + + false + + + + org.apache.maven.plugins + maven-surefire-plugin + ${version.plugin.surefire} + + false + + + + org.owasp + dependency-check-maven + ${dependency-check-version} + + + org.jacoco + jacoco-maven-plugin + 0.8.11 + + + prepare-agent + + prepare-agent + + + + report + test + + report + + + + + + + + + + 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} + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/release-artifacts + + + ${basedir} + + get2.0.sh + get2.1.sh + + true + + + + + + + + + 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} + + + + org.owasp + dependency-check-maven + ${dependency-check-version} + + ${skip.dependency-check} + true + 0 + false + + HTML + CSV + + + dependency-check-suppression.xml + + + + + + + + + + + javax.servlet + javax.servlet-api + 4.0.1 + provided + + + org.apache.httpcomponents + httpclient + 4.5.14 + + + org.apache.httpcomponents + httpcore + 4.4.16 + + + commons-fileupload + commons-fileupload + 1.5 + + + org.yaml + snakeyaml + 2.2 + + + com.google.code.gson + gson + 2.10.1 + + + commons-io + commons-io + 2.15.1 + + + io.netty + netty-handler + ${netty-version} + + + + + + com.google.guava + guava + 33.0.0-jre + test + + + com.jayway.jsonpath + json-path + 2.9.0 + test + + + com.jayway.jsonpath + json-path-assert + 2.9.0 + test + + + org.slf4j + slf4j-nop + 2.0.11 + test + + + org.apache.httpcomponents + httpmime + 4.5.14 + + + org.junit.jupiter + junit-jupiter + 5.10.1 + test + + + com.meterware.simplestub + simplestub + 1.3.2 + test + + + org.hamcrest + java-hamcrest + 2.0.0.0 + test + + + org.httpunit + httpunit + 1.7.3 + test + + + junit + junit + + + + + + + + + helidon-sidecar + + [21,) + + + build-helper-mojo + wls-exporter-sidecar + + + + include-webapp + + + !docker-build + + + + build-helper-mojo + wls-exporter-war + + + + diff --git a/wls-exporter-core/pom.xml b/wls-exporter-core/pom.xml index 8c3bdca..9f9923b 100644 --- a/wls-exporter-core/pom.xml +++ b/wls-exporter-core/pom.xml @@ -8,7 +8,7 @@ wls-exporter-parent com.oracle.wls.exporter - 2.1.9-SNAPSHOT + 2.1.9 wls-exporter-core diff --git a/wls-exporter-core/pom.xml.versionsBackup b/wls-exporter-core/pom.xml.versionsBackup new file mode 100644 index 0000000..8c3bdca --- /dev/null +++ b/wls-exporter-core/pom.xml.versionsBackup @@ -0,0 +1,190 @@ + + + + 4.0.0 + + wls-exporter-parent + com.oracle.wls.exporter + 2.1.9-SNAPSHOT + + + wls-exporter-core + WebLogic Monitoring Exporter Core + + + + javax.servlet + javax.servlet-api + + + org.apache.httpcomponents + httpclient + provided + + + commons-fileupload + commons-fileupload + provided + + + org.yaml + snakeyaml + + + com.google.code.gson + gson + + + + + + com.google.guava + guava + test + + + com.jayway.jsonpath + json-path + test + + + com.jayway.jsonpath + json-path-assert + test + + + org.slf4j + slf4j-nop + test + + + org.apache.httpcomponents + httpmime + test + + + com.meterware.simplestub + simplestub + test + + + org.junit.jupiter + junit-jupiter + test + + + org.hamcrest + java-hamcrest + test + + + org.httpunit + httpunit + test + + + + + + + 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} + + + + ${project.groupId} + build-helper-mojo + ${project.version} + + + get-version + generate-resources + + gitVersion + + + + + + + + + + jdk11Client + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.5.0 + + + add-source + generate-sources + + add-source + + + + ${project.basedir}/src/main/java11 + + + + + add-test-source + generate-test-sources + + add-test-source + + + + ${project.basedir}/src/test/java11 + + + + + + + + + + \ No newline at end of file diff --git a/wls-exporter-sidecar/pom.xml b/wls-exporter-sidecar/pom.xml index e19f95f..ab7cd55 100644 --- a/wls-exporter-sidecar/pom.xml +++ b/wls-exporter-sidecar/pom.xml @@ -8,7 +8,7 @@ com.oracle.wls.exporter wls-exporter-parent - 2.1.9-SNAPSHOT + 2.1.9 wls-exporter-sidecar WebLogic Monitoring Exporter Sidecar diff --git a/wls-exporter-sidecar/pom.xml.versionsBackup b/wls-exporter-sidecar/pom.xml.versionsBackup new file mode 100644 index 0000000..e19f95f --- /dev/null +++ b/wls-exporter-sidecar/pom.xml.versionsBackup @@ -0,0 +1,232 @@ + + + + 4.0.0 + + com.oracle.wls.exporter + wls-exporter-parent + 2.1.9-SNAPSHOT + + wls-exporter-sidecar + WebLogic Monitoring Exporter Sidecar + + + 3.2.5 + com.oracle.wls.exporter.sidecar.Main + + 3.0.7 + + + + + + io.helidon + helidon-dependencies + ${helidon.version} + pom + import + + + + + + + io.netty + netty-codec-http + ${netty-version} + + + io.netty + netty-transport + ${netty-version} + + + io.netty + netty-transport-native-unix-common + ${netty-version} + + + io.netty + netty-common + ${netty-version} + + + io.netty + netty-buffer + ${netty-version} + + + io.netty + netty-codec + ${netty-version} + + + io.netty + netty-resolver + ${netty-version} + + + io.helidon.webserver + helidon-webserver + + + ${project.groupId} + wls-exporter-core + ${project.version} + + + org.apache.httpcomponents + httpclient + + + org.junit.jupiter + junit-jupiter + test + + + org.junit.jupiter + junit-jupiter-api + test + + + com.meterware.simplestub + simplestub + test + + + io.helidon.webserver + helidon-webserver-test-support + test + + + com.google.guava + guava + test + + + com.jayway.jsonpath + json-path + test + + + + + ${project.artifactId} + + + + io.helidon.build-tools + helidon-maven-plugin + ${version.plugin.helidon} + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin-version} + + 21 + 21 + + -Xpkginfo:always + -Xlint:all + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + libs + ${mainClass} + false + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin-version} + + + copy-libs + prepare-package + + copy-dependencies + + + ${project.build.directory}/libs + false + false + true + true + runtime + + + + + + + io.helidon.build-tools + helidon-maven-plugin + + + third-party-license-report + + + + + + 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 ba17ac9..5b3636c 100644 --- a/wls-exporter-war/pom.xml +++ b/wls-exporter-war/pom.xml @@ -7,7 +7,7 @@ wls-exporter-parent com.oracle.wls.exporter - 2.1.9-SNAPSHOT + 2.1.9 4.0.0 diff --git a/wls-exporter-war/pom.xml.versionsBackup b/wls-exporter-war/pom.xml.versionsBackup new file mode 100644 index 0000000..ba17ac9 --- /dev/null +++ b/wls-exporter-war/pom.xml.versionsBackup @@ -0,0 +1,160 @@ + + + + + wls-exporter-parent + com.oracle.wls.exporter + 2.1.9-SNAPSHOT + + 4.0.0 + + wls-exporter-war + WebLogic Monitoring Exporter Web Application + war + + + ${project.build.directory}/configuration + + + + + ${project.groupId} + wls-exporter-core + ${project.version} + + + org.apache.httpcomponents + httpclient + + + commons-fileupload + commons-fileupload + + + + + + + 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 + + + configuration + + + + + + ${project.groupId} + build-helper-mojo + ${project.version} + + + copy-configuration + process-resources + + copy + + + ${configuration} + ${configuration.directory}/config.yml + ${project.parent.basedir} + + + + copy-war-up + install + + copy + + + ${project.build.directory}/${project.build.finalName}.war + ${project.parent.build.directory}/wls-exporter.war + + + + + + + + + + github-release + + + tag + + + + wls-exporter + + + src/main/resources + true + + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + 1.0.1 + + + rename-file + compile + + rename + + + ${project.build.outputDirectory}/get.sh + ${project.build.outputDirectory}/get_v${tag}.sh + + + + + + + + + + \ No newline at end of file