Skip to content

Commit

Permalink
fix(packaging): fix packaged files and java dependencies (#5253)
Browse files Browse the repository at this point in the history
Co-authored-by: May <[email protected]>
  • Loading branch information
tuntoja and mushroomempires authored Oct 21, 2024
1 parent 09a2393 commit 8bb8d40
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/as400.yml
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
2 changes: 1 addition & 1 deletion as400/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
2024-10-21 Pieter Kippes <[email protected]> - 2.0.6
* Fixed packaging
* 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
4 changes: 2 additions & 2 deletions as400/connector.as400/pom.xml
Original file line number Diff line number Diff line change
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
8 changes: 4 additions & 4 deletions as400/packaging/centreon-as400-daemon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 8bb8d40

Please sign in to comment.