Sync from SUSE:SLFO:1.1 jakarta-servlet revision dbe6601b43e1996f11db223b1748a34f

jakarta-servlet-api-build.xml

@@ -10,9 +10,9 @@
   
   <property name="project.groupId" value="jakarta.servlet"/>
   <property name="project.artifactId" value="jakarta.servlet-api"/>
-  <property name="project.version" value="6.1.0"/>
+  <property name="project.version" value="5.0.0"/>
   
-  <property name="spec.version" value="6.1"/>
+  <property name="spec.version" value="5.0"/>
   <property name="bundle.version" value="${project.version}"/>
 
   <property name="compiler.source" value="1.8"/>
@@ -53,25 +53,10 @@
            verbose="false" 
            fork="false" 
            source="${compiler.source}">
-	  <exclude name="**/module-info.java"/>
       <src>
         <pathelement location="${build.srcDir}"/>
       </src>
     </javac>
-    <javac destdir="${build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="9" 
-           verbose="false" 
-           fork="false" 
-           source="9">
-      <src>
-        <pathelement location="${build.srcDir}"/>
-      </src>
-	  <include name="**/module-info.java"/>
-    </javac>
     <copy todir="${build.outputDir}">
       <fileset dir="${build.resourceDir}">
         <include name="**/*.properties"/>

jakarta-servlet.changes

@@ -1,29 +1,3 @@
--------------------------------------------------------------------
-Tue Oct 15 05:46:19 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
-
-- Update to version 6.1.0
-  * Changes in version 6.1
-    + deprecate support for HTTP/2 push
-    + provide a mechanism (requested by WebSocket) for applications
-      to interact with an HTTP session outside of the standard HTTP
-      request processing
-    + remove references to the SecurityManager and associated APIs
-    + provide clarifications to expected behaviour where it has
-      been requested
-    + review outstanding enhancement requests and implement where
-      time allows
-  * Changes in version 6.0
-    + remove currently deprecated features
-    + consider removing / deprecating additional features
-    + add clarity to existing features
-    + implement requested enhancements
-- Update the URL tag in the spec file
-
--------------------------------------------------------------------
-Wed Oct  2 15:44:07 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Spec file cleanup
-
 -------------------------------------------------------------------
 Mon Jan  8 12:45:17 UTC 2024 - Frederic Crozat <fcrozat@suse.com>
 

jakarta-servlet.spec

@@ -16,21 +16,19 @@
 #
 
 
-%global short_name servlet
 %global artifactId jakarta.servlet-api
-Name:           jakarta-%{short_name}
+Name:           jakarta-servlet
-Version:        6.1.0
+Version:        5.0.0
 Release:        0
 Summary:        Server-side API for handling HTTP requests and responses
 License:        Apache-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0)
-Group:          Development/Libraries/Java
+URL:            https://github.com/jakartaee/servlet
-URL:            https://projects.eclipse.org/projects/ee4j.%{short_name}
+Source0:        https://github.com/jakartaee/servlet/archive/refs/tags/%{version}-RELEASE.tar.gz
-Source0:        https://github.com/jakartaee/%{short_name}/archive/refs/tags/%{version}-RELEASE.tar.gz
 Source1:        %{name}-api-build.xml
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  java-devel >= 9
+BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local >= 6
+BuildRequires:  javapackages-local
 BuildArch:      noarch
 
 %description
@@ -45,12 +43,22 @@ Group:          Documentation/HTML
 API documentation for %{name}.
 
 %prep
-%setup -q -n %{short_name}-%{version}-RELEASE
+%setup -q -n servlet-%{version}-RELEASE
-mkdir -p api/src/main/resources/META-INF/
+cp LICENSE.md api/src/main/resources/META-INF/
-cp {NOTICE,LICENSE}.md api/src/main/resources/META-INF/
+cp NOTICE.md api/src/main/resources/META-INF/
+
+# remove unnecessary dependency on parent POM
+%pom_remove_parent . api
 
 cp %{SOURCE1} api/build.xml
 
+# remove unnecessary maven plugins
+%pom_remove_plugin -r :formatter-maven-plugin
+%pom_remove_plugin -r :impsort-maven-plugin
+%pom_remove_plugin -r :maven-enforcer-plugin
+%pom_remove_plugin -r :maven-javadoc-plugin
+%pom_remove_plugin -r :maven-source-plugin
+
 %build
 pushd api
 %{ant} jar javadoc
@@ -62,7 +70,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{name}
 install -pm 0644 api/target/%{artifactId}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{artifactId}.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-%{mvn_install_pom} api/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{artifactId}.pom
+install -pm 0644 api/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{artifactId}.pom
 %add_maven_depmap %{name}/%{artifactId}.pom %{name}/%{artifactId}.jar
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}