1.0.1 (2023-03-26)

mttfranci · mttfranci · commit b2967fa694b3 · 2023-03-26T13:17:10.000+02:00
+ update fj-bom version 1.0.0 + update fj-core version 8.0.4 + maven.compiler.release property set to '8' (so the project is still compatible with java8+) [except for quarkus playground] + [As for the new parent version, building should be done using java11+](fugerit-org/fj-bom#11)
diff --git a/docgen/parameters.json b/docgen/parameters.json
@@ -1,8 +1,8 @@
 {
 	"title" : "Mars (Fugerit DAOGEN A.P.I.)",
 	"name": "Mars",
-	"version" : "1.0.0",
-	"date" : "19/03/2023",
+	"version" : "1.0.1",
+	"date" : "26/03/2023",
 	"organization" : {
 		"name" : "Fugerit Org",
 		"url" : "https://www.fugerit.org"
diff --git a/docgen/release-notes.txt b/docgen/release-notes.txt
@@ -1,4 +1,11 @@
-﻿1.0.0 (2023-03-19)
+﻿1.0.1 (2023-03-26)
+------------------
++ update fj-bom version 1.0.0
++ update fj-core version 8.0.4
++ maven.compiler.release property set to '8' (so the project is still compatible with java8+) [except for quarkus playground]
++ [As for the new parent version, building should be done using java11+](https://github.com/fugerit-org/fj-bom/issues/11)
+
+1.0.0 (2023-03-19)
 ------------------
 + [Dropping 0. version](https://github.com/fugerit-org/fj-lib/issues/5)
 + Parent pom set to fj-bom 0.2.3
diff --git a/fj-daogen-base/pom.xml b/fj-daogen-base/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-daogen</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1</version>
 	</parent>
 
 	<name>fj-daogen-base</name>
@@ -31,14 +31,7 @@
 			<groupId>org.fugerit.java</groupId>
 			<artifactId>fj-core</artifactId>
 		</dependency>	
-	
-		<!-- java core dependancies -->
-		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
+		
 		<dependency>
 		    <groupId>commons-dbcp</groupId>
 		    <artifactId>commons-dbcp</artifactId>
diff --git a/fj-daogen-sample/pom.xml b/fj-daogen-sample/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-daogen</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1</version>
 	</parent>
 
 	<name>fj-daogen-sample</name>
@@ -31,12 +31,11 @@
 			<groupId>org.fugerit.java</groupId>
 			<artifactId>fj-core</artifactId>
 		</dependency>	
-	
-		<!-- java core dependancies -->
+				
 		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-api</artifactId>
-			<scope>provided</scope>
+		    <groupId>javax.ws.rs</groupId>
+		    <artifactId>javax.ws.rs-api</artifactId>
+		    <version>${javax-rs-api-version}</version>
 		</dependency>
 				
 	</dependencies>
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/rest/load/LoadAddress.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/rest/load/LoadAddress.java
@@ -1,6 +1,5 @@
 package org.fugerit.java.daogen.sample.impl.rest.load;
 
-import javax.ejb.Stateless;
 import javax.ws.rs.Path;
 
 // custom import start ( code above here will be overwritten )
@@ -15,7 +14,6 @@
  * // custom code start ( code above here will be overwritten )
  * // custom code end ( code below here will be overwritten )
  */
-@Stateless
 @Path("/address/load")
 public class LoadAddress extends LoadAddressHelper {
 
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/rest/load/LoadLogData.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/rest/load/LoadLogData.java
@@ -1,6 +1,5 @@
 package org.fugerit.java.daogen.sample.impl.rest.load;
 
-import javax.ejb.Stateless;
 import javax.ws.rs.Path;
 
 // custom import start ( code above here will be overwritten )
@@ -15,7 +14,6 @@
  * // custom code start ( code above here will be overwritten )
  * // custom code end ( code below here will be overwritten )
  */
-@Stateless
 @Path("/logdata/load")
 public class LoadLogData extends LoadLogDataHelper {
 
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/rest/load/LoadTestTwoFieldKey.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/rest/load/LoadTestTwoFieldKey.java
@@ -1,6 +1,5 @@
 package org.fugerit.java.daogen.sample.impl.rest.load;
 
-import javax.ejb.Stateless;
 import javax.ws.rs.Path;
 
 // custom import start ( code above here will be overwritten )
@@ -15,7 +14,6 @@
  * // custom code start ( code above here will be overwritten )
  * // custom code end ( code below here will be overwritten )
  */
-@Stateless
 @Path("/testtwofieldkey/load")
 public class LoadTestTwoFieldKey extends LoadTestTwoFieldKeyHelper {
 
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/rest/load/LoadUpload.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/rest/load/LoadUpload.java
@@ -1,6 +1,5 @@
 package org.fugerit.java.daogen.sample.impl.rest.load;
 
-import javax.ejb.Stateless;
 import javax.ws.rs.Path;
 
 // custom import start ( code above here will be overwritten )
@@ -15,7 +14,6 @@
  * // custom code start ( code above here will be overwritten )
  * // custom code end ( code below here will be overwritten )
  */
-@Stateless
 @Path("/upload/load")
 public class LoadUpload extends LoadUploadHelper {
 
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/rest/load/LoadUser.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/rest/load/LoadUser.java
@@ -1,6 +1,5 @@
 package org.fugerit.java.daogen.sample.impl.rest.load;
 
-import javax.ejb.Stateless;
 import javax.ws.rs.Path;
 
 // custom import start ( code above here will be overwritten )
@@ -15,7 +14,6 @@
  * // custom code start ( code above here will be overwritten )
  * // custom code end ( code below here will be overwritten )
  */
-@Stateless
 @Path("/user/load")
 public class LoadUser extends LoadUserHelper {
 
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/rest/load/LoadUserData.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/rest/load/LoadUserData.java
@@ -1,6 +1,5 @@
 package org.fugerit.java.daogen.sample.impl.rest.load;
 
-import javax.ejb.Stateless;
 import javax.ws.rs.Path;
 
 // custom import start ( code above here will be overwritten )
@@ -15,7 +14,6 @@
  * // custom code start ( code above here will be overwritten )
  * // custom code end ( code below here will be overwritten )
  */
-@Stateless
 @Path("/userdata/load")
 public class LoadUserData extends LoadUserDataHelper {
 
diff --git a/fj-daogen-tool/pom.xml b/fj-daogen-tool/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-daogen</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1</version>
 	</parent>
 
 	<name>fj-daogen-tool</name>
@@ -37,13 +37,6 @@
 			<artifactId>fj-daogen-base</artifactId>
 		</dependency>			
 	
-		<!-- java core dependancies -->
-		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-				
 	</dependencies>
 
 	<organization>
diff --git a/pom.xml b/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-bom</artifactId>
-		<version>0.2.3</version>
+		<version>1.0.0</version>
 		<relativePath></relativePath>
 	</parent>
 
 	<artifactId>fj-daogen</artifactId>
 
-	<version>1.0.0</version>
+	<version>1.0.1</version>
 	<packaging>pom</packaging>
 
 	<name>fj-daogen</name>
@@ -20,12 +20,13 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java-version-compliance>1.8</java-version-compliance>
-		<j2ee-version-compliance>6.0</j2ee-version-compliance>
+		<java-version-compliance>8</java-version-compliance>
 	    <maven.compiler.source>${java-version-compliance}</maven.compiler.source>
-	    <maven.compiler.target>${java-version-compliance}</maven.compiler.target>
+	    <maven.compiler.target>${java-version-compliance}</maven.compiler.target>	
+	    <maven.compiler.release>${java-version-compliance}</maven.compiler.release>
 	    <maven.test.skip>true</maven.test.skip>
-		<fj-version>8.0.1</fj-version>  		 	    
+		<fj-version>8.0.4</fj-version>  		 	
+		<javax-rs-api-version>2.1.1</javax-rs-api-version>    
 	</properties>
 
 	<licenses>
@@ -145,24 +146,29 @@
 
 	<dependencies>
 
-
 		<!-- logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<scope>compile</scope>
+		<dependency> 
+		  <groupId>org.slf4j</groupId>
+		  <artifactId>slf4j-api</artifactId>
+		  <scope>compile</scope>
 		</dependency>
-
+		
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<scope>test</scope>
-		</dependency>	
+			<groupId>org.apache.logging.log4j</groupId>
+		    <artifactId>log4j-api</artifactId>
+		    <scope>test</scope>
+		</dependency>
 		<dependency>
 		    <groupId>org.apache.logging.log4j</groupId>
-		    <artifactId>log4j-slf4j-impl</artifactId>
+		    <artifactId>log4j-core</artifactId>
 		    <scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+		    <artifactId>log4j-slf4j2-impl</artifactId>
+		    <scope>test</scope>
+		</dependency>
+
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
