diff --git a/etc/TODO.md b/etc/TODO.md index d8f70bc5..61ef83e6 100644 --- 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 index d9bbe04a..772963a6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.woehlke simpleworklist - 2.3.27-SNAPSHOT + 3.0.0-SNAPSHOT jar @@ -67,6 +67,8 @@ + 4.3.4 + 13 3.6.3 @@ -139,8 +141,10 @@ Neumann-SR4 Dragonfruit-SR1 + 5.6.2 @@ -148,7 +152,9 @@ 2.6.4 2.43.0 2.2 + 1.13.1 true @@ -289,6 +295,13 @@ + + org.joinfaces + joinfaces-dependencies + ${joinfaces.version} + pom + import + org.junit junit-bom @@ -303,6 +316,13 @@ pom import + + org.springframework.security + spring-security-bom + ${spring-security.version} + pom + import + org.webjars @@ -342,6 +362,7 @@ lombok ${lombok.version} false + provided @@ -481,6 +502,13 @@ htmlunit ${htmlunit.version} + + + org.primefaces + primefaces + 8.0 + + @@ -542,6 +570,10 @@ org.springframework.boot spring-boot-starter-security + + org.springframework.boot + spring-boot-starter-logging + org.springframework.security spring-security-core @@ -579,7 +611,18 @@ org.projectlombok lombok false + provided + org.webjars font-awesome @@ -734,6 +777,14 @@ org.apache.maven.doxia doxia-module-markdown + + org.primefaces + primefaces + + + org.joinfaces + jsf-spring-boot-starter + @@ -838,6 +889,18 @@ + + org.joinfaces + joinfaces-maven-plugin + ${joinfaces.version} + + + + classpath-scan + + + + @@ -1242,6 +1305,10 @@ true + + org.joinfaces + joinfaces-maven-plugin + org.apache.maven.plugins maven-javadoc-plugin @@ -1364,6 +1431,13 @@ true true + + + org.projectlombok + lombok + ${lombok.version} + + diff --git a/src/main/java/org/woehlke/simpleworklist/domain/task/TaskStateTabController.java b/src/main/java/org/woehlke/simpleworklist/domain/task/TaskStateTabController.java index 01863b0e..4ea2a091 100644 --- 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 index 30966be6..8577d791 100644 --- 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;