From 025d40ab804a5bed814ce36a41416016ce7d86a8 Mon Sep 17 00:00:00 2001
From: sunrise <575563079@qq.com>
Date: Mon, 19 Sep 2022 16:04:02 +0800
Subject: [PATCH] update to work with jdk11

---
 build.gradle                                  | 42 ++++++++++++-------
 sphinx4-core/build.gradle                     | 14 ++++---
 .../sphinx/fst/sequitur/SequiturImport.java   | 14 +++----
 sphinx4-samples/build.gradle                  |  6 +--
 4 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3f7527329..fc35be37d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,20 +14,9 @@ allprojects() {
 
 subprojects() {
     apply plugin: 'java'
-    apply plugin: 'maven'
-    
-    uploadArchives {
-        repositories {
-            mavenDeployer {
-                repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                    authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-                }
-                snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-                    authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-                }
-            }
-        }
-    }
+    apply plugin: 'maven-publish'
+
+
     
     repositories() {
          mavenCentral()
@@ -35,8 +24,8 @@ subprojects() {
 
     compileJava.options.encoding = 'UTF-8'
     javadoc.options.encoding = 'UTF-8'
-    sourceCompatibility = 1.7
-    targetCompatibility = 1.7
+    sourceCompatibility = 11
+    targetCompatibility = 11
 
     task javadocJar(type: Jar) {
         classifier = 'javadoc'
@@ -48,5 +37,26 @@ subprojects() {
         from sourceSets.main.allSource
     }
 
+    publishing {
+        repositories {
+            maven {
+                url = uri("${rootProject.projectDir}/maven-repo")
+            }
+        }
+    }
+
+//    uploadArchives {
+//        repositories {
+//            mavenDeployer {
+//                repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+//                    authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
+//                }
+//                snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+//                    authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
+//                }
+//            }
+//        }
+//    }
+
     artifacts.archives packageSources, javadocJar
 }
diff --git a/sphinx4-core/build.gradle b/sphinx4-core/build.gradle
index 134f22589..d5c447aa5 100644
--- a/sphinx4-core/build.gradle
+++ b/sphinx4-core/build.gradle
@@ -1,12 +1,14 @@
 description = 'Sphinx4 core'
 
 dependencies {
-    compile project(':sphinx4-data')
-
-    compile group: 'org.apache.commons', name: 'commons-math3', version:'3.2'
-
-    testCompile group: 'org.testng', name: 'testng', version:'6.8.8'
-    testCompile group: 'org.hamcrest', name: 'hamcrest-library', version:'1.3'
+    implementation project(':sphinx4-data')
+    implementation('org.apache.commons:commons-math3:3.6.1')
+    // xml lib was removed from jdk11
+    implementation("jakarta.xml.bind:jakarta.xml.bind-api:4.0.0")
+    implementation("com.sun.xml.bind:jaxb-impl:4.0.0")
+
+    testImplementation("org.testng:testing:7.6.1")
+    testImplementation('org.hamcrest:hamcrest-library:2.2')
 }
 
 test.useTestNG()
diff --git a/sphinx4-core/src/main/java/edu/cmu/sphinx/fst/sequitur/SequiturImport.java b/sphinx4-core/src/main/java/edu/cmu/sphinx/fst/sequitur/SequiturImport.java
index eef3f1d13..2208eac9a 100644
--- a/sphinx4-core/src/main/java/edu/cmu/sphinx/fst/sequitur/SequiturImport.java
+++ b/sphinx4-core/src/main/java/edu/cmu/sphinx/fst/sequitur/SequiturImport.java
@@ -21,13 +21,13 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import edu.cmu.sphinx.fst.Fst;
 import edu.cmu.sphinx.fst.semiring.Semiring;
diff --git a/sphinx4-samples/build.gradle b/sphinx4-samples/build.gradle
index 0cfb75500..e054d0b97 100644
--- a/sphinx4-samples/build.gradle
+++ b/sphinx4-samples/build.gradle
@@ -2,11 +2,11 @@
 description = 'Sphinx4 demo applications'
 
 dependencies {
-    compile project(':sphinx4-core')
-    compile project(':sphinx4-data')
+    implementation project(':sphinx4-core')
+    implementation project(':sphinx4-data')
 }
 
 jar {
-    from configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    from configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
 }
     
\ No newline at end of file