Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix plugins 20241021 #5254

Merged
merged 4 commits into from
Oct 23, 2024
Merged

Hotfix plugins 20241021 #5254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e331ed5
chore(release) bump as400 to 2.0.6
pkippes Oct 21, 2024
e7c9f38
chore(release): bump as400 to 2.0.6
pkippes Oct 21, 2024
09a2393
chore(release) bump as400 to 2.0.6
pkippes Oct 21, 2024
8bb8d40
fix(packaging): fix packaged files and java dependencies (#5253)
tuntoja Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/as400.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' \
Expand Down
3 changes: 3 additions & 0 deletions as400/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2024-10-21 Pieter Kippes <[email protected]> - 2.0.6
* Fixed packaging issues with config files and java version

2024-10-18 Pieter Kippes <[email protected]> - 2.0.5
* Fixed packaging for config files

Expand Down
6 changes: 3 additions & 3 deletions as400/connector.as400/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.centreon.connector</groupId>
<artifactId>centreon-as400</artifactId>
<version>2.0.5</version>
<version>2.0.6</version>
<name>Centreon-AS/400</name>
<description>Connecteur AS/400</description>
<packaging>jar</packaging>
Expand Down Expand Up @@ -73,8 +73,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<source>17</source>
<target>17</target>
<source>11</source>
<target>11</target>
</configuration>
</plugin>

Expand Down
10 changes: 5 additions & 5 deletions as400/packaging/centreon-as400-daemon.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading