Fixes #1020 - Upgrade XML bindings to com.sun.xml.bind v3.0.2

Signed-off-by: James Turnbull <[email protected]>
riemann · Jun 10, 2022 · 5591350 · 5591350
1 parent 7efcbee
commit 5591350
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pkg/deb/riemann b/pkg/deb/riemann
@@ -12,7 +12,7 @@ if [[ "$JAVA_VERSION" -le 18 ]]; then
  AGGRESSIVE_OPTS="-server -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseCompressedOops -XX:+CMSClassUnloadingEnabled"
 else
  AGGRESSIVE_OPTS="-server -XX:+CMSParallelRemarkEnabled -XX:+AggressiveOpts -XX:+UseCompressedOops -XX:+CMSClassUnloadingEnabled"
- EXTRA_JAVA_OPTIONS="$EXTRA_JAVA_OPTIONS --add-modules=java.xml.bind"
+ EXTRA_JAVA_OPTIONS="$EXTRA_JAVA_OPTIONS --add-modules=com.sun.xml.bind"
 fi
 
 usage()

diff --git a/pkg/rpm/riemann b/pkg/rpm/riemann
@@ -12,7 +12,7 @@ if [[ "$JAVA_VERSION" -le 18 ]]; then
  AGGRESSIVE_OPTS="-server -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseCompressedOops -XX:+CMSClassUnloadingEnabled"
 else
  AGGRESSIVE_OPTS="-server -XX:+CMSParallelRemarkEnabled -XX:+AggressiveOpts -XX:+UseCompressedOops -XX:+CMSClassUnloadingEnabled"
- EXTRA_JAVA_OPTIONS="$EXTRA_JAVA_OPTIONS --add-modules=java.xml.bind"
+ EXTRA_JAVA_OPTIONS="$EXTRA_JAVA_OPTIONS --add-modules=com.sun.xml.bind"
 fi
 
 usage()

diff --git a/project.clj b/project.clj
@@ -17,7 +17,7 @@
  [org.clojure/data.priority-map "0.0.10"]
  [org.clojure/java.classpath "0.3.0"]
  [org.slf4j/log4j-over-slf4j "1.7.32"]
- [javax.xml.bind/jaxb-api "2.4.0-b180830.0359"]
+ [com.sun.xml.bind/jaxb-ri "3.0.2" :extension "pom"]
  [ch.qos.logback/logback-classic "1.2.10"]
  [com.github.juise/logstash-logback-layout "1.0"]
  [net.logstash.logback/logstash-logback-encoder "6.4"]