Fridrich Strba 2023-10-17 05:18:43 +00:00 committed by Git OBS Bridge
parent bdb0bcee6e
commit 765d1e570f
3 changed files with 54 additions and 2 deletions

View File

@ -88,6 +88,11 @@
<property name="jaxr.dir" value="${jaxr.id}-${jaxr}" />
<property name="jaxr.jar" value="${jaxr.dir}.jar" />
<property name="jaxrpc" value="1.1" />
<property name="jaxrpc.id" value="geronimo-jaxrpc_1.1_spec" />
<property name="jaxrpc.dir" value="${jaxrpc.id}-${jaxrpc}" />
<property name="jaxrpc.jar" value="${jaxrpc.dir}.jar" />
<property name="jms" value="1.1" />
<property name="jms.id" value="geronimo-jms_1.1_spec" />
<property name="jms.dir" value="${jms.id}-${jms}" />
@ -151,7 +156,7 @@
<target name="dist" depends="build">
</target>
<target name="build" depends="activation102, activation110, annotation, ejb21, ejb30, el10, interceptor, connector, j2eedeployment, javaeedeployment, jacc, j2eejacc, j2eemanagment10, j2eemanagment11, javamail13, javamail14, jaxr, jms, jpa, jsp20, jsp21, jta10, jta11, qname, saaj, servlet24, servlet25, stax, wsmetadata, commonj, geronimo-spec-j2ee">
<target name="build" depends="activation102, activation110, annotation, ejb21, ejb30, el10, interceptor, connector, j2eedeployment, javaeedeployment, jacc, j2eejacc, j2eemanagment10, j2eemanagment11, javamail13, javamail14, jaxr, jaxrpc, jms, jpa, jsp20, jsp21, jta10, jta11, qname, saaj, servlet24, servlet25, stax, wsmetadata, commonj, geronimo-spec-j2ee">
</target>
<target name="geronimo-spec-j2ee">
@ -174,6 +179,7 @@
<fileset dir="${javamail13.dir}/${build}"/>
<fileset dir="${javamail14.dir}/${build}"/>
<fileset dir="${jaxr.dir}/${build}"/>
<fileset dir="${jaxrpc.dir}/${build}"/>
<fileset dir="${jms.dir}/${build}"/>
<fileset dir="${jpa.dir}/${build}"/>
<fileset dir="${jsp20.dir}/${build}"/>
@ -378,6 +384,16 @@ artifactId=${gbuild.id}
</antcall>
</target>
<target name="jaxrpc" depends="servlet24,saaj">
<antcall target="gbuild">
<param name="gbuild.dir" value="${jaxrpc.dir}" />
<param name="gbuild.jar" value="${jaxrpc.jar}" />
<param name="gbuild.classpath" value="${servlet24.dir}/${dist}/${servlet24.jar}:${saaj.dir}/${dist}/${saaj.jar}"/>
<param name="gbuild.id" value="${jaxrpc.id}" />
<param name="gbuild.ver" value="${jaxprc}" />
</antcall>
</target>
<target name="jms">
<antcall target="gbuild">
<param name="gbuild.dir" value="${jms.dir}" />

View File

@ -4,7 +4,6 @@ Mon Oct 16 13:36:57 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Allow building with with java > 1.8
* remove corba modules that nobody requires and that need the
idlj compiler not present ni java >= 10
* remove the jaxrpc module that nobody needs.
- Added patch:
* sun-security-provider.patch
+ remove bogus inclusion of sun.security.provider.Sun

View File

@ -246,6 +246,8 @@ Provides: javamail_1_3_1_api = %{version}
Provides: javamail_api = 1.3.1
Provides: jaxr_1_0_api = %{version}
Provides: jaxr_api = 1.0
Provides: jaxrpc_1_1_api = %{version}
Provides: jaxrpc_api = 1.1
Provides: jms_1_1_api = %{version}
Provides: jms_api = 1.1
Provides: jsp_2_0_api = %{version}
@ -269,6 +271,7 @@ Provides: jacc = 1.0
Provides: jaf = 1.0.2
Provides: javamail = 1.3.1
Provides: jaxr = 1.0
Provides: jaxrpc = 1.1
Provides: jms = 1.1
Provides: jsp = 2.0
Provides: jta = 1.0.1B
@ -445,6 +448,23 @@ Obsoletes: jaxr-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
J2EE-Specifications: Java API for XML Registries (JAXR)
%package -n geronimo-jaxrpc-1_1-api
Summary: Geronimo J2EE server J2EE specifications
Group: Development/Languages/Java
Requires: qname_1_1_api
Requires: saaj_1_1_api
Requires: servlet_2_4_api
Requires(pre): update-alternatives
Provides: jaxrpc = 1.1
# TODO: drop asap
Provides: jaxrpc_1_1_api = %{version}
Provides: jaxrpc_api = 1.1
Obsoletes: %{name}-poms
%description -n geronimo-jaxrpc-1_1-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
J2EE-Specifications: Java API for XML-Based RPC (JAXRPC)
%package -n geronimo-jms-1_1-api
Summary: Geronimo J2EE server J2EE specifications
Group: Development/Languages/Java
@ -766,6 +786,13 @@ install -m 0644 \
%{buildroot}/%{_mavenpomdir}/JPP-geronimo-jaxr-1.0-api.pom
%add_maven_depmap JPP-geronimo-jaxr-1.0-api.pom geronimo-jaxr-1.0-api.jar -f jaxr-1.0-api
install -m 0644 \
geronimo-jaxrpc_1.1_spec-1.1/target/geronimo-jaxrpc_1.1_spec-1.1.jar \
%{buildroot}%{_javadir}/geronimo-jaxrpc-1.1-api.jar
%{mvn_install_pom} geronimo-jaxrpc_1.1_spec-1.1/pom.xml \
%{buildroot}/%{_mavenpomdir}/JPP-geronimo-jaxrpc-1.1-api.pom
%add_maven_depmap JPP-geronimo-jaxrpc-1.1-api.pom geronimo-jaxrpc-1.1-api.jar -f jaxrpc-1.1-api
install -m 0644 \
geronimo-spec-j2ee/target/geronimo-j2ee_1.4_spec-1.2-jar-with-dependencies.jar \
%{buildroot}%{_javadir}/geronimo-j2ee-1.4-apis.jar
@ -946,6 +973,11 @@ update-alternatives --remove jaxr %{_javadir}/geronimo-jaxr-1.0-api.jar
update-alternatives --remove jaxr_api %{_javadir}/geronimo-jaxr-1.0-api.jar
update-alternatives --remove jaxr_1_0_api %{_javadir}/geronimo-jaxr-1.0-api.jar
%pre -n geronimo-jaxrpc-1_1-api
update-alternatives --remove jaxrpc %{_javadir}/geronimo-jaxrpc-1.1-api.jar
update-alternatives --remove jaxrpc_api %{_javadir}/geronimo-jaxrpc-1.1-api.jar
update-alternatives --remove jaxrpc_1_1_api %{_javadir}/geronimo-jaxrpc-1.1-api.jar
%pre -n geronimo-jms-1_1-api
update-alternatives --remove jms %{_javadir}/geronimo-jms-1.1-api.jar
update-alternatives --remove jms_api %{_javadir}/geronimo-jms-1.1-api.jar
@ -1022,6 +1054,8 @@ update-alternatives --remove javamail_api %{_javadir}/geronimo-j2ee-1.4-apis.jar
update-alternatives --remove javamail_1_3_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar
update-alternatives --remove jaxr_api %{_javadir}/geronimo-j2ee-1.4-apis.jar
update-alternatives --remove jaxr_1_0_api %{_javadir}/geronimo-j2ee-1.4-apis.jar
update-alternatives --remove jaxrpc_api %{_javadir}/geronimo-j2ee-1.4-apis.jar
update-alternatives --remove jaxrpc_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar
update-alternatives --remove jms_api %{_javadir}/geronimo-j2ee-1.4-apis.jar
update-alternatives --remove jms_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar
update-alternatives --remove jsp_api %{_javadir}/geronimo-j2ee-1.4-apis.jar
@ -1092,6 +1126,9 @@ update-alternatives --remove servlet_2_4_api %{_javadir}/geronimo-j2ee-1.4-apis.
%files -n geronimo-jaxr-1_0-api -f .mfiles-jaxr-1.0-api
%license geronimo-jaxr_1.0_spec-1.1/LICENSE.txt
%files -n geronimo-jaxrpc-1_1-api -f .mfiles-jaxrpc-1.1-api
%license geronimo-jaxrpc_1.1_spec-1.1/LICENSE.txt
%files -n geronimo-jms-1_1-api -f .mfiles-jms-1.1-api
%license geronimo-jms_1.1_spec-1.1/LICENSE.txt