samples setup look much easier

Author: hendrikebbers

http-client/client-java/src/main/java/module-info.java

@@ -2,4 +2,5 @@
 
     requires dev.rico.samples.http.common;
     requires dev.rico.client;
+
 }

http-client/client-javafx/pom.xml

@@ -39,9 +39,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.zenjava</groupId>
+                <groupId>org.openjfx</groupId>
                 <artifactId>javafx-maven-plugin</artifactId>
-                <version>8.7.0</version>
+                <version>0.0.4</version>
                 <configuration>
                     <mainClass>dev.rico.samples.http.client.RestClient</mainClass>
                 </configuration>

http-client/common/src/main/java/module-info.java

@@ -1,4 +1,6 @@
 module dev.rico.samples.http.common {
+
     exports dev.rico.samples.http.common;
     opens dev.rico.samples.http.common;
+
 }

http-client/server-spring/src/main/java/module-info.java

@@ -1,10 +1,11 @@
 module dev.rico.samples.http.server.spring {
 
+    opens dev.rico.samples.http.server;
+
     requires dev.rico.samples.http.common;
     requires dev.rico.server.spring;
     requires spring.boot;
     requires spring.web;
     requires com.fasterxml.jackson.databind;
 
-    opens dev.rico.samples.http.server;
 }

pom.xml

@@ -31,7 +31,6 @@
     </repositories>
 
     <modules>
-        <module>servlet-fake</module>
         <module>todo-list</module>
         <module>http-client</module>
         <module>rest-security</module>

rest-security/server-spring/pom.xml

@@ -18,31 +18,11 @@
             <groupId>dev.rico</groupId>
             <artifactId>rico-security-server-spring</artifactId>
             <version>${rico.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>dev.rico</groupId>
-            <artifactId>rico-server-spring</artifactId>
-            <version>${rico.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <version>2.2.6.RELEASE</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.30</version>
-        </dependency>
     </dependencies>
 </project>

rest-security/server-spring/src/main/java/module-info.java

@@ -1,13 +1,11 @@
 module dev.rico.samples.simple.security.server.spring {
 
-    exports dev.rico.samples.security.server;
     opens dev.rico.samples.security.server;
 
     requires org.slf4j;
     requires spring.web;
     requires spring.beans;
     requires spring.boot;
     requires dev.rico.security.server.spring;
-    requires dev.rico.server.spring;
     requires com.fasterxml.jackson.databind;
 }

servlet-fake/pom.xml

@@ -29,19 +29,11 @@
             <artifactId>slf4j-simple</artifactId>
             <version>1.7.25</version>
         </dependency>
-
-
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-controls</artifactId>
-            <version>11.0.2</version>
-        </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-fxml</artifactId>
             <version>11.0.2</version>
         </dependency>
-
     </dependencies>
 
     <build>

servlet-fake/src/main/java/module-info.java

@@ -1,7 +1,6 @@
 module todo.list.client.javafx {
-    exports dev.rico.samples.todo.client;
-    opens dev.rico.samples.todo.client;
 
+    opens dev.rico.samples.todo.client;
 
     requires dev.rico.samples.todolist.common;
     requires dev.rico.remoting.client.javafx;

todo-list/client-javafx/pom.xml

@@ -1,6 +1,7 @@
 module dev.rico.samples.todolist.common {
-    exports dev.rico.samples.todo;
+
     opens dev.rico.samples.todo;
+    exports dev.rico.samples.todo;
 
     requires dev.rico.remoting.common;
 }

todo-list/client-javafx/src/main/java/module-info.java

@@ -25,15 +25,14 @@
             <version>${rico.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-            <scope>compile</scope>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>1.3.5</version>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <version>1.0</version>
         </dependency>
     </dependencies>
 </project>

todo-list/common/src/main/java/module-info.java

@@ -1,14 +1,12 @@
 module dev.rico.samples.todolist.server {
+
+    opens dev.rico.samples.todo.server;
     exports dev.rico.samples.todo.server;
 
     requires dev.rico.samples.todolist.common;
 
-    requires javax.inject;
+    requires jakarta.inject.api;
     requires java.annotation;
-
-    requires dev.rico.core;
     requires dev.rico.remoting.server;
-    requires dev.rico.remoting.common;
 
-    opens dev.rico.samples.todo.server to dev.rico.core;
 }

todo-list/server-base/pom.xml

@@ -16,7 +16,6 @@
  */
 package dev.rico.samples.todo.server.spring;
 
-
 import dev.rico.remoting.server.spring.EnableRemoting;
 import dev.rico.server.spring.RicoApplication;
 import org.springframework.boot.SpringApplication;

todo-list/server-base/src/main/java/module-info.java

@@ -8,5 +8,4 @@
     requires spring.boot;
 
     opens dev.rico.samples.todo.server.spring;
-    exports dev.rico.samples.todo.server.spring;
 }