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

Ctor 1006 fix as400 packaging #5252

Draft
wants to merge 12 commits into
base: develop
Choose a base branch
from
Draft

Ctor 1006 fix as400 packaging #5252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
266a774
depend on java 8 or java 17
tuntoja Oct 21, 2024
0095436
fix typo
tuntoja Oct 21, 2024
d351f1d
fix as400 macro replacement in packaging
tuntoja Oct 21, 2024
b2f6c66
use version from output instead of macro
tuntoja Oct 21, 2024
ad0c8c8
fix typo
tuntoja Oct 21, 2024
c4a7119
revert me, force trigger workflow
tuntoja Oct 21, 2024
4f1463f
use common real datadir path instead of macro
tuntoja Oct 21, 2024
0a645a5
depend on java 17
tuntoja Oct 21, 2024
674b93f
bump as400 version to 2.0.6
tuntoja Oct 21, 2024
45e6822
add jre11 or jre17 for debian 11
tuntoja Oct 21, 2024
2db162f
attempt to build with target java 11
tuntoja Oct 21, 2024
8a9dfcb
attempt to build with target java 17
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
2 changes: 1 addition & 1 deletion as400/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Fixed packaging for config files

2024-10-11 Olivier Mercier <omercier@centreon.com> - 2.0.4
* Use io.undertow 2.3.17
* Use io.undertow 2.3.17

2024-10-10 Olivier Mercier <omercier@centreon.com> - 2.0.3
* New build workflow
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