Merge pull request #14831 from panos-kakos/JAVA-12183

[JAVA-12183] Upgraded restx to latest version(1.0.0-rc3) and moved it…

pom.xml

@@ -361,7 +361,6 @@
 
                 <module>muleesb</module>
                 <module>web-modules/java-lite</module>
-                <module>web-modules/restx</module>
                 <module>persistence-modules/deltaspike</module> <!-- delta spike it doesn't support yet the jakarta API-->
                 <module>persistence-modules/hibernate-ogm</module> <!-- hibernate-ogm wasn't updated because it doesn't support jakarta API -->
                 <module>persistence-modules/spring-data-cassandra-reactive</module> <!--JAVA-21844-->
@@ -534,7 +533,6 @@
                 <module>lombok-modules/lombok-custom</module>
                 <module>muleesb</module>
                 <module>web-modules/java-lite</module>
-                <module>web-modules/restx</module>
                 <module>persistence-modules/deltaspike</module> <!-- delta spike it doesn't support yet the jakarta API-->
                 <module>persistence-modules/hibernate-ogm</module> <!-- hibernate-ogm wasn't updated because it doesn't support jakarta API -->
                 <module>persistence-modules/spring-data-cassandra-reactive</module> <!--JAVA-21844-->

web-modules/pom.xml

@@ -31,7 +31,7 @@
         <!-- <module>raml-modules</module> --> <!-- Not a maven project -->
         <module>ratpack</module>
         <module>resteasy</module>
-        <!--<module>restx</module> Not upgradable to java-17 adding in default-second and  integration-lite-second profile that uses JDK 8 -->
+        <module>restx</module>
         <module>spark-java</module>
         <module>struts-2</module>
         <module>vraptor</module>

web-modules/restx/md.restx.json

@@ -3,8 +3,8 @@
     "packaging": "war",
 
     "properties": {
-        "java.version": "1.8",
+        "java.version": "17",
-        "restx.version": "0.35-rc4"
+        "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}",

web-modules/restx/pom.xml

@@ -77,7 +77,7 @@
         </dependency>
         <dependency>
             <groupId>io.restx</groupId>
-            <artifactId>restx-server-jetty8</artifactId>
+            <artifactId>restx-server-jetty11</artifactId>
             <version>${restx.version}</version>
             <optional>true</optional>
         </dependency>
@@ -137,8 +137,7 @@
     </build>
 
     <properties>
-        <restx.version>0.35-rc4</restx.version>
+        <restx.version>1.0.0-rc3</restx.version>
-        <assertj.version>1.6.0</assertj.version> <!-- restx requires such an old version -->
     </properties>
 
 </project>

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

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.
@@ -17,7 +17,7 @@ public class AppServer {
 
     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