commit java-11-openjdk for openSUSE:Factory
Hello community, here is the log from the commit of package java-11-openjdk for openSUSE:Factory checked in at 2018-11-06 14:03:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-11-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-11-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-11-openjdk" Tue Nov 6 14:03:32 2018 rev:26 rq:644168 version:11.0.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/java-11-openjdk/java-11-openjdk.changes 2018-10-23 20:35:09.676919149 +0200 +++ /work/SRC/openSUSE:Factory/.java-11-openjdk.new/java-11-openjdk.changes 2018-11-06 14:03:34.819516146 +0100 @@ -1,0 +2,13 @@ +Tue Oct 23 10:31:57 UTC 2018 - Fridrich Strba <fstrba@suse.com> + +- Merge into the JDK following modules from github.com/javaee: + * com.sum.xml.fastinfoset + * org.jvnet.staxex + * com.sun.istack.runtime + * com.sun.xml.txw2 + * com.sun.xml.bind + + This provides a default implementation of JAXB-API that + existed in JDK before Java 11 and that some applications + depend on. + +------------------------------------------------------------------- New: ---- jaxb-istack-commons-3.0.7-RELEASE.tar.gz jaxb-v2-2.3.1.tar.gz metro-fi-1.2.15-RELEASE.tar.gz metro-stax-ex-1.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-11-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.Hkut58/_old 2018-11-06 14:03:40.351508933 +0100 +++ /var/tmp/diff_new_pack.Hkut58/_new 2018-11-06 14:03:40.355508928 +0100 @@ -52,6 +52,14 @@ %global java_annotation_tag 1.3.2 %global java_xml_ws_repository jax-ws-spec %global java_xml_ws_tag 2.4.0 +%global com_sun_xml_fastinfoset_repository metro-fi +%global com_sun_xml_fastinfoset_tag 1.2.15-RELEASE +%global org_jvnet_staxex_repository metro-stax-ex +%global org_jvnet_staxex_tag 1.8 +%global com_sun_istack_runtime_repository jaxb-istack-commons +%global com_sun_istack_runtime_tag 3.0.7-RELEASE +%global jaxb_ri_repository jaxb-v2 +%global jaxb_ri_tag 2.3.1 # priority must be 6 digits in total %global priority 2105 %global javaver %{featurever} @@ -107,12 +115,12 @@ %endif %global with_pulseaudio 1 %bcond_with zero -%bcond_with aot %if ! %{with zero} %ifarch x86_64 %{aarch64} %global _with_aot 1 %endif %endif +%bcond_with aot %if ! %{with zero} %global with_systemtap 1 %else @@ -167,6 +175,14 @@ Source23: %{java_annotation_repository}-%{java_annotation_tag}.tar.gz # https://codeload.github.com/javaee/%{java_xml_ws_repository}/tar.gz/%{java_xml_ws_tag} Source24: %{java_xml_ws_repository}-%{java_xml_ws_tag}.tar.gz +# https://codeload.github.com/javaee/%{com_sun_xml_fastinfoset_repository}/tar.gz/%{com_sun_xml_fastinfoset_tag} +Source25: %{com_sun_xml_fastinfoset_repository}-%{com_sun_xml_fastinfoset_tag}.tar.gz +# https://codeload.github.com/javaee/%{org_jvnet_staxex_repository}/tar.gz/%{org_jvnet_staxex_tag} +Source26: %{org_jvnet_staxex_repository}-%{org_jvnet_staxex_tag}.tar.gz +# https://codeload.github.com/javaee/%{com_sun_istack_runtime_repository}/tar.gz/%{com_sun_istack_runtime_tag} +Source27: %{com_sun_istack_runtime_repository}-%{com_sun_istack_runtime_tag}.tar.gz +# https://codeload.github.com/javaee/%{jaxb_ri_repository}/tar.gz/%{jaxb_ri_tag} +Source28: %{jaxb_ri_repository}-%{jaxb_ri_tag}.tar.gz # Fresh config.guess and config.sub files # wget -O config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess...' Source100: config.guess @@ -432,6 +448,10 @@ %setup -q -D -n %{hg_repository}-%{hg_revision} -T -a 22 %setup -q -D -n %{hg_repository}-%{hg_revision} -T -a 23 %setup -q -D -n %{hg_repository}-%{hg_revision} -T -a 24 +%setup -q -D -n %{hg_repository}-%{hg_revision} -T -a 25 +%setup -q -D -n %{hg_repository}-%{hg_revision} -T -a 26 +%setup -q -D -n %{hg_repository}-%{hg_revision} -T -a 27 +%setup -q -D -n %{hg_repository}-%{hg_revision} -T -a 28 # Replace config.sub and config.guess with fresh versions cp %{SOURCE100} make/autoconf/build-aux/ @@ -657,6 +677,7 @@ # Build the java.activation framework pushd %{java_activation_repository}-%{java_activation_tag} +if [ -e build ]; then rm -rf build; fi mkdir -p build $JAVA_HOME/bin/javac -d build `find activation -name \*.java | xargs` $JAVA_HOME/bin/jmod create --class-path=build:activation/src/main/resources $JAVA_HOME/../jmods/java.activation.jmod @@ -670,6 +691,7 @@ # Build the java.xml.bind pushd %{java_xml_bind_repository}-%{java_xml_bind_tag} +if [ -e build ]; then rm -rf build; fi mkdir -p build $JAVA_HOME/bin/javac -d build `find jaxb-api/src/main/java/ -name \*.java | xargs` $JAVA_HOME/bin/jmod create --class-path=build:jaxb-api/src/main/resources $JAVA_HOME/../jmods/java.xml.bind.jmod @@ -683,6 +705,7 @@ # Build the java.xml.soap pushd %{java_xml_soap_repository}-%{java_xml_soap_tag} +if [ -e build ]; then rm -rf build; fi mkdir -p build $JAVA_HOME/bin/javac -d build `find src/main/ -name \*.java | xargs` $JAVA_HOME/bin/jmod create --class-path=build $JAVA_HOME/../jmods/java.xml.soap.jmod @@ -696,6 +719,7 @@ # Build the java.annotation pushd %{java_annotation_repository}-%{java_annotation_tag} +if [ -e build ]; then rm -rf build; fi mkdir -p build $JAVA_HOME/bin/javac -d build `find src/main/java -name \*.java | xargs` $JAVA_HOME/bin/jmod create --class-path=build $JAVA_HOME/../jmods/java.annotation.jmod @@ -709,6 +733,7 @@ # Build the java.xml.ws pushd %{java_xml_ws_repository}-%{java_xml_ws_tag} +if [ -e build ]; then rm -rf build; fi mkdir -p build $JAVA_HOME/bin/javac -d build `find api/src/main -name \*.java | xargs` $JAVA_HOME/bin/jmod create --class-path=build:api/src/main/resources $JAVA_HOME/../jmods/java.xml.ws.jmod @@ -719,6 +744,76 @@ cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/ rm -rf $JAVA_HOME/../newjdk +# Build the com.sum.xml.fastinfoset + +pushd %{com_sun_xml_fastinfoset_repository}-%{com_sun_xml_fastinfoset_tag} +if [ -e build ]; then rm -rf build; fi +mkdir -p build +$JAVA_HOME/bin/javac -d build `find code/fastinfoset/src/main/java -name \*.java | xargs` +$JAVA_HOME/bin/jmod create --class-path=build:code/fastinfoset/src/main/resources $JAVA_HOME/../jmods/com.sun.xml.fastinfoset.jmod +popd +# Merge com.sun.xml.fastinfoset into the JDK +source $JAVA_HOME/release; export MODULES +$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules "com.sun.xml.fastinfoset,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk +cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/ +rm -rf $JAVA_HOME/../newjdk + +# Build the org.jvnet.staxex + +pushd %{org_jvnet_staxex_repository}-%{org_jvnet_staxex_tag} +if [ -e build ]; then rm -rf build; fi +mkdir -p build +$JAVA_HOME/bin/javac -d build `find stax-ex/src/java -name \*.java | xargs` +$JAVA_HOME/bin/jmod create --class-path=build $JAVA_HOME/../jmods/org.jvnet.staxex.jmod +popd +# Merge org.jvnet.staxex into the JDK +source $JAVA_HOME/release; export MODULES +$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules "org.jvnet.staxex,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk +cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/ +rm -rf $JAVA_HOME/../newjdk + +# Build the com.sun.istack.runtime + +pushd %{com_sun_istack_runtime_repository}-%{com_sun_istack_runtime_tag} +if [ -e build ]; then rm -rf build; fi +mkdir -p build +$JAVA_HOME/bin/javac -d build `find istack-commons/runtime/src/main/java -name \*.java | xargs` +$JAVA_HOME/bin/jmod create --class-path=build $JAVA_HOME/../jmods/com.sun.istack.runtime.jmod +popd +# Merge com.sun.istack into the JDK +source $JAVA_HOME/release; export MODULES +$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules "com.sun.istack.runtime,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk +cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/ +rm -rf $JAVA_HOME/../newjdk + +# Build the com.sun.xml.txw2 + +pushd %{jaxb_ri_repository}-%{jaxb_ri_tag} +if [ -e build ]; then rm -rf build; fi +mkdir -p build +$JAVA_HOME/bin/javac -d build `find jaxb-ri/txw/runtime/src/main/java -name \*.java | xargs` +$JAVA_HOME/bin/jmod create --class-path=build $JAVA_HOME/../jmods/com.sun.xml.txw2.jmod +popd +# Merge org.jvnet.staxex into the JDK +source $JAVA_HOME/release; export MODULES +$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules "com.sun.xml.txw2,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk +cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/ +rm -rf $JAVA_HOME/../newjdk + +# Build the com.sun.xml.bind + +pushd %{jaxb_ri_repository}-%{jaxb_ri_tag} +if [ -e build ]; then rm -rf build; fi +mkdir -p build +$JAVA_HOME/bin/javac -d build `find jaxb-ri/runtime/impl/src/main/java -name \*.java | xargs` +$JAVA_HOME/bin/jmod create --class-path=build:jaxb-ri/runtime/impl/src/main/resources $JAVA_HOME/../jmods/com.sun.xml.bind.jmod +popd +# Merge org.jvnet.staxex into the JDK +source $JAVA_HOME/release; export MODULES +$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules "com.sun.xml.bind,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk +cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/ +rm -rf $JAVA_HOME/../newjdk + %endif # add_back_javaee_modules # cacerts are generated in runtime in openSUSE
participants (1)
-
root