Update Java version in pom.xml

The pki.spec has been modified to get the actual Java version available on the build system then update the pom.xml to build the binaries with that version. The maven-compiler-plugin is no longer used so it has been removed. The rpminspect test has been updated to call rpminpect directly in separate steps to make it easier to inspect the failures. Currently the failures are caused by the old byte code version used in the dependencies. The dependencies need to be rebuilt using the proper version. The rpminspect.sh is no longer used so it has been removed.
dogtagpki · Oct 1, 2024 · 3f97762 · 3f97762
1 parent f21fea7
commit 3f97762
Show file tree

Hide file tree

Showing 19 changed files with 174 additions and 131 deletions.
diff --git a/.github/workflows/rpminspect-test.yml b/.github/workflows/rpminspect-test.yml
@@ -49,7 +49,165 @@ jobs:
 
           docker rm -f pki-dist
 
-      - name: Run rpminspect on SRPM and RPMs
+          # get RPM version and release number
+          VERSION=$(docker exec pki ls build/SRPMS | sed -e 's/^pki-\(.*\)\.src\.rpm$/\1/')
+          echo "VERSION: $VERSION"
+          echo "$VERSION" > VERSION
+
+      - name: Install rpminspect profile
+        run: |
+          docker exec pki ls -lR /usr/share/rpminspect/profiles
+          docker exec pki cp \
+              /usr/share/pki/tests/pki-rpminspect.yaml \
+              /usr/share/rpminspect/profiles/fedora
+
+      - name: Check pki SRPM
+        if: always()
+        run: |
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/SRPMS/pki-*.src.rpm
+
+      - name: Check dogtag-pki RPM
+        if: always()
+        run: |
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/dogtag-pki-$VERSION.*.rpm
+
+      - name: Check dogtag-pki-acme RPM
+        if: always()
+        run: |
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/dogtag-pki-acme-$VERSION.*.rpm
+
+      - name: Check dogtag-pki-base RPM
+        if: always()
+        run: |
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/dogtag-pki-base-$VERSION.*.rpm
+
+      - name: Check dogtag-pki-ca RPM
+        if: always()
+        run: |
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/dogtag-pki-ca-$VERSION.*.rpm
+
+      - name: Check dogtag-pki-est RPM
+        if: always()
+        run: |
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/dogtag-pki-est-$VERSION.*.rpm
+
+      - name: Check dogtag-pki-java RPM
+        if: always()
+        run: |
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/dogtag-pki-java-$VERSION.*.rpm
+
+      - name: Check dogtag-pki-javadoc RPM
+        if: always()
+        run: |
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/dogtag-pki-javadoc-$VERSION.*.rpm
+
+      - name: Check dogtag-pki-kra RPM
+        if: always()
+        run: |
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/dogtag-pki-kra-$VERSION.*.rpm
+
+      - name: Check dogtag-pki-ocsp RPM
+        if: always()
+        run: |
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/dogtag-pki-ocsp-$VERSION.*.rpm
+
+      - name: Check dogtag-pki-server RPM
+        if: always()
+        run: |
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/dogtag-pki-server-$VERSION.*.rpm
+
+      - name: Check dogtag-pki-tests RPM
+        if: always()
+        run: |
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/dogtag-pki-tests-$VERSION.*.rpm
+
+      - name: Check dogtag-pki-theme RPM
+        if: always()
+        run: |
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/dogtag-pki-theme-$VERSION.*.rpm
+
+      - name: Check dogtag-pki-tks RPM
+        if: always()
+        run: |
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/dogtag-pki-tks-$VERSION.*.rpm
+
+      - name: Check dogtag-pki-tools RPM
+        if: always()
+        run: |
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/dogtag-pki-tools-$VERSION.*.rpm
+
+      - name: Check dogtag-pki-tools-debuginfo RPM
+        if: always()
+        run: |
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/dogtag-pki-tools-debuginfo-$VERSION.*.rpm
+
+      - name: Check dogtag-pki-tps RPM
+        if: always()
+        run: |
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/dogtag-pki-tps-$VERSION.*.rpm
+
+      - name: Check pki-debugsource RPM
+        if: always()
+        run: |
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/pki-debugsource-$VERSION.*.rpm
+
+      - name: Check python3-dogtag-pki RPM
+        if: always()
         run: |
-          docker exec pki cp /usr/share/pki/tests/pki-rpminspect.yaml /usr/share/rpminspect/profiles/fedora/pki-rpminspect.yaml
-          docker exec pki /usr/share/pki/tests/bin/rpminspect.sh
+          VERSION=$(cat VERSION)
+          docker exec pki rpminspect-fedora \
+              -p pki-rpminspect \
+              build/RPMS/python3-dogtag-pki-$VERSION.*.rpm
diff --git a/base/acme/pom.xml b/base/acme/pom.xml
@@ -26,14 +26,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/base/ca/pom.xml b/base/ca/pom.xml
@@ -26,14 +26,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/base/common/pom.xml b/base/common/pom.xml
@@ -176,14 +176,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/base/console/pom.xml b/base/console/pom.xml
@@ -31,14 +31,6 @@
             </resource>
         </resources>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/base/est/pom.xml b/base/est/pom.xml
@@ -26,14 +26,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/base/kra/pom.xml b/base/kra/pom.xml
@@ -26,14 +26,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/base/ocsp/pom.xml b/base/ocsp/pom.xml
@@ -26,14 +26,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/base/server-webapp/pom.xml b/base/server-webapp/pom.xml
@@ -26,14 +26,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/base/server/pom.xml b/base/server/pom.xml
@@ -32,14 +32,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/base/tks/pom.xml b/base/tks/pom.xml
@@ -26,14 +26,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/base/tomcat-9.0/pom.xml b/base/tomcat-9.0/pom.xml
@@ -56,14 +56,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/base/tomcat/pom.xml b/base/tomcat/pom.xml
@@ -32,14 +32,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/base/tools/pom.xml b/base/tools/pom.xml
@@ -35,14 +35,6 @@
             </resource>
         </resources>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/base/tps/pom.xml b/base/tps/pom.xml
@@ -26,14 +26,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>