Merge branch 'master' into branch-2.3-MVC_2

# Conflicts:
#	.github/workflows/codacy-analysis.yml
#	.github/workflows/codeql-analysis.yml
#	.github/workflows/label.yml
#	.github/workflows/stale.yml
#	.idea/jarRepositories.xml
#	README.md
#	pom.xml
#	run.sh
#	system.properties

Author: thomaswoehlke

.github/workflows/codacy-analysis.yml

@@ -10,9 +10,9 @@ name: Codacy Security Scan
 
 on:
   push:
-    branches: [ 'master', 'heroku-deployment', 'branch-2.3-MVC' ]
+    branches: [ "master", "heroku-deployment" ]
   pull_request:
-    branches: [ 'master', 'heroku-deployment', 'branch-2.3-MVC' ]
+    branches: [ "master", "heroku-deployment" ]
 
 jobs:
   codacy-security-scan:

.idea/dataSources.local.xml

@@ -16,7 +16,7 @@ function firstSetup() {
     # showSettings
     ./mvnw dependency:purge-local-repository
     ./mvnw -e -DskipTests=true clean dependency:resolve dependency:resolve-plugins dependency:sources dependency:tree
-    ./mvnw -e -DskipTests=true clean package spring-boot:repackage site
+    ./mvnw -e -DskipTests=true clean package spring-boot:repackage site site:deploy
 }
 
 function setupTravis() {
@@ -28,7 +28,7 @@ function setupTravis() {
     ./mvnw -e -DskipTests=true -B -V dependency:resolve dependency:resolve-plugins dependency:sources && \
     ./mvnw -e -DskipTests=true -B -V dependency:tree && \
     ./mvnw -e -DskipTests=true -B -V clean package spring-boot:repackage && \
-    ./mvnw -e -DskipTests=true -B -V site
+    ./mvnw -e -DskipTests=true -B -V site site:deploy
 }
 
 function main() {

.idea/jarRepositories.xml

@@ -135,10 +135,29 @@ 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 
+
+## 3.0.1
+* Issue #295 try to remove dependencies and version-properties from pom.xml 
+
+## Joinfaces
+* https://github.com/joinfaces/joinfaces
+* http://joinfaces.org/
+* https://docs.joinfaces.org/4.3.4/reference/
+* https://docs.joinfaces.org/current/reference/
+
+
 
 ## 2.3.28
 * fixed #302 update Spring-Boot to Version to 2.3.7

build.sh

@@ -22,7 +22,7 @@
 
     <name>simpleworklist</name>
     <description>Your Todo-List for Getting Things Done</description>
-    <url>https://woehlke.org/java/simpleworklist</url>
+    <url>https://homepage.ruhr-uni-bochum.de/Thomas.Woehlke/java/simpleworklist</url>
     <inceptionYear>2012</inceptionYear>
 
     <organization>
@@ -68,7 +68,7 @@
 
     <properties>
         <java.version>15</java.version>
-        <version.maven>3.6.2</version.maven>
+        <version.maven>3.6.3</version.maven>
         <pmdVersion>6.28.0</pmdVersion>
 
         <!-- SCM and Releasing with Maven -->
@@ -159,6 +159,11 @@
             <name>Spring Lib M Repository</name>
             <url>https://repo.spring.io/libs-milestone/</url>
         </repository>
+        <repository>
+            <id>apache-releases</id>
+            <name>Apache Releases</name>
+            <url>https://repository.apache.org/content/repositories/releases/</url>
+        </repository>
         <repository>
             <id>atlassian-public</id>
             <name>Atlassian Repository</name>
@@ -229,6 +234,11 @@
             <id>spring-milestones</id>
             <url>https://repo.spring.io/milestone</url>
         </pluginRepository>
+        <pluginRepository>
+            <id>apache-releases</id>
+            <name>Apache Releases</name>
+            <url>https://repository.apache.org/content/repositories/releases/</url>
+        </pluginRepository>
         <pluginRepository>
             <id>atlassian-public</id>
             <name>Atlassian Repository</name>
@@ -277,6 +287,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>
@@ -509,6 +526,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>
@@ -531,7 +552,10 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-data</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.joinfaces</groupId>
+            <artifactId>security-spring-boot-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
@@ -546,6 +570,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>false</optional>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
@@ -971,7 +996,7 @@
                             <overWriteSnapshots>true</overWriteSnapshots>
                             <outputFile>${project.build.outputDirectory}/classes/</outputFile>
                             <excludeTypes>pom,maven-plugin</excludeTypes>
-                            <excludeGroupIds>antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm</excludeGroupIds>
+                            <excludeGroupIds>antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby</excludeGroupIds>
                             <excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete</excludeArtifactIds>
                         </configuration>
                     </execution>
@@ -990,8 +1015,8 @@
                             <overWriteSnapshots>true</overWriteSnapshots>
                             <outputFile>${project.build.outputDirectory}/classes/</outputFile>
                             <excludeTypes>pom,maven-plugin</excludeTypes>
-                            <excludeGroupIds>antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm</excludeGroupIds>
-                            <excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete</excludeArtifactIds>
+                            <excludeGroupIds>antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby</excludeGroupIds>
+                            <excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api</excludeArtifactIds>
                         </configuration>
                     </execution>
                     <execution>
@@ -1016,17 +1041,10 @@
                             <failOnWarning>false</failOnWarning>
                             <ignoreNonCompile>true</ignoreNonCompile>
                             <excludeTypes>pom</excludeTypes>
-                            <excludeGroupIds>org.webjars,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm</excludeGroupIds>
-                            <excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete</excludeArtifactIds>
+                            <excludeGroupIds>org.webjars,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby</excludeGroupIds>
+                            <excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api</excludeArtifactIds>
                             <ignoredDependencies>
                                 <ignoredDependency>org.apache.maven.plugins:maven-surefire-plugin</ignoredDependency>
-                                <!--
-                                <ignoredDependency>org.apache.maven.scm:maven-scm</ignoredDependency>
-                                <ignoredDependency>org.apache.maven.scm:maven-scm-providers-git</ignoredDependency>
-                                <ignoredDependency>org.apache.maven.scm:maven-scm-providers-standard</ignoredDependency>
-                                <ignoredDependency>org.apache.maven.scm:maven-scm-providers</ignoredDependency>
-                                <ignoredDependency>org.apache.maven.scm:maven-scm-managers</ignoredDependency>
-                                -->
                             </ignoredDependencies>
                             <ignoredUsedUndeclaredDependencies>
                                 <ignoredUsedUndeclaredDependency>org.apache.maven.plugins:maven-surefire-plugin</ignoredUsedUndeclaredDependency>
@@ -1067,8 +1085,8 @@
                         <phase>site</phase>
                         <configuration>
                             <excludeGroupIds>org.webjars</excludeGroupIds>
-                            <excludeGroupIds>org.webjars,org.jclouds,org.jboss.as,xml-resolver,commons-configuration,org.codehaus.plexus,commons-digester,junit,log4j,io.openliberty.features,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm</excludeGroupIds>
-                            <excludeArtifactIds>weld-probe-core,commons-configuration,jdk.tools,maven-antrun-plugin,antlr,bsh,velocity-tools,liquibase-core,jruby-complete</excludeArtifactIds>
+                            <excludeGroupIds>org.webjars,org.jclouds,org.jboss.as,xml-resolver,commons-configuration,org.codehaus.plexus,commons-digester,junit,log4j,io.openliberty.features,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby</excludeGroupIds>
+                            <excludeArtifactIds>weld-probe-core,commons-configuration,jdk.tools,maven-antrun-plugin,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api</excludeArtifactIds>
                             <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
                             <reportSets>
                                 <reportSet>
@@ -1093,8 +1111,8 @@
                         <configuration>
                             <classifier>sources</classifier>
                             <excludeTypes>pom,maven-plugin</excludeTypes>
-                            <excludeGroupIds>org.webjars,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm</excludeGroupIds>
-                            <excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete</excludeArtifactIds>
+                            <excludeGroupIds>org.webjars,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby</excludeGroupIds>
+                            <excludeArtifactIds>weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api</excludeArtifactIds>
                             <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
                             <outputDirectory>${project.build.directory}/dependency-sources/</outputDirectory>
                         </configuration>
@@ -1205,7 +1223,6 @@
 
     <reporting>
         <plugins>
-            <!-- Same like Build or Inherited from Build -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>

etc/TODO.md

@@ -29,7 +29,8 @@ function buildLikeHerokuWithSite() {
 }
 
 function buildLikeHeroku() {
-   ./mvnw -DskipTests clean dependency:list install
+   #./mvnw -DskipTests clean dependency:list install
+   ./mvnw clean dependency:list install
 }
 
 function runHerokuLocal() {

pom.xml

@@ -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;
 

run.sh

@@ -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;

src/main/java/org/woehlke/simpleworklist/domain/task/TaskStateTabController.java

@@ -7,7 +7,7 @@ server:
     min-response-size: 2048
 spring:
   datasource:
-    url: jdbc:postgresql://localhost:5432//simpleworklist
+    url: jdbc:postgresql://localdbhost:5432//simpleworklist
     username: simpleworklist
     password: simpleworklistpwd
     driverClassName: org.postgresql.Driver
@@ -86,12 +86,12 @@ org:
 spring:
   profiles: default
   datasource:
-    url: jdbc:postgresql://localhost:5432/simpleworklist
+    url: jdbc:postgresql://localdbhost:5432/simpleworklist
 ---
 spring:
   profiles: developing
   datasource:
-    url: jdbc:postgresql://localhost:5432/simpleworklist_developing
+    url: jdbc:postgresql://localdbhost:5432/simpleworklist_developing
   jpa:
     hibernate:
       ddl-auto: update
@@ -100,7 +100,7 @@ spring:
 spring:
   profiles: travis
   datasource:
-    url: jdbc:postgresql://localhost:5432/simpleworklist_travis
+    url: jdbc:postgresql://localdbhost:5432/simpleworklist_travis
     continue-on-error: true
   jpa:
     show-sql: false
@@ -114,7 +114,7 @@ server:
 spring:
   profiles: testing
   datasource:
-    url: jdbc:postgresql://localhost:5432/simpleworklist_testing
+    url: jdbc:postgresql://localdbhost:5432/simpleworklist_testing
   jpa:
     show-sql: false
     hibernate:
@@ -125,7 +125,6 @@ server:
     enabled: false
 logging:
   config: classpath:logback.xml
-  file: logging-test.log
   level:
     org:
       woehlke:
@@ -150,7 +149,7 @@ logging:
 spring:
   profiles: qa
   datasource:
-    url: jdbc:postgresql://localhost:5432/simpleworklist_qa
+    url: jdbc:postgresql://localdbhost:5432/simpleworklist_qa
     continue-on-error: true
   jpa:
     show-sql: false
@@ -162,7 +161,6 @@ server:
     enabled: false
 logging:
   config: classpath:logback.xml
-  file: logging-qa.log
   level:
     org:
       woehlke:
@@ -187,7 +185,7 @@ logging:
 spring:
   profiles: heroku
   datasource:
-    url: jdbc:postgresql://localhost:5432/simpleworklist_heroku
+    url: jdbc:postgresql://localdbhost:5432/simpleworklist_heroku
     continue-on-error: true
   jpa:
     show-sql: false