Skip to content

Commit a9502da

Browse files
edewataedewata
committed
Fix publish job
The pom.xml has been updated to use org.jboss.spec.javax.ws.rs so that it can be used to publish Maven artifacts. The pki-local will now be created dynamically in pki.spec. The publish job has also been updated to use Java 21.
1 parent 8cd90c9 commit a9502da

3 files changed

Lines changed: 74 additions & 55 deletions

File tree

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Set up Java
2626
uses: actions/setup-java@v5
2727
with:
28-
java-version: '17'
28+
java-version: '21'
2929
distribution: 'adopt'
3030

3131
- name: Configure settings.xml

‎base/common/pom.xml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@
9494
<version>4.0.0</version>
9595
</dependency>
9696

97+
<dependency>
98+
<groupId>org.jboss.spec.javax.ws.rs</groupId>
99+
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
100+
<version>1.0.0.Final</version>
101+
</dependency>
102+
97103
<dependency>
98104
<groupId>com.fasterxml.jackson.core</groupId>
99105
<artifactId>jackson-annotations</artifactId>
@@ -118,20 +124,6 @@
118124
<version>2.14.2</version>
119125
</dependency>
120126

121-
<!--
122-
<dependency>
123-
<groupId>org.jboss.spec.javax.ws.rs</groupId>
124-
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
125-
<version>1.0.0.Final</version>
126-
</dependency>
127-
-->
128-
129-
<dependency>
130-
<groupId>pki-local</groupId>
131-
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
132-
<version>1.0.0.Final</version>
133-
</dependency>
134-
135127
<dependency>
136128
<groupId>com.fasterxml.jackson.jaxrs</groupId>
137129
<artifactId>jackson-jaxrs-base</artifactId>

‎pki.spec‎

Lines changed: 67 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,12 +1122,6 @@ This package provides test suite for %{product_name}.
11221122

11231123
%autosetup -n pki-%{full_version} -p 1
11241124

1125-
%if 0%{?fedora} >= %{fedora_tomcat9_cutoff} || 0%{?rhel} >= %{rhel_tomcat9_cutoff}
1126-
# Migrate the source first because we are starting with Tomcat 9 code,
1127-
# so we can build against either Tomcat 9 or 10.1, based on the build platform.
1128-
/usr/bin/javax2jakarta -profile=EE -exclude=./base/tomcat-9.0 ./base ./base
1129-
%endif
1130-
11311125
%if %{without runtime_deps}
11321126

11331127
if [ -d base/common/lib ]
@@ -1228,23 +1222,37 @@ fi
12281222
%endif
12291223

12301224
%if 0%{?fedora} >= %{fedora_tomcat9_cutoff} || 0%{?rhel} >= %{rhel_tomcat9_cutoff}
1225+
1226+
# migrate PKI sources to Jakarta for Tomcat 10
1227+
javax2jakarta \
1228+
-logLevel=FINE \
1229+
-profile=EE \
1230+
-exclude=./base/tomcat-9.0 \
1231+
./base \
1232+
./base
1233+
12311234
if [ -d base/common/lib ]
12321235
then
12331236
# migrate common libraries
12341237
pushd base/common/lib
12351238

1236-
/usr/bin/javax2jakarta -profile=EE jakarta.activation-api-$JAKARTA_ACTIVATION_API_VERSION.jar jakarta.activation-api-$JAKARTA_ACTIVATION_API_VERSION.jar
1237-
/usr/bin/javax2jakarta -profile=EE jakarta.annotation-api-$JAKARTA_ANNOTATION_API_VERSION.jar jakarta.annotation-api-$JAKARTA_ANNOTATION_API_VERSION.jar
1238-
/usr/bin/javax2jakarta -profile=EE jakarta.xml.bind-api-$JAXB_API_VERSION.jar jakarta.xml.bind-api-$JAXB_API_VERSION.jar
1239+
# migrate jakarta.activation
1240+
jar tvf jakarta.activation-api-$JAKARTA_ACTIVATION_API_VERSION.jar \
1241+
| sed -n 's/.* \([^ ]\+\)\/[^\/]*\.class$/\1/p' \
1242+
| sort \
1243+
| uniq
12391244

1240-
/usr/bin/javax2jakarta -profile=EE jackson-annotations-$JACKSON_ANNOTATIONS_VERSION.jar jackson-annotations-$JACKSON_ANNOTATIONS_VERSION.jar
1241-
/usr/bin/javax2jakarta -profile=EE jackson-core-$JACKSON_CORE_VERSION.jar jackson-core-$JACKSON_CORE_VERSION.jar
1242-
/usr/bin/javax2jakarta -profile=EE jackson-databind-$JACKSON_CORE_VERSION.jar jackson-databind-$JACKSON_CORE_VERSION.jar
1243-
/usr/bin/javax2jakarta -profile=EE jackson-module-jaxb-annotations-$JACKSON_CORE_VERSION.jar jackson-module-jaxb-annotations-$JACKSON_CORE_VERSION.jar
1244-
/usr/bin/javax2jakarta -profile=EE jackson-jaxrs-base-$JACKSON_CORE_VERSION.jar jackson-jaxrs-base-$JACKSON_CORE_VERSION.jar
1245-
/usr/bin/javax2jakarta -profile=EE jackson-jaxrs-json-provider-$JACKSON_CORE_VERSION.jar jackson-jaxrs-json-provider-$JACKSON_CORE_VERSION.jar
1245+
javax2jakarta \
1246+
-logLevel=FINE \
1247+
-profile=EE \
1248+
jakarta.activation-api-$JAKARTA_ACTIVATION_API_VERSION.jar \
1249+
jakarta.activation-api-$JAKARTA_ACTIVATION_API_VERSION.jar
12461250

1247-
/usr/bin/javax2jakarta -profile=EE jboss-jaxrs-api_2.0_spec-$JAXRS_VERSION.jar jboss-jaxrs-api_2.0_spec-$JAXRS_VERSION.jar
1251+
# migrate javax.annotation and jakarta.annotation
1252+
jar tvf jakarta.annotation-api-$JAKARTA_ANNOTATION_API_VERSION.jar \
1253+
| sed -n 's/.* \([^ ]\+\)\/[^\/]*\.class$/\1/p' \
1254+
| sort \
1255+
| uniq
12481256

12491257
javax2jakarta \
12501258
-logLevel=FINE \
@@ -1393,23 +1401,43 @@ then
13931401
# migrate server libraries
13941402
pushd base/server/lib
13951403

1396-
/usr/bin/javax2jakarta -profile=EE resteasy-servlet-initializer-$RESTEASY_VERSION.jar resteasy-servlet-initializer-$RESTEASY_VERSION.jar
1404+
# migrate org.jboss.resteasy.plugins.servlet
1405+
jar tvf resteasy-servlet-initializer-$RESTEASY_VERSION.jar \
1406+
| sed -n 's/.* \([^ ]\+\)\/[^\/]*\.class$/\1/p' \
1407+
| sort \
1408+
| uniq
1409+
1410+
javax2jakarta \
1411+
-logLevel=FINE \
1412+
-profile=EE \
1413+
resteasy-servlet-initializer-$RESTEASY_VERSION.jar \
1414+
resteasy-servlet-initializer-$RESTEASY_VERSION.jar
13971415

13981416
popd
13991417
fi
1400-
%endif
14011418

14021419
%if %{without runtime_deps}
14031420
if [ -d base/common/lib ]
14041421
then
14051422
# install migrated common libraries
14061423
pushd base/common/lib
14071424

1408-
mkdir -p ~/.m2/repository/pki-local/jboss-jaxrs-api_2.0_spec/$JAXRS_VERSION
1409-
cp jboss-jaxrs-api_2.0_spec-$JAXRS_VERSION.jar ~/.m2/repository/pki-local/jboss-jaxrs-api_2.0_spec/$JAXRS_VERSION
1425+
# org.jboss.spec.jakarta.ws.rs cannot be used with xmvn
1426+
# so it's replaced with pki-local
1427+
mkdir -p $HOME/.m2/repository/pki-local/jboss-jaxrs-api_2.0_spec/$JAXRS_VERSION
1428+
cp jboss-jaxrs-api_2.0_spec-$JAXRS_VERSION.jar $HOME/.m2/repository/pki-local/jboss-jaxrs-api_2.0_spec/$JAXRS_VERSION
14101429

14111430
popd
1431+
1432+
# rename org.jboss.spec.jakarta.ws.rs into pki-local
1433+
cat base/common/pom.xml
1434+
%pom_change_dep org.jboss.spec.jakarta.ws.rs: pki-local: base/common
14121435
fi
1436+
1437+
# without runtime_deps
1438+
%endif
1439+
1440+
# fedora} >= fedora_tomcat9_cutoff || rhel} >= rhel_tomcat9_cutoff
14131441
%endif
14141442

14151443
%if ! %{with base}
@@ -1461,6 +1489,14 @@ fi
14611489
%pom_disable_module console base
14621490
%endif
14631491

1492+
%if 0%{?fedora} && 0%{?fedora} < %{fedora_tomcat9_cutoff} || 0%{?rhel} && 0%{?rhel} < %{rhel_tomcat9_cutoff}
1493+
%pom_disable_module tomcat-10.1 base
1494+
%pom_remove_dep :pki-tomcat-10.1 base/server
1495+
%else
1496+
%pom_disable_module tomcat-9.0 base
1497+
%pom_remove_dep :pki-tomcat-9.0 base/server
1498+
%endif
1499+
14641500
# remove plugins not needed to build RPM
14651501
%pom_remove_plugin org.codehaus.mojo:flatten-maven-plugin
14661502
%pom_remove_plugin org.apache.maven.plugins:maven-deploy-plugin
@@ -1541,14 +1577,6 @@ export JAVA_HOME=%{java_home}
15411577
%if %{with maven}
15421578
# build Java binaries and run unit tests with Maven
15431579

1544-
%if 0%{?fedora} && 0%{?fedora} < %{fedora_tomcat9_cutoff} || 0%{?rhel} && 0%{?rhel} < %{rhel_tomcat9_cutoff}
1545-
%pom_disable_module tomcat-10.1 base
1546-
%pom_remove_dep :pki-tomcat-10.1 base/server
1547-
%else
1548-
%pom_disable_module tomcat-9.0 base
1549-
%pom_remove_dep :pki-tomcat-9.0 base/server
1550-
%endif
1551-
15521580
%mvn_build %{!?with_test:-f} -j
15531581

15541582
# create links to Maven-built JAR files for CMake
@@ -1709,10 +1737,10 @@ xmlstarlet edit --inplace \
17091737
-d "//_:dependency[_:groupId='jakarta.activation']" \
17101738
-d "//_:dependency[_:groupId='jakarta.annotation']" \
17111739
-d "//_:dependency[_:groupId='jakarta.xml.bind']" \
1740+
-d "//_:dependency[_:groupId='pki-local']" \
17121741
-d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
17131742
-d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
17141743
-d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
1715-
-d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
17161744
-d "//_:dependency[_:groupId='org.jboss.logging']" \
17171745
-d "//_:dependency[_:groupId='org.jboss.resteasy']" \
17181746
%{buildroot}%{_datadir}/maven-metadata/%{name}.xml
@@ -1733,11 +1761,10 @@ xmlstarlet edit --inplace \
17331761
-d "//_:dependency[_:groupId='jakarta.activation']" \
17341762
-d "//_:dependency[_:groupId='jakarta.annotation']" \
17351763
-d "//_:dependency[_:groupId='jakarta.xml.bind']" \
1764+
-d "//_:dependency[_:groupId='pki-local']" \
17361765
-d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
17371766
-d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
17381767
-d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
1739-
-d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
1740-
-d "//_:dependency[_:groupId='pki-local']" \
17411768
-d "//_:dependency[_:groupId='org.jboss.logging']" \
17421769
-d "//_:dependency[_:groupId='org.jboss.resteasy']" \
17431770
%{buildroot}%{_datadir}/maven-metadata/%{name}-pki-java.xml
@@ -1756,10 +1783,10 @@ xmlstarlet edit --inplace \
17561783
-d "//_:dependency[_:groupId='jakarta.activation']" \
17571784
-d "//_:dependency[_:groupId='jakarta.annotation']" \
17581785
-d "//_:dependency[_:groupId='jakarta.xml.bind']" \
1786+
-d "//_:dependency[_:groupId='pki-local']" \
17591787
-d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
17601788
-d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
17611789
-d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
1762-
-d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
17631790
-d "//_:dependency[_:groupId='org.jboss.logging']" \
17641791
-d "//_:dependency[_:groupId='org.jboss.resteasy']" \
17651792
%{buildroot}%{_datadir}/maven-metadata/%{name}-pki-tools.xml
@@ -1780,10 +1807,10 @@ xmlstarlet edit --inplace \
17801807
-d "//_:dependency[_:groupId='jakarta.activation']" \
17811808
-d "//_:dependency[_:groupId='jakarta.annotation']" \
17821809
-d "//_:dependency[_:groupId='jakarta.xml.bind']" \
1810+
-d "//_:dependency[_:groupId='pki-local']" \
17831811
-d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
17841812
-d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
17851813
-d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
1786-
-d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
17871814
-d "//_:dependency[_:groupId='org.jboss.logging']" \
17881815
-d "//_:dependency[_:groupId='org.jboss.resteasy']" \
17891816
%{buildroot}%{_datadir}/maven-metadata/%{name}-pki-server.xml
@@ -1804,10 +1831,10 @@ xmlstarlet edit --inplace \
18041831
-d "//_:dependency[_:groupId='jakarta.activation']" \
18051832
-d "//_:dependency[_:groupId='jakarta.annotation']" \
18061833
-d "//_:dependency[_:groupId='jakarta.xml.bind']" \
1834+
-d "//_:dependency[_:groupId='pki-local']" \
18071835
-d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
18081836
-d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
18091837
-d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
1810-
-d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
18111838
-d "//_:dependency[_:groupId='org.jboss.logging']" \
18121839
-d "//_:dependency[_:groupId='org.jboss.resteasy']" \
18131840
%{buildroot}%{_datadir}/maven-metadata/%{name}-pki-ca.xml
@@ -1828,10 +1855,10 @@ xmlstarlet edit --inplace \
18281855
-d "//_:dependency[_:groupId='jakarta.activation']" \
18291856
-d "//_:dependency[_:groupId='jakarta.annotation']" \
18301857
-d "//_:dependency[_:groupId='jakarta.xml.bind']" \
1858+
-d "//_:dependency[_:groupId='pki-local']" \
18311859
-d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
18321860
-d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
18331861
-d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
1834-
-d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
18351862
-d "//_:dependency[_:groupId='org.jboss.logging']" \
18361863
-d "//_:dependency[_:groupId='org.jboss.resteasy']" \
18371864
%{buildroot}%{_datadir}/maven-metadata/%{name}-pki-kra.xml
@@ -1852,10 +1879,10 @@ xmlstarlet edit --inplace \
18521879
-d "//_:dependency[_:groupId='jakarta.activation']" \
18531880
-d "//_:dependency[_:groupId='jakarta.annotation']" \
18541881
-d "//_:dependency[_:groupId='jakarta.xml.bind']" \
1882+
-d "//_:dependency[_:groupId='pki-local']" \
18551883
-d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
18561884
-d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
18571885
-d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
1858-
-d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
18591886
-d "//_:dependency[_:groupId='org.jboss.logging']" \
18601887
-d "//_:dependency[_:groupId='org.jboss.resteasy']" \
18611888
%{buildroot}%{_datadir}/maven-metadata/%{name}-pki-ocsp.xml
@@ -1876,10 +1903,10 @@ xmlstarlet edit --inplace \
18761903
-d "//_:dependency[_:groupId='jakarta.activation']" \
18771904
-d "//_:dependency[_:groupId='jakarta.annotation']" \
18781905
-d "//_:dependency[_:groupId='jakarta.xml.bind']" \
1906+
-d "//_:dependency[_:groupId='pki-local']" \
18791907
-d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
18801908
-d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
18811909
-d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
1882-
-d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
18831910
-d "//_:dependency[_:groupId='org.jboss.logging']" \
18841911
-d "//_:dependency[_:groupId='org.jboss.resteasy']" \
18851912
%{buildroot}%{_datadir}/maven-metadata/%{name}-pki-tks.xml
@@ -1900,10 +1927,10 @@ xmlstarlet edit --inplace \
19001927
-d "//_:dependency[_:groupId='jakarta.activation']" \
19011928
-d "//_:dependency[_:groupId='jakarta.annotation']" \
19021929
-d "//_:dependency[_:groupId='jakarta.xml.bind']" \
1930+
-d "//_:dependency[_:groupId='pki-local']" \
19031931
-d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
19041932
-d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
19051933
-d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
1906-
-d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
19071934
-d "//_:dependency[_:groupId='org.jboss.logging']" \
19081935
-d "//_:dependency[_:groupId='org.jboss.resteasy']" \
19091936
%{buildroot}%{_datadir}/maven-metadata/%{name}-pki-tps.xml
@@ -1924,10 +1951,10 @@ xmlstarlet edit --inplace \
19241951
-d "//_:dependency[_:groupId='jakarta.activation']" \
19251952
-d "//_:dependency[_:groupId='jakarta.annotation']" \
19261953
-d "//_:dependency[_:groupId='jakarta.xml.bind']" \
1954+
-d "//_:dependency[_:groupId='pki-local']" \
19271955
-d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
19281956
-d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
19291957
-d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
1930-
-d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
19311958
-d "//_:dependency[_:groupId='org.jboss.logging']" \
19321959
-d "//_:dependency[_:groupId='org.jboss.resteasy']" \
19331960
%{buildroot}%{_datadir}/maven-metadata/%{name}-pki-acme.xml
@@ -1948,10 +1975,10 @@ xmlstarlet edit --inplace \
19481975
-d "//_:dependency[_:groupId='jakarta.activation']" \
19491976
-d "//_:dependency[_:groupId='jakarta.annotation']" \
19501977
-d "//_:dependency[_:groupId='jakarta.xml.bind']" \
1978+
-d "//_:dependency[_:groupId='pki-local']" \
19511979
-d "//_:dependency[_:groupId='com.fasterxml.jackson.core']" \
19521980
-d "//_:dependency[_:groupId='com.fasterxml.jackson.module']" \
19531981
-d "//_:dependency[_:groupId='com.fasterxml.jackson.jaxrs']" \
1954-
-d "//_:dependency[_:groupId='org.jboss.spec.javax.ws.rs']" \
19551982
-d "//_:dependency[_:groupId='org.jboss.logging']" \
19561983
-d "//_:dependency[_:groupId='org.jboss.resteasy']" \
19571984
%{buildroot}%{_datadir}/maven-metadata/%{name}-pki-est.xml

0 commit comments

Comments
 (0)