From 46faac1087487884652112e68efdcccab15fa1cba6e5091473ef1c367c7b0f94 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 5 Dec 2018 08:10:56 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=135 --- tomcat.changes | 5 +++++ tomcat.spec | 15 +++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tomcat.changes b/tomcat.changes index 35d7143..a61d351 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 5 08:05:30 UTC 2018 - Fridrich Strba + +- Add pom files for tomcat-jdbc and tomcat-dbcp + ------------------------------------------------------------------- Fri Nov 09 07:16:23 UTC 2018 - sean@suspend.net diff --git a/tomcat.spec b/tomcat.spec index 623ae12..fff3f9e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -45,8 +45,8 @@ Release: 0 Summary: Apache Servlet/JSP/EL Engine, RI for Servlet 4.0/JSP 2.3/EL 3.0 API License: Apache-2.0 Group: Productivity/Networking/Web/Servers -Url: http://tomcat.apache.org -Source0: https://archive.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz +URL: http://tomcat.apache.org +Source0: https://archive.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz Source1: %{name}-%{major_version}.%{minor_version}.conf Source2: %{name}-%{major_version}.%{minor_version}.init Source3: %{name}-%{major_version}.%{minor_version}.sysconfig @@ -85,7 +85,6 @@ Patch3: %{name}-%{major_version}.%{minor_version}-sle.catalina.policy.pa Patch4: %{name}-%{major_version}.%{minor_version}-javadoc.patch # PATCH-FIX-OPENSUSE: disable adding OSGi metadata to JAR files because bndtools is not avalable in SLES/OpenSUSE Patch5: tomcat-9.0-disable-osgi-build.patch - BuildRequires: ant >= 1.8.1 BuildRequires: ant-antlr BuildRequires: apache-commons-collections @@ -529,6 +528,12 @@ cp -a tomcat-coyote.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.po cp -a tomcat-juli.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom %add_maven_depmap JPP.%{name}-tomcat-juli.pom %{name}/tomcat-juli.jar +cp -a tomcat-jdbc.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom +%add_maven_depmap JPP.%{name}-tomcat-jdbc.pom %{name}/tomcat-jdbc.jar + +cp -a tomcat-dbcp.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-dbcp.pom +%add_maven_depmap JPP.%{name}-tomcat-dbcp.pom %{name}/tomcat-dbcp.jar + cp -a tomcat-api.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-api.pom %add_maven_depmap JPP.%{name}-tomcat-api.pom %{name}/tomcat-api.jar @@ -757,6 +762,8 @@ rm -f \ %{_mavenpomdir}/JPP.%{name}-jasper-el.pom %{_mavenpomdir}/JPP.%{name}-jasper.pom %{_mavenpomdir}/JPP.%{name}-tomcat-api.pom +%{_mavenpomdir}/JPP.%{name}-tomcat-dbcp.pom +%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom %{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom %{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom %{_mavenpomdir}/JPP.%{name}-tomcat-util.pom @@ -777,7 +784,7 @@ rm -f \ %{_mavenpomdir}/JPP.%{name}-tomcat-embed-jasper.pom %files servlet-4_0-api -%doc LICENSE +%license LICENSE %{_javadir}/%{name}-servlet-%{servletspec}-api.jar %{_javadir}/%{name}-servlet-api.jar %{_javadir}/%{name}-servlet.jar From d26ef6d7a2fa9b4480279f328a95cce980bf7e5495111c2e610140993af837d6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 5 Dec 2018 09:37:03 +0000 Subject: [PATCH 2/2] Accepting request 655001 from home:fstrba:maven OBS-URL: https://build.opensuse.org/request/show/655001 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=136 --- tomcat.changes | 1 + tomcat.spec | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tomcat.changes b/tomcat.changes index a61d351..4d9ab36 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -2,6 +2,7 @@ Wed Dec 5 08:05:30 UTC 2018 - Fridrich Strba - Add pom files for tomcat-jdbc and tomcat-dbcp +- Add org.eclipse.jetty.orbit* aliases to correspondant artifacts ------------------------------------------------------------------- Fri Nov 09 07:16:23 UTC 2018 - sean@suspend.net diff --git a/tomcat.spec b/tomcat.spec index fff3f9e..4b865db 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -99,8 +99,7 @@ BuildRequires: geronimo-jaxrpc-1_1-api BuildRequires: geronimo-qname-1_1-api BuildRequires: geronimo-saaj-1_1-api BuildRequires: jakarta-taglibs-standard >= 1.1 -#BuildRequires: java-devel >= 1.8 -BuildRequires: java-devel = 1.8.0 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit @@ -507,10 +506,10 @@ done # servlet-api jsp-api and el-api are not in tomcat subdir, since they are widely re-used elsewhere cp -a tomcat-jsp-api.pom %{buildroot}%{_mavenpomdir}/JPP-tomcat-jsp-api.pom -%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "javax.servlet.jsp:javax.servlet.jsp-api,javax.servlet:jsp-api" +%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "javax.servlet.jsp:javax.servlet.jsp-api,javax.servlet:jsp-api,org.eclipse.jetty.orbit:javax.servlet.jsp" cp -a tomcat-el-api.pom %{buildroot}%{_mavenpomdir}/JPP-tomcat-el-api.pom -%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "javax.el:javax.el-api,javax.el:el-api" +%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "javax.el:javax.el-api,javax.el:el-api,org.eclipse.jetty.orbit:javax.el" cp -a tomcat-servlet-api.pom %{buildroot}%{_mavenpomdir}/JPP-tomcat-servlet-api.pom # Generate a depmap fragment javax.servlet:servlet-api pointing to