Accepting request 1227267 from Java:packages

4.0.1

OBS-URL: https://build.opensuse.org/request/show/1227267
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glassfish-servlet-api?expand=0&rev=5

glassfish-servlet-api-build.properties

@@ -1,20 +1,20 @@
 build.dir=target
-build.finalName=javax.servlet-api-3.1.0
+build.finalName=javax.servlet-api-4.0.1
 build.outputDir=${build.dir}/classes
 build.resourceDir.0=src/main/java
 build.resourceDir.1=src/main/resources
 build.srcDir.0=src/main/java
 bundle.symbolicName=javax.servlet-api
-bundle.version=3.1.0
-doc.title=Java Servlet 3.1 API Specification
+bundle.version=4.0.1
+doc.title=Java Servlet 4.0 API Specification
 extension.name=javax.servlet
 implementation.vendor.id=org.glassfish
 project.build.directory=${build.dir}
 project.build.outputDirectory=${build.outputDir}
 project.build.sourceEncoding=UTF-8
 project.organization.name=GlassFish Community
-project.version=3.1.0
+project.version=4.0.1
 reporting.outputDirectory=${build.dir}/site
-spec.version=3.1
+spec.version=4.0
 vendor.name=Oracle Corporation
-window.title=Java Servlet 3.1
+window.title=Java Servlet 4.0

glassfish-servlet-api-build.xml

@@ -8,7 +8,7 @@
 
   <property file="build.properties"/>
 
-  <property name="build.finalName" value="javax.servlet-api-3.1.0"/>
+  <property name="build.finalName" value="javax.servlet-api-4.0.1"/>
   <property name="build.dir" value="target"/>
   <property name="build.outputDir" value="${build.dir}/classes"/>
   <property name="build.srcDir.0" value="src/main/java"/>

glassfish-servlet-api.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Nov 11 17:07:37 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to javax.servlet-api 4.0.1
+  * no changelog provided by upstream
+  * last version with the javax.servlet:javax.servlet-api coordinates
+
+-------------------------------------------------------------------
+Wed Oct  2 15:41:50 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Spec file cleanup
+
 -------------------------------------------------------------------
 Thu Sep 21 05:43:44 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

glassfish-servlet-api.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package glassfish-servlet-api
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %global artifactId javax.servlet-api
 Name:           glassfish-servlet-api
-Version:        3.1.0
+Version:        4.0.1
 Release:        0
 Summary:        Java Servlet API
 License:        Apache-2.0 AND (CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0)
@@ -30,7 +30,7 @@ Source2:        glassfish-servlet-api-build.xml
 Source3:        glassfish-servlet-api-build.properties
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildArch:      noarch
 
 %description
@@ -57,8 +57,6 @@ cp -p %{SOURCE3} build.properties
 # README contains also part of javax.servlet-api license
 cp -p src/main/resources/META-INF/README .
 
-%pom_remove_parent .
-
 %build
 ant package javadoc
 
@@ -68,7 +66,7 @@ install -dm 0755 %{buildroot}%{_javadir}
 install -pm 0644 target/%{artifactId}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar -a javax.servlet:servlet-api,org.apache.geronimo.specs:geronimo-servlet_3.0_spec,org.eclipse.jetty.orbit:javax.servlet
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}