Merge pull request #296 from Spring-Framework-Java-Apps/JSF_Version

thomaswoehlke · web-flow · commit 957881668863 · 2020-10-02T15:14:08.000+02:00
Jsf version
diff --git a/etc/TODO.md b/etc/TODO.md
@@ -135,9 +135,25 @@ Caused by: org.postgresql.util.PSQLException: ERROR: relation "spring_session" d
 ## 2.3.26
 * fixed #249 TaskRepository: move the JQL Query-String to Entity as Prepared Statement
 
-## 2.3.27
-* Issue #234 Taskstate: Task Edit Form -> change Project via DropDown 
-* Issue #235 Project/Root: Task Edit Form -> change Project via DropDown
-* Issue #236 Project/id: Task Edit Form -> change Project via DropDown
+## 3.0.0
+* fixed #97 evaluate JSF PrimeFaces Spring Boot AutoConfigure
+* fixed #96 add JSF PrimeFaces Spring Boot AutoConfigure
+* fixed #95 evaluate JSF JavaxFaces Spring Boot AutoConfigure
+* fixed #94 add JSF JavaxFaces Spring Boot AutoConfigure
+* fixed #93 add JSF JavaxFaces Spring Boot AutoConfigure
+* fixed #92 try jars
+* fixed #288 create Branch JSF_Version from Release 2.3.26
+* Issue #291 Evaluate Joinfaces
+* Issue #292 app starts with joinfaces 
+* Issue #293 app run with joinfaces but with MVC Templates
+* Issue #294 Logging with logback only 
+
+## Joinfaces
+* https://github.com/joinfaces/joinfaces
+* http://joinfaces.org/
+* https://docs.joinfaces.org/4.3.4/reference/
+* https://docs.joinfaces.org/current/reference/
+
+
 
 
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.woehlke</groupId>
     <artifactId>simpleworklist</artifactId>
-    <version>2.3.27-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
     <parent>
@@ -67,6 +67,8 @@
     </distributionManagement>
 
     <properties>
+        <joinfaces.version>4.3.4</joinfaces.version>
+
         <java.version>13</java.version>
         <version.maven>3.6.3</version.maven>
 
@@ -139,16 +141,20 @@
 
         <spring-data-releasetrain.version>Neumann-SR4</spring-data-releasetrain.version>
         <spring-session-bom.version>Dragonfruit-SR1</spring-session-bom.version>
+        <!--
         <spring-framework.version>5.2.9.RELEASE</spring-framework.version>
         <spring-security.version>5.3.4.RELEASE</spring-security.version>
+        -->
 
         <!-- Unit and Integration Testing -->
         <junit-jupiter.version>5.6.2</junit-jupiter.version>
         <xmlunit2.version>2.6.4</xmlunit2.version>
         <xmlunit.version>2.6.4</xmlunit.version>
         <htmlunit.version>2.43.0</htmlunit.version>
         <hamcrest.version>2.2</hamcrest.version>
+        <!--
         <lombok.version>1.18.12</lombok.version>
+        -->
         <jsoup.version>1.13.1</jsoup.version>
 
         <skipTests>true</skipTests>
@@ -289,6 +295,13 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.joinfaces</groupId>
+                <artifactId>joinfaces-dependencies</artifactId>
+                <version>${joinfaces.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
@@ -303,6 +316,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-bom</artifactId>
+                <version>${spring-security.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <!-- webjars -->
             <dependency>
                 <groupId>org.webjars</groupId>
@@ -342,6 +362,7 @@
                 <artifactId>lombok</artifactId>
                 <version>${lombok.version}</version>
                 <optional>false</optional>
+                <scope>provided</scope>
             </dependency>
 
             <dependency>
@@ -481,6 +502,13 @@
                 <artifactId>htmlunit</artifactId>
                 <version>${htmlunit.version}</version>
             </dependency>
+
+        <dependency>
+            <groupId>org.primefaces</groupId>
+            <artifactId>primefaces</artifactId>
+            <version>8.0</version>
+        </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -542,6 +570,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
@@ -579,7 +611,18 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>false</optional>
+            <scope>provided</scope>
         </dependency>
+        <!--
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-access</artifactId>
+        </dependency>
+        -->
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>font-awesome</artifactId>
@@ -734,6 +777,14 @@
             <groupId>org.apache.maven.doxia</groupId>
             <artifactId>doxia-module-markdown</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.primefaces</groupId>
+            <artifactId>primefaces</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.joinfaces</groupId>
+            <artifactId>jsf-spring-boot-starter</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -838,6 +889,18 @@
                         </dependency>
                     </dependencies>
                 </plugin>
+                <plugin>
+                    <groupId>org.joinfaces</groupId>
+                    <artifactId>joinfaces-maven-plugin</artifactId>
+                    <version>${joinfaces.version}</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>classpath-scan</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -1242,6 +1305,10 @@
                     <showDeprecation>true</showDeprecation>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.joinfaces</groupId>
+                <artifactId>joinfaces-maven-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -1364,6 +1431,13 @@
                     </compilerArgs>
                     <showWarnings>true</showWarnings>
                     <showDeprecation>true</showDeprecation>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/task/TaskStateTabController.java b/src/main/java/org/woehlke/simpleworklist/domain/task/TaskStateTabController.java
@@ -1,6 +1,5 @@
 package org.woehlke.simpleworklist.domain.task;
 
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -15,6 +14,7 @@
 import org.woehlke.simpleworklist.services.TaskStateControllerService;
 import org.woehlke.simpleworklist.user.session.UserSessionBean;
 
+import lombok.extern.slf4j.Slf4j;
 import javax.validation.constraints.NotNull;
 import java.util.Locale;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/task/TaskStateTaskController.java b/src/main/java/org/woehlke/simpleworklist/domain/task/TaskStateTaskController.java
@@ -1,6 +1,6 @@
 package org.woehlke.simpleworklist.domain.task;
 
-import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -19,6 +19,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 
+import lombok.extern.slf4j.Slf4j;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.util.List;
