diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 473c8e2a35a..2d6b0ee71e0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -63,47 +63,63 @@ jobs: - script: | # get Python . version docker exec runner python3 --version | tee output - VERSION=$(sed 's/Python \([0-9]\+\.[0-9]\+\)\..*/\1/' output) + PYTHON_VERSION=$(sed 's/Python \([0-9]\+\.[0-9]\+\)\..*/\1/' output) docker exec runner \ /root/src/build.sh \ --work-dir=/root/build \ - --python-dir=/usr/lib/python$VERSION/site-packages \ + --python-dir=/usr/lib/python$PYTHON_VERSION/site-packages \ dist displayName: Build PKI with CMake - script: | + # get JSS .. version + docker exec runner rpm -q dogtag-jss | tee output + JSS_VERSION=$(sed -e 's/^dogtag-jss-\([0-9]\+\.[0-9]\+\.[0-9]\+\).*$/\1/' output) + + # if built by COPR, jss-base.jar will be installed in /usr/lib/java/jss, + # otherwise it will be in /usr/share/java/jss. + JSS_BASE_JAR=$(docker exec runner find /usr/share/java/jss /usr/lib/java/jss -name jss-base.jar) + docker exec runner \ mvn install:install-file \ -f /root/src \ - -Dfile=/usr/lib/java/jss.jar \ + -Dfile=$JSS_BASE_JAR \ -DgroupId=org.dogtagpki.jss \ -DartifactId=jss-base \ - -Dversion=5.4.0-SNAPSHOT \ + -Dversion=$JSS_VERSION-SNAPSHOT \ -Dpackaging=jar \ -DgeneratePom=true displayName: Install JSS into Maven repo - script: | + # get Tomcat JSS .. version + docker exec runner rpm -q dogtag-tomcatjss | tee output + TOMCATJSS_VERSION=$(sed -e 's/^dogtag-tomcatjss-\([0-9]\+\.[0-9]\+\.[0-9]\+\).*$/\1/' output) + docker exec runner \ mvn install:install-file \ -f /root/src \ - -Dfile=/usr/share/java/tomcatjss.jar \ + -Dfile=/usr/share/java/tomcatjss/tomcatjss-core.jar \ -DgroupId=org.dogtagpki.tomcatjss \ - -DartifactId=tomcatjss-tomcat-9.0 \ - -Dversion=8.4.0-SNAPSHOT \ + -DartifactId=tomcatjss-core \ + -Dversion=$TOMCATJSS_VERSION-SNAPSHOT \ -Dpackaging=jar \ -DgeneratePom=true displayName: Install Tomcat JSS into Maven repo - script: | + # get LDAP JDK .. version + docker exec runner rpm -q dogtag-ldapjdk | tee output + LDAPJDK_VERSION=$(sed -e 's/^dogtag-ldapjdk-\([0-9]\+\.[0-9]\+\.[0-9]\+\).*$/\1/' output) + docker exec runner \ mvn install:install-file \ -f /root/src \ -Dfile=/usr/share/java/ldapjdk.jar \ -DgroupId=org.dogtagpki.ldap-sdk \ -DartifactId=ldapjdk \ - -Dversion=5.4.0-SNAPSHOT \ + -Dversion=$LDAPJDK_VERSION-SNAPSHOT \ -Dpackaging=jar \ -DgeneratePom=true displayName: Install LDAP JDK into Maven repo diff --git a/base/common/pom.xml b/base/common/pom.xml index 8812bf8c11d..55701313a14 100644 --- a/base/common/pom.xml +++ b/base/common/pom.xml @@ -14,6 +14,22 @@ pki-common jar + + + + org.dogtagpki.jss + jss-base + 5.5.0-SNAPSHOT + + + + org.dogtagpki.ldap-sdk + ldapjdk + 5.5.0-SNAPSHOT + + + + pki-common diff --git a/base/est/pom.xml b/base/est/pom.xml new file mode 100644 index 00000000000..a43df066694 --- /dev/null +++ b/base/est/pom.xml @@ -0,0 +1,31 @@ + + + + 4.0.0 + + + org.dogtagpki.pki + pki-base-parent + ${revision} + + + pki-est + jar + + + + + ${project.groupId} + pki-server + ${project.version} + + + + + + pki-est + + + diff --git a/base/pom.xml b/base/pom.xml index a660a366ea6..e88b3621c99 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -27,6 +27,7 @@ tks tps acme + est diff --git a/base/tomcat/pom.xml b/base/tomcat/pom.xml index 435767d112d..1cfdb804027 100644 --- a/base/tomcat/pom.xml +++ b/base/tomcat/pom.xml @@ -34,6 +34,12 @@ 9.0.50 + + org.dogtagpki.tomcatjss + tomcatjss-core + 8.5.0-SNAPSHOT + + ${project.groupId} pki-common diff --git a/pki.spec b/pki.spec index 4966d6a3d70..da847bb275d 100644 --- a/pki.spec +++ b/pki.spec @@ -167,7 +167,8 @@ BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(commons-net:commons-net) BuildRequires: mvn(org.slf4j:slf4j-api) -BuildRequires: mvn(org.slf4j:slf4j-jdk14) +BuildRequires: mvn(xml-apis:xml-apis) +BuildRequires: mvn(xml-resolver:xml-resolver) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) BuildRequires: mvn(org.jboss.resteasy:resteasy-client) BuildRequires: mvn(org.jboss.resteasy:resteasy-jackson2-provider) @@ -177,9 +178,9 @@ BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) BuildRequires: mvn(org.apache.tomcat:tomcat-jaspic-api) BuildRequires: mvn(org.apache.tomcat:tomcat-util-scan) -BuildRequires: jss >= 5.4 -BuildRequires: tomcatjss >= 8.4 -BuildRequires: ldapjdk >= 5.4 +BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0 +BuildRequires: mvn(org.dogtagpki.tomcatjss:tomcatjss-core) >= 8.5.0 +BuildRequires: mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.5.0 # Python build dependencies BuildRequires: python3 >= 3.9 @@ -374,8 +375,8 @@ Requires: mvn(org.slf4j:slf4j-jdk14) Requires: mvn(org.jboss.resteasy:resteasy-client) Requires: mvn(org.jboss.resteasy:resteasy-jackson2-provider) Requires: mvn(org.jboss.resteasy:resteasy-jaxrs) -Requires: jss >= 5.4 -Requires: ldapjdk >= 5.4 +Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0 +Requires: mvn(org.dogtagpki.ldap-sdk:ldapjdk) >= 5.5.0 Requires: %{product_id}-base = %{version}-%{release} %description -n %{product_id}-java @@ -440,12 +441,12 @@ Requires: selinux-policy-targeted >= 3.13.1-159 Requires: mvn(org.jboss.resteasy:resteasy-servlet-initializer) Requires: tomcat >= 1:9.0.50 +Requires: mvn(org.dogtagpki.tomcatjss:tomcatjss-core) >= 8.5.0 Requires: systemd Requires(post): systemd-units Requires(postun): systemd-units Requires(pre): shadow-utils -Requires: tomcatjss >= 8.4 # pki-healthcheck depends on the following library %if 0%{?rhel} diff --git a/pom.xml b/pom.xml index 213291bee6e..9fe5d1e6ef8 100644 --- a/pom.xml +++ b/pom.xml @@ -32,12 +32,6 @@ 1.15 - - commons-collections - commons-collections - 3.2.2 - - commons-io commons-io @@ -176,24 +170,6 @@ 1.2 - - org.dogtagpki.jss - jss-base - 5.4.0-SNAPSHOT - - - - org.dogtagpki.tomcatjss - tomcatjss-tomcat-9.0 - 8.4.0-SNAPSHOT - - - - org.dogtagpki.ldap-sdk - ldapjdk - 5.4.0-SNAPSHOT - - org.junit.jupiter junit-jupiter-api @@ -252,6 +228,11 @@ + + org.apache.maven.plugins + maven-surefire-plugin + 3.1.2 +