Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package glassfish-jaxb-api for openSUSE:Factory checked in at 2022-03-18 16:42:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glassfish-jaxb-api (Old) and /work/SRC/openSUSE:Factory/.glassfish-jaxb-api.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glassfish-jaxb-api" Fri Mar 18 16:42:43 2022 rev:4 rq:962608 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/glassfish-jaxb-api/glassfish-jaxb-api.changes 2022-03-11 11:43:29.822757724 +0100 +++ /work/SRC/openSUSE:Factory/.glassfish-jaxb-api.new.25692/glassfish-jaxb-api.changes 2022-03-18 16:43:02.889220500 +0100 @@ -1,0 +2,13 @@ +Fri Mar 18 05:54:50 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Install the jar directly to the /usr/share/java as + glassfish-jaxb-api.jar + +------------------------------------------------------------------- +Thu Mar 17 06:55:49 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Rewrite to build using ant, since this package might be a + dependency of many once he JavaEE modules are not part of our + OpenJDK build. + +------------------------------------------------------------------- New: ---- glassfish-jaxb-api-build.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glassfish-jaxb-api.spec ++++++ --- /var/tmp/diff_new_pack.GG5oUY/_old 2022-03-18 16:43:03.353220833 +0100 +++ /var/tmp/diff_new_pack.GG5oUY/_new 2022-03-18 16:43:03.357220835 +0100 @@ -17,6 +17,7 @@ %global oname jaxb-spec +%global bundle jaxb-api Name: glassfish-jaxb-api Version: 2.4.0 Release: 0 @@ -25,14 +26,14 @@ Group: Development/Libraries/Java URL: https://jaxb.java.net/ Source0: https://github.com/javaee/%{oname}/archive/%{version}.tar.gz +Source1: %{name}-build.xml +BuildRequires: ant BuildRequires: fdupes +BuildRequires: glassfish-activation-api BuildRequires: java-devel >= 9 -BuildRequires: maven-local +BuildRequires: javapackages-local BuildRequires: unzip -BuildRequires: mvn(javax.activation:javax.activation-api) -BuildRequires: mvn(net.java:jvnet-parent:pom:) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +Requires: mvn(javax.activation:javax.activation-api) BuildArch: noarch %description @@ -49,6 +50,7 @@ %prep %setup -q -n %{oname}-%{version} +cp %{SOURCE1} jaxb-api/build.xml %pom_disable_module jaxb-api-test @@ -60,22 +62,43 @@ %pom_remove_plugin :cobertura-maven-plugin jaxb-api %pom_remove_plugin :maven-dependency-plugin jaxb-api +%pom_remove_parent jaxb-api +%pom_xpath_inject pom:project " + <groupId>javax.xml.bind</groupId> + <version>%{version}</version>" jaxb-api + %pom_xpath_inject "pom:plugin[pom:artifactId = 'maven-javadoc-plugin']/pom:configuration" " <sourceFileExcludes> <exclude>module-info.java</exclude> </sourceFileExcludes>" jaxb-api %build -%{mvn_build} -f -- -Dsource=8 +pushd jaxb-api +mkdir -p lib +build-jar-repository -s lib glassfish-activation-api +%{ant} jar javadoc +popd %install -%mvn_install +# jar +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 %{bundle}/target/%{bundle}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar + +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -pm 644 %{bundle}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{name}.jar + +# javadoc +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -r %{bundle}/target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %license LICENSE.txt -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} %license LICENSE.txt %changelog ++++++ glassfish-jaxb-api-build.xml ++++++ <?xml version="1.0" encoding="UTF-8"?> <project name="jaxb-api" default="package" basedir="."> <!-- ====================================================================== --> <!-- Build environment properties --> <!-- ====================================================================== --> <property name="project.groupId" value="javax.xml.bind"/> <property name="project.artifactId" value="jaxb-api"/> <property name="project.version" value="2.4.0"/> <property name="compiler.source" value="1.8"/> <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.outputDir.Java9" value="${build.outputDir}/META-INF/versions/9"/> <property name="build.srcDir" value="src/main/java"/> <property name="build.srcDir.Java9" value="src/main/mr-jar"/> <property name="build.resourceDir" value="src/main/resources"/> <property name="reporting.outputDirectory" value="${build.dir}/site"/> <!-- ====================================================================== --> <!-- Defining classpaths --> <!-- ====================================================================== --> <path id="build.classpath"> <fileset dir="lib"> <include name="**/*"/> </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}"/> <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> <exclude name="**/module-info.java"/> <classpath refid="build.classpath"/> </javac> <!-- Build Multi-Release classes for Java 9 --> <mkdir dir="${build.outputDir.Java9}"/> <javac destdir="${build.outputDir.Java9}" nowarn="false" debug="true" optimize="false" deprecation="true" target="${compiler.target}" verbose="false" fork="false" source="${compiler.source}"> <src> <pathelement location="${build.srcDir.Java9}"/> </src> <classpath> <path refid="build.classpath"/> <pathelement location="${build.outputDir}"/> </classpath> </javac> <!-- Build the module-info.jar file --> <javac destdir="${build.outputDir}" nowarn="false" debug="true" encoding="utf-8" optimize="false" deprecation="true" target="9" verbose="false" fork="false" source="9"> <src> <pathelement location="${build.srcDir.Java9}"/> <pathelement location="${build.srcDir}"/> </src> <include name="**/module-info.java"/> <modulepath> <path refid="build.classpath"/> <pathelement location="${build.outputDir.Java9}"/> <pathelement location="${build.outputDir}"/> </modulepath> </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"/> </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="JAXB (JSR 222) API"/> <attribute name="Bundle-DocURL" value="http://www.oracle.com/"/> <attribute name="Bundle-License" value="https://oss.oracle.com/licenses/CDDL+GPL-1.1,https://oss.oracle.com/licenses/CDDL+GPL-1.1"/> <attribute name="Bundle-ManifestVersion" value="2"/> <attribute name="Bundle-Name" value="${project.artifactId}"/> <attribute name="Bundle-SymbolicName" value="${project.artifactId}"/> <attribute name="Bundle-Vendor" value="Oracle Corporation"/> <attribute name="Bundle-Version" value="${project.version}"/> <attribute name="DynamicImport-Package" value="org.glassfish.hk2.osgiresourcelocator"/> <attribute name="Export-Package" value="javax.xml.bind.annotation.adapters;version="2.3",javax.xml.bind.annotation;version="2.3";uses:="javax.xml.bind,javax.xml.parsers,javax.xml.transform,javax.xml.transform.dom,org.w3c.dom",javax.xml.bind.attachment;version="2.3";uses:="javax.activation",javax.xml.bind.helpers;version="2.3";uses:="javax.xml.bind,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.stream,javax.xml.transform,javax.xml.validation,org.w3c.dom,org.xml.sax",javax.xml.bind.util;version="2.3";uses:="javax.xml.bind,javax.xml.transform.sax",javax.xml.bind;version="2.3";uses:="javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.namespace,javax.xml.stream,javax.xml.transform,javax.xml.validation,org.w3c.dom,org.xml.sax""/> <attribute name="Extension-Name" value="${project.groupId}"/> <attribute name="Implementation-Vendor-Id" value="org.glassfish"/> <attribute name="Implementation-Vendor" value="Oracle Corporation"/> <attribute name="Implementation-Version" value="2.3.0"/> <attribute name="Import-Package" value="javax.activation,javax.xml.bind.annotation.adapters;version="[2.3,3)",javax.xml.bind.annotation;version="[2.3,3)",javax.xml.bind.attachment;version="[2.3,3)",javax.xml.bind.helpers;version="[2.3,3)",javax.xml.bind.util;version="[2.3,3)",javax.xml.bind;version="[2.3,3)",javax.xml.datatype,javax.xml.namespace,javax.xml.parsers,javax.xml.stream,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stream,javax.xml.validation,org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers"/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> <attribute name="Multi-Release" value="true"/> <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))""/> <attribute name="Specification-Title" value="${project.artifactId}"/> <attribute name="Specification-Vendor" value="Oracle Corporation"/> <attribute name="Specification-Version" value="${project.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>
