update after review

centreon · Mar 4, 2025 · eeccfed · eeccfed
1 parent 9e38f13
commit eeccfed
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 6 deletions.
diff --git a/.github/docker/packaging/Dockerfile.packaging-plugins-java-alma8 b/.github/docker/packaging/Dockerfile.packaging-plugins-java-alma8
@@ -7,7 +7,6 @@ RUN bash -e <<EOF
 dnf install -y \
   git \
   java-17-openjdk-devel \
-  libxml2 \
   wget \
   zstd
 

diff --git a/.github/docker/packaging/Dockerfile.packaging-plugins-java-alma9 b/.github/docker/packaging/Dockerfile.packaging-plugins-java-alma9
@@ -7,7 +7,6 @@ RUN bash -e <<EOF
 dnf install -y \
   git \
   java-17-openjdk-devel \
-  libxml2 \
   wget \
   zstd
 

diff --git a/.github/docker/packaging/Dockerfile.packaging-plugins-java-bookworm b/.github/docker/packaging/Dockerfile.packaging-plugins-java-bookworm
@@ -8,7 +8,6 @@ apt-get update
 apt-get install -y \
   ca-certificates \
   git \
-  libxml2-utils \
   maven=3.8.7-1 \
   openjdk-17-jdk \
   zstd

diff --git a/.github/docker/packaging/Dockerfile.packaging-plugins-java-bullseye b/.github/docker/packaging/Dockerfile.packaging-plugins-java-bullseye
@@ -8,7 +8,6 @@ apt-get update
 apt-get install -y \
   ca-certificates \
   git \
-  libxml2-utils \
   maven=3.6.3-5 \
   openjdk-17-jdk \
   zstd

diff --git a/.github/docker/packaging/Dockerfile.packaging-plugins-java-jammy b/.github/docker/packaging/Dockerfile.packaging-plugins-java-jammy
@@ -8,7 +8,6 @@ apt-get update
 apt-get install -y \
   ca-certificates \
   git \
-  libxml2-utils \
   openjdk-17-jdk \
   wget \
   zstd

diff --git a/.github/workflows/as400.yml b/.github/workflows/as400.yml
@@ -64,7 +64,7 @@ jobs:
       - name: Prepare files for packaging
         run: |
           # Get version from the pom.xml
-          version=$(xmllint --xpath "/*[local-name()='project']/*[local-name()='version']/text()" as400/connector.as400/pom.xml)
+          version=$(grep -m 1 "<version>.*</version>" as400/connector.as400/pom.xml | sed 's/.*<version>\(.*\)<\/version>.*/\1/')
           find .     \
           -type f \
           -exec grep -E '(@CONNECTOR_VERSION@)|(@CONNECTOR_HOME@)|(@CONNECTOR_ETC@)|(@CONNECTOR_LOG@)|(@CONNECTOR_USER@)|(@JAVA_BIN@)' {} ';'   \
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ RUN bash -e <<EOF @@
     dnf install -y \
       git \
       java-17-openjdk-devel \
-      libxml2 \
       wget \
       zstd
@@ Expand Down @@