Fix JSS and LDAP SDK dependencies

dogtagpki · Jul 18, 2024 · a4a5de0 · a4a5de0
1 parent 74c2c19
commit a4a5de0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 39 deletions.
diff --git a/.classpath b/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="lib" path="/usr/share/java/ldapjdk.jar"/>
-	<classpathentry kind="lib" path="/usr/lib/java/jss.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/dogtagpki/ldap-sdk/ldapjdk/5.5.0-SNAPSHOT/ldapjdk-5.5.0-SNAPSHOT.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/dogtagpki/jss/jss-base/5.5.0-SNAPSHOT/jss-base-5.5.0-SNAPSHOT.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>

diff --git a/.github/workflows/build-tests.yml b/.github/workflows/build-tests.yml
@@ -55,39 +55,9 @@ jobs:
       run: |
         docker exec idm-console-framework ./build.sh
 
-    - name: Install JSS into local Maven repo
-      run: |
-        # get JSS <major>.<minor>.<update> version
-        JSS_VERSION=$(docker exec idm-console-framework rpm -q --qf "%{version}" dogtag-jss)
-
-        # if built by COPR, jss-base.jar will be installed in /usr/lib/java,
-        # otherwise it will be in /usr/share/java.
-        JSS_BASE_JAR=$(docker exec idm-console-framework find /usr/lib/java /usr/share/java -name jss-base.jar)
-
-        docker exec idm-console-framework mvn install:install-file \
-            -Dfile=$JSS_BASE_JAR \
-            -DgroupId=org.dogtagpki.jss \
-            -DartifactId=jss-base \
-            -Dversion=$JSS_VERSION-SNAPSHOT \
-            -Dpackaging=jar \
-            -DgeneratePom=true
-
-    - name: Install LDAP JDK into local Maven repo
-      run: |
-        # get LDAP JDK <major>.<minor>.<update> version
-        LDAPJDK_VERSION=$(docker exec idm-console-framework rpm -q --qf "%{version}" dogtag-ldapjdk)
-
-        docker exec idm-console-framework mvn install:install-file \
-            -Dfile=/usr/share/java/ldapjdk.jar \
-            -DgroupId=org.dogtagpki.ldap-sdk \
-            -DartifactId=ldapjdk \
-            -Dversion=$LDAPJDK_VERSION-SNAPSHOT \
-            -Dpackaging=jar \
-            -DgeneratePom=true
-
     - name: Build with Maven
       run: |
-        docker exec idm-console-framework mvn package
+        docker exec idm-console-framework mvn --batch-mode package
 
     - name: Compare idm-console-framework.jar
       run: |

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 build/
 target/
+.flattened-pom.xml
 *.versionsBackup
diff --git a/idm-console-framework.spec b/idm-console-framework.spec
@@ -82,8 +82,8 @@ ExclusiveArch:    %{java_arches} noarch
 BuildRequires:    %{java_devel}
 BuildRequires:    maven-local
 BuildRequires:    ant >= 1.6.2
-BuildRequires:    mvn(org.dogtagpki.jss:jss-base) >= 5.5.0
-BuildRequires:    mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.5.0
+BuildRequires:    mvn(org.dogtagpki.jss:jss-base) >= 5.5.0, mvn(org.dogtagpki.jss:jss-base) < 5.6.0
+BuildRequires:    mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.5.0, mvn(org.dogtagpki.ldap-sdk:ldapjdk) < 5.6.0
 
 %description
 A Java Management Console framework used for remote server management.
@@ -95,8 +95,8 @@ A Java Management Console framework used for remote server management.
 Summary:          Identity Management Console Framework
 
 Requires:         %{java_headless}
-Requires:         mvn(org.dogtagpki.jss:jss-base) >= 5.5.0
-Requires:         mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.5.0
+Requires:         mvn(org.dogtagpki.jss:jss-base) >= 5.5.0, mvn(org.dogtagpki.jss:jss-base) < 5.6.0
+Requires:         mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.5.0, mvn(org.dogtagpki.ldap-sdk:ldapjdk) < 5.6.0
 
 %if "%{product_id}" != "idm-console-framework"
 Obsoletes:        idm-console-framework < %{version}-%{release}

diff --git a/pom.xml b/pom.xml
@@ -19,13 +19,13 @@
         <dependency>
             <groupId>org.dogtagpki.jss</groupId>
             <artifactId>jss-base</artifactId>
-            <version>[5.5.0-SNAPSHOT,)</version>
+            <version>5.5.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.dogtagpki.ldap-sdk</groupId>
             <artifactId>ldapjdk</artifactId>
-            <version>[5.5.0-SNAPSHOT,)</version>
+            <version>5.5.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>