From c49c9ec1478976da355534a4a616d6f1573d8816 Mon Sep 17 00:00:00 2001 From: qi4l Date: Tue, 11 Mar 2025 20:56:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20build.gradle=20=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E7=BA=A6=E6=9D=9FCC3=EF=BC=8CCC4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 18 +++++++++++++++--- gradle/libs.versions.toml | 2 -- src/main/java/com/qi4l/JYso/HTTPServer.java | 2 +- src/main/java/com/qi4l/JYso/LdapServer.java | 2 +- src/main/java/com/qi4l/JYso/RMIServer.java | 2 +- src/test/java/Main.java | 5 ----- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 4fd199c..22ca728 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { } repositories { - mavenLocal() + mavenCentral() maven { url = uri('https://repo.jenkins-ci.org/releases/') } @@ -65,8 +65,6 @@ dependencies { api libs.org.springframework.spring.test api libs.javax.servlet.javax.servlet.api api libs.com.mchange.c3p0 - api libs.commons.collections.commons.collections - api libs.org.apache.commons.commons.collections4 api libs.org.apache.tomcat.embed.tomcat.embed.core api libs.org.ow2.asm.asm api libs.com.unboundid.unboundid.ldapsdk @@ -91,6 +89,19 @@ dependencies { implementation files('libs/jai-core-1.1.3.jar') implementation files('libs/weblogic-server.jar') + constraints { + implementation('commons-collections:commons-collections') { + version { + strictly '3.2.1' + } + } + implementation('org.apache.commons:commons-collections4') { + version { + strictly '4.0' + } + } + } + implementation 'org.codehaus.castor:castor-xml:1.4.1' implementation 'com.cedarsoftware:json-io:4.9.1' implementation 'org.jyaml:jyaml:1.3' @@ -108,6 +119,7 @@ dependencies { compileOnly libs.org.apache.tomcat.tomcat.websocket } + group = 'org.example' version = '1.3.5' description = 'JYso' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 92e9c1e..2de1c0a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,6 @@ com-teradata-jdbc-terajdbc = "20.00.00.06" com-unboundid-unboundid-ldapsdk = "4.0.9" com-vaadin-vaadin-server = "7.7.14" commons-cli-commons-cli = "1.5.0" -commons-collections-commons-collections = "3.2.1" io-projectreactor-reactor-core = "3.4.26" io-undertow-undertow-core = "2.2.2.Final" io-undertow-undertow-servlet = "2.2.2.Final" @@ -80,7 +79,6 @@ com-teradata-jdbc-terajdbc = { module = "com.teradata.jdbc:terajdbc", version.re com-unboundid-unboundid-ldapsdk = { module = "com.unboundid:unboundid-ldapsdk", version.ref = "com-unboundid-unboundid-ldapsdk" } com-vaadin-vaadin-server = { module = "com.vaadin:vaadin-server", version.ref = "com-vaadin-vaadin-server" } commons-cli-commons-cli = { module = "commons-cli:commons-cli", version.ref = "commons-cli-commons-cli" } -commons-collections-commons-collections = { module = "commons-collections:commons-collections", version.ref = "commons-collections-commons-collections" } io-projectreactor-reactor-core = { module = "io.projectreactor:reactor-core", version.ref = "io-projectreactor-reactor-core" } io-undertow-undertow-core = { module = "io.undertow:undertow-core", version.ref = "io-undertow-undertow-core" } io-undertow-undertow-servlet = { module = "io.undertow:undertow-servlet", version.ref = "io-undertow-undertow-servlet" } diff --git a/src/main/java/com/qi4l/JYso/HTTPServer.java b/src/main/java/com/qi4l/JYso/HTTPServer.java index 8ddb9dd..8acb491 100644 --- a/src/main/java/com/qi4l/JYso/HTTPServer.java +++ b/src/main/java/com/qi4l/JYso/HTTPServer.java @@ -82,7 +82,7 @@ public class HTTPServer { httpServer.setExecutor(null); httpServer.start(); - System.out.println(ansi().render("@|green [+]|@ HTTP Server Start Listening on >>" + Config.httpPort + "...")); + System.out.println(ansi().render("@|green [+]|@ HTTP Server Start Listening on >> " + Config.httpPort + "...")); } private static void handleFileRequest(HttpExchange exchange) throws Exception { diff --git a/src/main/java/com/qi4l/JYso/LdapServer.java b/src/main/java/com/qi4l/JYso/LdapServer.java index cbf6ec4..2558764 100644 --- a/src/main/java/com/qi4l/JYso/LdapServer.java +++ b/src/main/java/com/qi4l/JYso/LdapServer.java @@ -68,7 +68,7 @@ public class LdapServer extends InMemoryOperationInterceptor { serverConfig.addInMemoryOperationInterceptor(new LdapServer()); InMemoryDirectoryServer ds = new InMemoryDirectoryServer(serverConfig); ds.startListening(); - System.out.println(ansi().render("@|green [+]|@ LDAP Server Start Listening on >>" + Config.ldapPort + "...")); + System.out.println(ansi().render("@|green [+]|@ LDAP Server Start Listening on >> " + Config.ldapPort + "...")); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/qi4l/JYso/RMIServer.java b/src/main/java/com/qi4l/JYso/RMIServer.java index a64d4a4..fc71f7a 100644 --- a/src/main/java/com/qi4l/JYso/RMIServer.java +++ b/src/main/java/com/qi4l/JYso/RMIServer.java @@ -56,7 +56,7 @@ public class RMIServer extends InMemoryOperationInterceptor implements Runnable String url = "http://" + ip + ":" + rmiPort; try { - System.out.println(ansi().render("@|green [+]|@ RMI Server Start Listening on >>" + rmiPort + "...")); + System.out.println(ansi().render("@|green [+]|@ RMI Server Start Listening on >> " + rmiPort + "...")); RMIServer c = new RMIServer(rmiPort, new URL(url)); c.run(); } catch (Exception e) { diff --git a/src/test/java/Main.java b/src/test/java/Main.java index aa2a814..4aa1e19 100644 --- a/src/test/java/Main.java +++ b/src/test/java/Main.java @@ -1,8 +1,3 @@ -import org.fusesource.jansi.Ansi; -import org.fusesource.jansi.AnsiConsole; - -import java.util.Random; - public class Main {