tyler.durden
/
centreon-plugins
mirror of https://github.com/centreon/centreon-plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sync hotfix 20241021 (#5257)

This commit is contained in:
pkippes 2024-10-23 11:38:18 +02:00 committed by GitHub
parent f6cd371443 0864756913
commit feedb1b553
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/as400.yml vendored
View File

@ -64,8 +64,8 @@ jobs:
-type f \ -type f \
-exec grep -E '(@CONNECTOR_VERSION@)|(@CONNECTOR_HOME@)|(@CONNECTOR_ETC@)|(@CONNECTOR_LOG@)|(@CONNECTOR_USER@)|(@JAVA_BIN@)' {} ';' \ -exec grep -E '(@CONNECTOR_VERSION@)|(@CONNECTOR_HOME@)|(@CONNECTOR_ETC@)|(@CONNECTOR_LOG@)|(@CONNECTOR_USER@)|(@JAVA_BIN@)' {} ';' \
-exec sed -i \ -exec sed -i \
-e 's|@CONNECTOR_VERSION@|'"%{version}"'|g' \ -e 's|@CONNECTOR_VERSION@|'"${{ needs.get-environment.outputs.version }}"'|g' \
-e 's|@CONNECTOR_HOME@|'"%{_datadir}/centreon-as400"'|g' \ -e 's|@CONNECTOR_HOME@|'"/usr/share/centreon-as400"'|g' \
-e 's|@CONNECTOR_ETC@|'"/etc/centreon-as400/"'|g' \ -e 's|@CONNECTOR_ETC@|'"/etc/centreon-as400/"'|g' \
-e 's|@CONNECTOR_LOG@|'"/var/log/centreon-as400/"'|g' \ -e 's|@CONNECTOR_LOG@|'"/var/log/centreon-as400/"'|g' \
-e 's|@CONNECTOR_USER@|'"centreon-as400"'|g' \ -e 's|@CONNECTOR_USER@|'"centreon-as400"'|g' \

3
as400/changelog
View File

@ -1,3 +1,6 @@
2024-10-21 Pieter Kippes <pkippes@centreon.com> - 2.0.6
* Fixed packaging issues with config files and java version
2024-10-18 Pieter Kippes <pkippes@centreon.com> - 2.0.5 2024-10-18 Pieter Kippes <pkippes@centreon.com> - 2.0.5
* Fixed packaging for config files * Fixed packaging for config files

6
as400/connector.as400/pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.centreon.connector</groupId> <groupId>com.centreon.connector</groupId>
<artifactId>centreon-as400</artifactId> <artifactId>centreon-as400</artifactId>
<version>2.0.5</version> <version>2.0.6</version>
<name>Centreon-AS/400</name> <name>Centreon-AS/400</name>
<description>Connecteur AS/400</description> <description>Connecteur AS/400</description>
<packaging>jar</packaging> <packaging>jar</packaging>
@ -73,8 +73,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version> <version>3.13.0</version>
<configuration> <configuration>
<source>17</source> <source>11</source>
<target>17</target> <target>11</target>
</configuration> </configuration>
</plugin> </plugin>

10
as400/packaging/centreon-as400-daemon.yaml
View File

@ -2,7 +2,7 @@ name: "centreon-plugin-Operatingsystems-AS400-daemon"
arch: "${ARCH}" arch: "${ARCH}"
platform: "linux" platform: "linux"
version_schema: "none" version_schema: "none"
version: "2.0.5" version: "2.0.6"
release: "${RELEASE}${DIST}" release: "${RELEASE}${DIST}"
section: "default" section: "default"
priority: "optional" priority: "optional"
@ -14,8 +14,8 @@ homepage: "https://www.centreon.com"
license: "Apache-2.0" license: "Apache-2.0"
contents: contents:
- src: "../connector.as400/target/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-${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 expand: true
file_info: file_info:
mode: 0755 mode: 0755
@ -60,10 +60,10 @@ scripts:
overrides: overrides:
rpm: rpm:
depends: depends:
- java-1.8.0-openjdk - "java-17-openjdk"
deb: deb:
depends: depends:
- default-jre - "openjdk-17-jre"
rpm: rpm:
summary: Centreon AS 400 Plugin daemon summary: Centreon AS 400 Plugin daemon