From 222f5045f1b8598fb936dd804c7bf2911d1e5033 Mon Sep 17 00:00:00 2001 From: panos-kakos Date: Mon, 25 Sep 2023 12:44:22 +0300 Subject: [PATCH 1/3] [JAVA-12183] Upgraded restx to latest version(1.0.0-rc3) and moved it to jdk9-and-above profile --- web-modules/restx/md.restx.json | 6 +++--- web-modules/restx/pom.xml | 5 ++--- web-modules/restx/src/main/java/restx/demo/AppModule.java | 8 ++++---- web-modules/restx/src/main/java/restx/demo/AppServer.java | 8 ++++---- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/web-modules/restx/md.restx.json b/web-modules/restx/md.restx.json index c87244001c..54a1b4e9f8 100644 --- a/web-modules/restx/md.restx.json +++ b/web-modules/restx/md.restx.json @@ -3,8 +3,8 @@ "packaging": "war", "properties": { - "java.version": "1.8", - "restx.version": "0.35-rc4" + "java.version": "17", + "restx.version": "1.0.0-rc3" }, "fragments": { "maven": [ @@ -24,7 +24,7 @@ "io.restx:restx-i18n-admin:${restx.version}", "io.restx:restx-stats-admin:${restx.version}", "io.restx:restx-servlet:${restx.version}", - "io.restx:restx-server-jetty8:${restx.version}!optional", + "io.restx:restx-server-jetty11:${restx.version}!optional", "io.restx:restx-apidocs:${restx.version}", "io.restx:restx-specs-admin:${restx.version}", "io.restx:restx-admin:${restx.version}", diff --git a/web-modules/restx/pom.xml b/web-modules/restx/pom.xml index 0e6cb3fa78..f75292a4a4 100644 --- a/web-modules/restx/pom.xml +++ b/web-modules/restx/pom.xml @@ -77,7 +77,7 @@ io.restx - restx-server-jetty8 + restx-server-jetty11 ${restx.version} true @@ -137,8 +137,7 @@ - 0.35-rc4 - 1.6.0 + 1.0.0-rc3 \ No newline at end of file diff --git a/web-modules/restx/src/main/java/restx/demo/AppModule.java b/web-modules/restx/src/main/java/restx/demo/AppModule.java index 26bc681481..b47f8b9aa8 100644 --- a/web-modules/restx/src/main/java/restx/demo/AppModule.java +++ b/web-modules/restx/src/main/java/restx/demo/AppModule.java @@ -3,13 +3,13 @@ package restx.demo; import restx.config.ConfigLoader; import restx.config.ConfigSupplier; import restx.factory.Provides; +import restx.security.*; +import restx.factory.Module; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableSet; -import restx.security.*; -import restx.factory.Module; -import restx.factory.Provides; + import javax.inject.Named; import java.nio.file.Paths; @@ -30,7 +30,7 @@ public class AppModule { @Provides public ConfigSupplier appConfigSupplier(ConfigLoader configLoader) { // Load settings.properties in restx.demo package as a set of config entries - return configLoader.fromResource("restx/demo/settings"); + return configLoader.fromResource("web-modules/restx/demo/settings"); } @Provides diff --git a/web-modules/restx/src/main/java/restx/demo/AppServer.java b/web-modules/restx/src/main/java/restx/demo/AppServer.java index d66aadac68..7275047e0b 100644 --- a/web-modules/restx/src/main/java/restx/demo/AppServer.java +++ b/web-modules/restx/src/main/java/restx/demo/AppServer.java @@ -2,7 +2,7 @@ package restx.demo; import com.google.common.base.Optional; import restx.server.WebServer; -import restx.server.Jetty8WebServer; +import restx.server.Jetty11WebServer; /** * This class can be used to run the app. @@ -12,12 +12,12 @@ import restx.server.Jetty8WebServer; * Reading the port from system env PORT makes it compatible with heroku. */ public class AppServer { - public static final String WEB_INF_LOCATION = "src/main/webapp/WEB-INF/web.xml"; - public static final String WEB_APP_LOCATION = "src/main/webapp"; + public static final String WEB_INF_LOCATION = "web-modules/restx/src/main/webapp/WEB-INF/web.xml"; + public static final String WEB_APP_LOCATION = "web-modules/restx/src/main/webapp"; public static void main(String[] args) throws Exception { int port = Integer.valueOf(Optional.fromNullable(System.getenv("PORT")).or("8080")); - WebServer server = new Jetty8WebServer(WEB_INF_LOCATION, WEB_APP_LOCATION, port, "0.0.0.0"); + WebServer server = new Jetty11WebServer(WEB_INF_LOCATION, WEB_APP_LOCATION, port, "0.0.0.0"); /* * load mode from system property if defined, or default to dev From 02b511075105e2ee902c726018f3401008927979 Mon Sep 17 00:00:00 2001 From: panos-kakos Date: Tue, 26 Sep 2023 08:20:55 +0300 Subject: [PATCH 2/3] [JAVA-12183] Moved restx module to jdk9-and-above profile --- pom.xml | 2 -- web-modules/pom.xml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 060f158888..00b5b88d47 100644 --- a/pom.xml +++ b/pom.xml @@ -361,7 +361,6 @@ muleesb web-modules/java-lite - web-modules/restx persistence-modules/deltaspike persistence-modules/hibernate-ogm persistence-modules/spring-data-cassandra-reactive @@ -534,7 +533,6 @@ lombok-modules/lombok-custom muleesb web-modules/java-lite - web-modules/restx persistence-modules/deltaspike persistence-modules/hibernate-ogm persistence-modules/spring-data-cassandra-reactive diff --git a/web-modules/pom.xml b/web-modules/pom.xml index 2dcec681ad..684283b546 100644 --- a/web-modules/pom.xml +++ b/web-modules/pom.xml @@ -31,7 +31,7 @@ ratpack resteasy - + restx spark-java struts-2 vraptor From 34dac9716eaecf03e47e88e6a2d33ceb76572560 Mon Sep 17 00:00:00 2001 From: panos-kakos Date: Sat, 14 Oct 2023 23:16:17 +0300 Subject: [PATCH 3/3] [JAVA-12183] Fixed server settings location --- web-modules/restx/src/main/java/restx/demo/AppServer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web-modules/restx/src/main/java/restx/demo/AppServer.java b/web-modules/restx/src/main/java/restx/demo/AppServer.java index 7275047e0b..089a22c9ae 100644 --- a/web-modules/restx/src/main/java/restx/demo/AppServer.java +++ b/web-modules/restx/src/main/java/restx/demo/AppServer.java @@ -12,8 +12,8 @@ import restx.server.Jetty11WebServer; * Reading the port from system env PORT makes it compatible with heroku. */ public class AppServer { - public static final String WEB_INF_LOCATION = "web-modules/restx/src/main/webapp/WEB-INF/web.xml"; - public static final String WEB_APP_LOCATION = "web-modules/restx/src/main/webapp"; + public static final String WEB_INF_LOCATION = "src/main/webapp/WEB-INF/web.xml"; + public static final String WEB_APP_LOCATION = "src/main/webapp"; public static void main(String[] args) throws Exception { int port = Integer.valueOf(Optional.fromNullable(System.getenv("PORT")).or("8080"));