Hello community,
here is the log from the commit of package java-11-openjdk for openSUSE:Factory
checked in at 2019-01-15 09:14:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-11-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-11-openjdk.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-11-openjdk"
Tue Jan 15 09:14:16 2019 rev:27 rq:664417 version:11.0.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-11-openjdk/java-11-openjdk.changes
2018-11-06 14:03:34.819516146 +0100
+++
/work/SRC/openSUSE:Factory/.java-11-openjdk.new.28833/java-11-openjdk.changes
2019-01-15 09:14:40.362330441 +0100
@@ -1,0 +2,18 @@
+Thu Jan 10 12:22:24 UTC 2019 - Fridrich Strba <[email protected]>
+
+- Added patch:
+ * loadAssistiveTechnologies.patch
+ + Do not crash the whole JVM if assistive technologies crash
+
+-------------------------------------------------------------------
+Thu Jan 10 12:13:56 UTC 2019 - Fridrich Strba <[email protected]>
+
+- Do not resolve by default the added JavaEE modules (fixes
+ bsc#1120431)
+
+-------------------------------------------------------------------
+Thu Oct 25 19:32:05 UTC 2018 - Antoine Belvire <[email protected]>
+
+- Remove hardcoded Java version in jconsole desktop file.
+
+-------------------------------------------------------------------
New:
----
loadAssistiveTechnologies.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-11-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.fQkLcK/_old 2019-01-15 09:14:42.390328559 +0100
+++ /var/tmp/diff_new_pack.fQkLcK/_new 2019-01-15 09:14:42.394328555 +0100
@@ -1,7 +1,7 @@
#
# spec file for package java
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -209,6 +209,8 @@
Patch15: system-pcsclite.patch
Patch16: missing-return.patch
#
+Patch20: loadAssistiveTechnologies.patch
+#
# OpenJDK specific patches
#
Patch100: s390-java-opts.patch
@@ -484,6 +486,8 @@
%patch16 -p1
+%patch20 -p1
+
# s390 build fixes
%ifarch s390
@@ -536,7 +540,7 @@
for file in %{SOURCE11} ; do
OUTPUT_FILE=`basename $file | sed -e s:\.in$::g`
sed -e s:@JAVA_HOME@:%{_jvmdir}/%{sdkdir}:g $file > $OUTPUT_FILE
- sed -i -e s:@VERSION@:%{javaver}.%{_arch}:g $OUTPUT_FILE
+ sed -i -e s:@VERSION@:%{javaver}:g $OUTPUT_FILE
done
%build
@@ -680,7 +684,7 @@
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
+$JAVA_HOME/bin/jmod create --do-not-resolve-by-default
--class-path=build:activation/src/main/resources
$JAVA_HOME/../jmods/java.activation.jmod
popd
# Merge the java activation framework into the JDK
source $JAVA_HOME/release; export MODULES
@@ -694,7 +698,7 @@
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
+$JAVA_HOME/bin/jmod create --do-not-resolve-by-default
--class-path=build:jaxb-api/src/main/resources
$JAVA_HOME/../jmods/java.xml.bind.jmod
popd
# Merge java.xml.bind into the JDK
source $JAVA_HOME/release; export MODULES
@@ -708,7 +712,7 @@
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
+$JAVA_HOME/bin/jmod create --do-not-resolve-by-default --class-path=build
$JAVA_HOME/../jmods/java.xml.soap.jmod
popd
# Merge java.xml.soap into the JDK
source $JAVA_HOME/release; export MODULES
@@ -722,7 +726,7 @@
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
+$JAVA_HOME/bin/jmod create --do-not-resolve-by-default --class-path=build
$JAVA_HOME/../jmods/java.annotation.jmod
popd
# Merge java.annotation into the JDK
source $JAVA_HOME/release; export MODULES
@@ -736,7 +740,7 @@
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
+$JAVA_HOME/bin/jmod create --do-not-resolve-by-default
--class-path=build:api/src/main/resources $JAVA_HOME/../jmods/java.xml.ws.jmod
popd
# Merge java.xml.ws into the JDK
source $JAVA_HOME/release; export MODULES
@@ -750,7 +754,7 @@
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
+$JAVA_HOME/bin/jmod create --do-not-resolve-by-default
--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
@@ -764,7 +768,7 @@
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
+$JAVA_HOME/bin/jmod create --do-not-resolve-by-default --class-path=build
$JAVA_HOME/../jmods/org.jvnet.staxex.jmod
popd
# Merge org.jvnet.staxex into the JDK
source $JAVA_HOME/release; export MODULES
@@ -778,7 +782,7 @@
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
+$JAVA_HOME/bin/jmod create --do-not-resolve-by-default --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
@@ -792,7 +796,7 @@
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
+$JAVA_HOME/bin/jmod create --do-not-resolve-by-default --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
@@ -806,7 +810,7 @@
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
+$JAVA_HOME/bin/jmod create --do-not-resolve-by-default
--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
++++++ jconsole.desktop.in ++++++
--- /var/tmp/diff_new_pack.fQkLcK/_old 2019-01-15 09:14:42.554328407 +0100
+++ /var/tmp/diff_new_pack.fQkLcK/_new 2019-01-15 09:14:42.554328407 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
-Name=OpenJDK 8 Monitoring & Management Console
+Name=OpenJDK @VERSION@ Monitoring & Management Console
GenericName=OpenJDK Monitoring & Management Console
-Comment=Monitor and manage OpenJDK applications for @VERSION@
+Comment=Monitor and manage OpenJDK applications
Exec=@JAVA_HOME@/bin/jconsole
Icon=java
Terminal=false
++++++ loadAssistiveTechnologies.patch ++++++
--- openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java
+++ openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java
@@ -883,9 +883,13 @@
return null;
}
});
if (!GraphicsEnvironment.isHeadless()) {
- loadAssistiveTechnologies();
+ try {
+ loadAssistiveTechnologies();
+ } catch (AWTError error) {
+ // ignore silently
+ }
}
}
return toolkit;
}
