From e331ed5d750c10387aefcf948cbebf24e15f157a Mon Sep 17 00:00:00 2001 From: pkippes <144150042+pkippes@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:28:41 +0200 Subject: [PATCH 1/4] chore(release) bump as400 to 2.0.6 --- as400/changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/as400/changelog b/as400/changelog index cd263672d..9b920168d 100644 --- a/as400/changelog +++ b/as400/changelog @@ -1,3 +1,6 @@ +2024-10-21 Pieter Kippes - 2.0.6 + * Fixed packaging + 2024-10-18 Pieter Kippes - 2.0.5 * Fixed packaging for config files From e7c9f383d94df2fd2f50298d184b5ccbe545b390 Mon Sep 17 00:00:00 2001 From: pkippes <144150042+pkippes@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:29:21 +0200 Subject: [PATCH 2/4] chore(release): bump as400 to 2.0.6 Update centreon-as400-daemon.yaml --- as400/packaging/centreon-as400-daemon.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/as400/packaging/centreon-as400-daemon.yaml b/as400/packaging/centreon-as400-daemon.yaml index 4a9183a10..df81ff662 100644 --- a/as400/packaging/centreon-as400-daemon.yaml +++ b/as400/packaging/centreon-as400-daemon.yaml @@ -2,7 +2,7 @@ name: "centreon-plugin-Operatingsystems-AS400-daemon" arch: "${ARCH}" platform: "linux" version_schema: "none" -version: "2.0.5" +version: "2.0.6" release: "${RELEASE}${DIST}" section: "default" priority: "optional" From 09a2393a633f0675c78b48637c6cf7c7a1453da4 Mon Sep 17 00:00:00 2001 From: pkippes <144150042+pkippes@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:29:51 +0200 Subject: [PATCH 3/4] chore(release) bump as400 to 2.0.6 Update pom.xml --- as400/connector.as400/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/as400/connector.as400/pom.xml b/as400/connector.as400/pom.xml index 504da4833..172af35d1 100644 --- a/as400/connector.as400/pom.xml +++ b/as400/connector.as400/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.centreon.connector centreon-as400 - 2.0.5 + 2.0.6 Centreon-AS/400 Connecteur AS/400 jar From 8bb8d404ddb88ef8406f286978cc5ab8a050122e Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 21 Oct 2024 16:43:22 +0200 Subject: [PATCH 4/4] fix(packaging): fix packaged files and java dependencies (#5253) Co-authored-by: May <110405507+mushroomempires@users.noreply.github.com> --- .github/workflows/as400.yml | 4 ++-- as400/changelog | 2 +- as400/connector.as400/pom.xml | 4 ++-- as400/packaging/centreon-as400-daemon.yaml | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/as400.yml b/.github/workflows/as400.yml index 0df6562f8..42a524194 100644 --- a/.github/workflows/as400.yml +++ b/.github/workflows/as400.yml @@ -64,8 +64,8 @@ jobs: -type f \ -exec grep -E '(@CONNECTOR_VERSION@)|(@CONNECTOR_HOME@)|(@CONNECTOR_ETC@)|(@CONNECTOR_LOG@)|(@CONNECTOR_USER@)|(@JAVA_BIN@)' {} ';' \ -exec sed -i \ - -e 's|@CONNECTOR_VERSION@|'"%{version}"'|g' \ - -e 's|@CONNECTOR_HOME@|'"%{_datadir}/centreon-as400"'|g' \ + -e 's|@CONNECTOR_VERSION@|'"${{ needs.get-environment.outputs.version }}"'|g' \ + -e 's|@CONNECTOR_HOME@|'"/usr/share/centreon-as400"'|g' \ -e 's|@CONNECTOR_ETC@|'"/etc/centreon-as400/"'|g' \ -e 's|@CONNECTOR_LOG@|'"/var/log/centreon-as400/"'|g' \ -e 's|@CONNECTOR_USER@|'"centreon-as400"'|g' \ diff --git a/as400/changelog b/as400/changelog index 9b920168d..c019af1bf 100644 --- a/as400/changelog +++ b/as400/changelog @@ -1,5 +1,5 @@ 2024-10-21 Pieter Kippes - 2.0.6 - * Fixed packaging + * Fixed packaging issues with config files and java version 2024-10-18 Pieter Kippes - 2.0.5 * Fixed packaging for config files diff --git a/as400/connector.as400/pom.xml b/as400/connector.as400/pom.xml index 172af35d1..689d8b1e3 100644 --- a/as400/connector.as400/pom.xml +++ b/as400/connector.as400/pom.xml @@ -73,8 +73,8 @@ maven-compiler-plugin 3.13.0 - 17 - 17 + 11 + 11 diff --git a/as400/packaging/centreon-as400-daemon.yaml b/as400/packaging/centreon-as400-daemon.yaml index df81ff662..d51ce1180 100644 --- a/as400/packaging/centreon-as400-daemon.yaml +++ b/as400/packaging/centreon-as400-daemon.yaml @@ -14,8 +14,8 @@ homepage: "https://www.centreon.com" license: "Apache-2.0" contents: - - src: "../connector.as400/target/centreon-as400-${VERSION}-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE - dst: "/usr/share/centreon-as400/bin/centreon-as400-${VERSION}-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE + - src: "../connector.as400/target/centreon-as400-@CONNECTOR_VERSION@-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE + dst: "/usr/share/centreon-as400/bin/centreon-as400-@CONNECTOR_VERSION@-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE expand: true file_info: mode: 0755 @@ -60,10 +60,10 @@ scripts: overrides: rpm: depends: - - java-1.8.0-openjdk + - "java-17-openjdk" deb: depends: - - default-jre + - "openjdk-17-jre" rpm: summary: Centreon AS 400 Plugin daemon