Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jakarta-pages for openSUSE:Factory checked in at 2025-05-09 18:51:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jakarta-pages (Old) and /work/SRC/openSUSE:Factory/.jakarta-pages.new.30101 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-pages" Fri May 9 18:51:21 2025 rev:2 rq:1276071 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/jakarta-pages/jakarta-pages.changes 2025-05-06 07:56:43.440197901 +0200 +++ /work/SRC/openSUSE:Factory/.jakarta-pages.new.30101/jakarta-pages.changes 2025-05-09 18:53:28.602366342 +0200 @@ -1,0 +2,9 @@ +Fri May 9 05:46:25 UTC 2025 - Fridrich Strba <[email protected]> + +- Rewrite the build for ant so that we can use it early +- Added patch: + * jakarta-pages-source8.patch + + allow building with source=1.8 + + still needing java 17 Record api to build + +------------------------------------------------------------------- New: ---- jakarta-pages-build.xml jakarta-pages-source8.patch BETA DEBUG BEGIN: New:- Added patch: * jakarta-pages-source8.patch + allow building with source=1.8 BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jakarta-pages.spec ++++++ --- /var/tmp/diff_new_pack.iLxxgX/_old 2025-05-09 18:53:29.198391136 +0200 +++ /var/tmp/diff_new_pack.iLxxgX/_new 2025-05-09 18:53:29.202391302 +0200 @@ -1,7 +1,7 @@ # # spec file for package jakarta-pages # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,20 +17,22 @@ %global short_name pages +%global artifact_name jakarta.servlet.jsp-api Name: jakarta-%{short_name} Version: 4.0.0 Release: 0 Summary: Jakarta Server Pages -License: EPL-2.0 OR BSD-3-Clause +License: BSD-3-Clause OR EPL-2.0 Group: Development/Libraries/Java URL: http://eclipse.org/ee4j/jsp Source0: https://github.com/jakartaee/%{short_name}/archive/refs/tags/%{version}-RELEASE.tar.gz +Source1: %{name}-build.xml +Patch0: %{name}-source8.patch +BuildRequires: ant BuildRequires: fdupes -BuildRequires: maven-local -BuildRequires: mvn(jakarta.el:jakarta.el-api) -BuildRequires: mvn(jakarta.servlet:jakarta.servlet-api) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.eclipse.ee4j:project:pom:) +BuildRequires: jakarta-expression-language +BuildRequires: jakarta-servlet +BuildRequires: javapackages-local >= 6 BuildConflicts: java-devel < 17 BuildArch: noarch @@ -45,27 +47,35 @@ API documentation for %{name}. %prep -%autosetup -n %{short_name}-%{version}-RELEASE +%autosetup -n %{short_name}-%{version}-RELEASE -p1 -%pom_remove_plugin :maven-enforcer-plugin api -%pom_remove_plugin :maven-source-plugin api -%pom_remove_plugin :maven-javadoc-plugin api +cp %{SOURCE1} api/build.xml %build pushd api -%{mvn_build} -f +mkdir -p lib +build-jar-repository -s lib jakarta-expression-language jakarta-servlet +ant jar javadoc popd %install -pushd api -%mvn_install +# jar +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 api/target/%{artifact_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{artifact_name}.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +%{mvn_install_pom} api/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{artifact_name}.pom +%add_maven_depmap %{name}/%{artifact_name}.pom %{name}/%{artifact_name}.jar +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr api/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %fdupes %{buildroot}%{_javadocdir}/%{name} -popd -%files -f api/.mfiles +%files -f .mfiles %license {NOTICE,LICENSE}.md %doc README.md -%files javadoc -f api/.mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} %license {NOTICE,LICENSE}.md ++++++ jakarta-pages-build.xml ++++++ <?xml version="1.0" encoding="UTF-8"?> <project name="jakarta.servlet.jsp-api" default="package" basedir="."> <!-- ====================================================================== --> <!-- Build environment properties --> <!-- ====================================================================== --> <property name="project.groupId" value="jakarta.servlet.jsp"/> <property name="project.artifactId" value="jakarta.servlet.jsp-api"/> <property name="project.version" value="4.0.0"/> <property name="spec.version" value="4.0"/> <property name="compiler.release" value="8"/> <property name="compiler.source" value="1.${compiler.release}"/> <property name="compiler.target" value="${compiler.source}"/> <property name="build.finalName" value="${project.artifactId}-${project.version}"/> <property name="build.dir" value="target"/> <property name="build.outputDir" value="${build.dir}/classes"/> <property name="build.srcDir" value="src/main/java"/> <property name="build.resourceDir" value="src/main/java"/> <property name="reporting.outputDirectory" value="${build.dir}/site"/> <!-- ====================================================================== --> <!-- Defining classpaths --> <!-- ====================================================================== --> <path id="build.classpath"> <fileset dir="lib"> <include name="**/*.jar"/> </fileset> </path> <!-- ====================================================================== --> <!-- Cleaning up target --> <!-- ====================================================================== --> <target name="clean" description="Clean the output directory"> <delete dir="${build.dir}"/> </target> <!-- ====================================================================== --> <!-- Compilation target --> <!-- ====================================================================== --> <target name="compile" description="Compile the code"> <mkdir dir="${build.outputDir}"/> <mkdir dir="${build.outputDir}"/> <javac destdir="${build.outputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="${compiler.target}" verbose="false" fork="false" source="${compiler.source}"> <src> <pathelement location="${build.srcDir}"/> </src> <classpath> <path refid="build.classpath"/> </classpath> <exclude name="**/module-info.java"/> </javac> <!-- module-info.java built with source/target 9 --> <javac destdir="${build.outputDir}" nowarn="false" debug="true" encoding="utf-8" optimize="false" deprecation="true" release="9" verbose="false" fork="false"> <modulepath> <path refid="build.classpath"/> <pathelement location="${build.outputDir}"/> </modulepath> <src> <pathelement location="${build.srcDir}"/> </src> <include name="**/module-info.java"/> </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"> <include name="**/*.properties"/> </fileset> </copy> </target> <!-- ====================================================================== --> <!-- Javadoc target --> <!-- ====================================================================== --> <target name="javadoc" description="Generates the Javadoc of the application"> <javadoc sourcepath="${build.srcDir}" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" source="${compiler.source}" verbose="false" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" charset="ISO-8859-1" linksource="false" breakiterator="false"> <classpath refid="build.classpath"/> </javadoc> </target> <!-- ====================================================================== --> <!-- Package target --> <!-- ====================================================================== --> <target name="package" depends="compile" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" basedir="${build.outputDir}" excludes="**/package.html"> <manifest> <attribute name="Bundle-Description" value="Jakarta Server Pages ${spec.version}"/> <attribute name="Bundle-DocURL" value="https://www.eclipse.org"/> <attribute name="Bundle-License" value="https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt,https://www.gnu.org/software/classpath/license.html"/> <attribute name="Bundle-ManifestVersion" value="2"/> <attribute name="Bundle-Name" value="Jakarta Server Pages API"/> <attribute name="Bundle-SymbolicName" value="${project.artifactId}"/> <attribute name="Bundle-Vendor" value="Eclipse Foundation"/> <attribute name="Bundle-Version" value="${project.version}"/> <attribute name="Export-Package" value="jakarta.servlet.jsp.el;uses:="jakarta.el";version="${project.version}",jakarta.servlet.jsp.tagext;uses:="jakarta.servlet.jsp";version="${project.version}",jakarta.servlet.jsp;uses:="jakarta.el,jakarta.servlet,jakarta.servlet.http,jakarta.servlet.jsp.tagext";version="${project.version}""/> <attribute name="Extension-Name" value="jakarta.servlet.jsp"/> <attribute name="Implementation-Vendor" value="Eclipse Foundation"/> <attribute name="Implementation-Version" value="${project.version}"/> <attribute name="Import-Package" value="jakarta.el,jakarta.servlet.http,jakarta.servlet.jsp,jakarta.servlet.jsp.tagext,jakarta.servlet,java.io,java.lang,java.lang.invoke,java.lang.reflect,java.util"/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> <attribute name="Specification-Vendor" value="Eclipse Foundation"/> <attribute name="Specification-Version" value="${spec.version}"/> </manifest> </jar> </target> <!-- ====================================================================== --> <!-- A dummy target for the package named after the type it creates --> <!-- ====================================================================== --> <target name="jar" depends="package" description="Builds the jar for the application"/> </project> ++++++ jakarta-pages-source8.patch ++++++ --- a/api/src/main/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java 2025-05-09 07:26:46.579598463 +0200 +++ b/api/src/main/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java 2025-05-09 07:21:47.426242537 +0200 @@ -464,7 +464,7 @@ */ public static Map<String, Object> createPageScopeMap(PageContext pContext) { final PageContext context = pContext; - return new EnumeratedMap<>() { + return new EnumeratedMap<String, Object>() { @Override public Enumeration<String> enumerateKeys() { return context.getAttributeNamesInScope(PageContext.PAGE_SCOPE); @@ -497,7 +497,7 @@ */ public static Map<String, Object> createRequestScopeMap(PageContext pContext) { final PageContext context = pContext; - return new EnumeratedMap<>() { + return new EnumeratedMap<String, Object>() { @Override public Enumeration<String> enumerateKeys() { return context.getAttributeNamesInScope(PageContext.REQUEST_SCOPE); @@ -530,7 +530,7 @@ */ public static Map<String, Object> createSessionScopeMap(PageContext pContext) { final PageContext context = pContext; - return new EnumeratedMap<>() { + return new EnumeratedMap<String, Object>() { @Override public Enumeration<String> enumerateKeys() { return context.getAttributeNamesInScope(PageContext.SESSION_SCOPE); @@ -563,7 +563,7 @@ */ public static Map<String, Object> createApplicationScopeMap(PageContext pContext) { final PageContext context = pContext; - return new EnumeratedMap<>() { + return new EnumeratedMap<String, Object>() { @Override public Enumeration<String> enumerateKeys() { return context.getAttributeNamesInScope(PageContext.APPLICATION_SCOPE); @@ -596,7 +596,7 @@ */ public static Map<String, String> createParamMap(PageContext pContext) { final HttpServletRequest request = (HttpServletRequest) pContext.getRequest(); - return new EnumeratedMap<>() { + return new EnumeratedMap<String, String>() { @Override public Enumeration<String> enumerateKeys() { return request.getParameterNames(); @@ -629,7 +629,7 @@ */ public static Map<String, String[]> createParamsMap(PageContext pContext) { final HttpServletRequest request = (HttpServletRequest) pContext.getRequest(); - return new EnumeratedMap<>() { + return new EnumeratedMap<String, String[]>() { @Override public Enumeration<String> enumerateKeys() { return request.getParameterNames(); @@ -662,7 +662,7 @@ */ public static Map<String, String> createHeaderMap(PageContext pContext) { final HttpServletRequest request = (HttpServletRequest) pContext.getRequest(); - return new EnumeratedMap<>() { + return new EnumeratedMap<String, String>() { @Override public Enumeration<String> enumerateKeys() { return request.getHeaderNames(); @@ -695,7 +695,7 @@ */ public static Map<String, String[]> createHeadersMap(PageContext pContext) { final HttpServletRequest request = (HttpServletRequest) pContext.getRequest(); - return new EnumeratedMap<>() { + return new EnumeratedMap<String, String[]>() { @Override public Enumeration<String> enumerateKeys() { return request.getHeaderNames(); @@ -736,7 +736,7 @@ */ public static Map<String, String> createInitParamMap(PageContext pContext) { final ServletContext context = pContext.getServletContext(); - return new EnumeratedMap<>() { + return new EnumeratedMap<String, String>() { @Override public Enumeration<String> enumerateKeys() { return context.getInitParameterNames();
