Merge pull request #364 from Spring-Framework-Java-Apps/master

update for deployment

Author: thomaswoehlke

.idea/dataSources.local.xml

@@ -4,10 +4,10 @@
 
 These versions of the project are currently being supported with security updates.
 
-| Version  | Supported          |
-| -------- | ------------------ |
-| 2.3.x    | :white_check_mark: |
-| < 2.3.25 | :x:                |
+| Version | Supported |
+|---------|-----------|
+| 2.3.70  | #361      |
+| 2.3.70  | #362      |
 
 ## Reporting a Vulnerability
 

SECURITY.md

@@ -4,7 +4,7 @@
 
   <groupId>org.woehlke</groupId>
   <artifactId>simpleworklist</artifactId>
-  <version>2.3.66-SNAPSHOT</version>
+  <version>2.3.71-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
@@ -80,7 +80,6 @@
     <version.thymeleaf-testing>3.1.0.M2</version.thymeleaf-testing>
     <version.thymeleaf-spring-data-dialect>3.5.0</version.thymeleaf-spring-data-dialect>
 
-
     <!-- Webjars -->
     <webjars.jquery.version>3.6.0</webjars.jquery.version>
     <webjars.popper.js.version>2.9.3</webjars.popper.js.version>
@@ -94,7 +93,7 @@
     <htmlunit.version>2.63.0</htmlunit.version>
     <groovy-all.version>2.4.21</groovy-all.version>
     <hamcrest.version>2.2</hamcrest.version>
-    <jsoup.version>1.14.2</jsoup.version>
+    <jsoup.version>1.15.3</jsoup.version>
     <pmdVersion>6.46.0</pmdVersion>
 
     <!-- SCM and Releasing -->
@@ -109,8 +108,6 @@
     <docker-compose-maven-plugin.detachedMode>true</docker-compose-maven-plugin.detachedMode>
 
     <!-- Maven Plugins -->
-
-
     <maven-release-plugin.version>3.0.0-M6</maven-release-plugin.version>
 
     <!-- Maven Reports for Site -->
@@ -129,11 +126,6 @@
   </properties>
 
   <repositories>
-    <repository>
-      <id>jcenter</id>
-      <name>JCenter Repository</name>
-      <url>https://jcenter.bintray.com/</url>
-    </repository>
     <repository>
       <id>central</id>
       <name>Central</name>
@@ -144,23 +136,6 @@
       <name>Sonatype Repository</name>
       <url>https://oss.sonatype.org/content/repositories/releases/</url>
     </repository>
-    <!--
-    <repository>
-        <id>springio-plugins-release</id>
-        <name>Spring Plugins Repository</name>
-        <url>https://repo.spring.io/plugins-release/</url>
-    </repository>
-    <repository>
-        <id>springio-libs-release</id>
-        <name>Spring Lib Release Repository</name>
-        <url>https://repo.spring.io/libs-release/</url>
-    </repository>
-    <repository>
-        <id>spring-libs-milestone</id>
-        <name>Spring Lib M Repository</name>
-        <url>https://repo.spring.io/libs-milestone/</url>
-    </repository>
-    -->
     <repository>
       <id>apache-releases</id>
       <name>Apache Releases</name>
@@ -186,13 +161,6 @@
       <name>WSO2 Public Repository</name>
       <url>https://maven.wso2.org/nexus/content/repositories/public/</url>
     </repository>
-    <!--
-    <repository>
-        <id>hortonworks-releases</id>
-        <name>Hortonworks Repository</name>
-        <url>https://repo.hortonworks.com/content/repositories/releases/</url>
-    </repository>
-    -->
     <repository>
       <id>adobe-public</id>
       <name>AdobePublic Repository</name>
@@ -205,11 +173,6 @@
     </repository>
   </repositories>
   <pluginRepositories>
-    <pluginRepository>
-      <id>jcenter</id>
-      <name>JCenter Repository</name>
-      <url>https://jcenter.bintray.com/</url>
-    </pluginRepository>
     <pluginRepository>
       <id>central</id>
       <name>Central</name>
@@ -220,31 +183,6 @@
       <name>Sonatype Repository</name>
       <url>https://oss.sonatype.org/content/repositories/releases/</url>
     </pluginRepository>
-    <!--
-    <pluginRepository>
-        <id>springio-plugins-release</id>
-        <name>Spring Plugins Repository</name>
-        <url>https://repo.spring.io/plugins-release/</url>
-    </pluginRepository>
-    <pluginRepository>
-        <id>springio-libs-release</id>
-        <name>Spring Lib Release Repository</name>
-        <url>https://repo.spring.io/libs-release/</url>
-    </pluginRepository>
-    <pluginRepository>
-        <id>spring-libs-milestone</id>
-        <name>Spring Lib M Repository</name>
-        <url>https://repo.spring.io/libs-milestone/</url>
-    </pluginRepository>
-    <pluginRepository>
-        <id>spring-snapshots</id>
-        <url>https://repo.spring.io/snapshot/</url>
-    </pluginRepository>
-    <pluginRepository>
-        <id>spring-milestones</id>
-        <url>https://repo.spring.io/milestone/</url>
-    </pluginRepository>
-    -->
     <pluginRepository>
       <id>apache-releases</id>
       <name>Apache Releases</name>
@@ -270,13 +208,6 @@
       <name>WSO2 Public Repository</name>
       <url>https://maven.wso2.org/nexus/content/repositories/public/</url>
     </pluginRepository>
-    <!--
-    <pluginRepository>
-        <id>hortonworks-releases</id>
-        <name>Hortonworks Repository</name>
-        <url>https://repo.hortonworks.com/content/repositories/releases/</url>
-    </pluginRepository>
-    -->
     <pluginRepository>
       <id>adobe-public</id>
       <name>AdobePublic Repository</name>

pom.xml

@@ -19,10 +19,8 @@
     value = {"rowCreatedAt", "rowUpdatedAt"},
     allowGetters = true
 )
-//@ToString
 @Getter
 @Setter
-//@EqualsAndHashCode(callSuper=false)
 public class AuditModel extends Object implements Serializable {
 
     private static final long serialVersionUID = 4399373914714726911L;

src/main/java/org/woehlke/java/simpleworklist/application/framework/AuditModel.java

@@ -6,7 +6,7 @@
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.stereotype.Component;
-import org.woehlke.java.simpleworklist.domain.search.SearchService;
+import org.woehlke.java.simpleworklist.domain.db.search.service.SearchService;
 
 
 /**

src/main/java/org/woehlke/java/simpleworklist/application/listener/ApplicationContextRefreshedListener.java

@@ -5,7 +5,7 @@
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextStartedEvent;
 import org.springframework.stereotype.Component;
-import org.woehlke.java.simpleworklist.domain.search.SearchService;
+import org.woehlke.java.simpleworklist.domain.db.search.service.SearchService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 

src/main/java/org/woehlke/java/simpleworklist/application/listener/ApplicationContextStartedListener.java

@@ -7,7 +7,6 @@
 import org.springframework.validation.annotation.Validated;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 @Component
@@ -126,14 +125,6 @@ public static class WebSecurity {
         @NotNull
         private Integer strengthBCryptPasswordEncoder;
 
-        /*
-        @NotNull
-        private Integer hashWidth;
-
-        @NotBlank
-        private String secret;
-        */
-
     }
 
 }

src/main/java/org/woehlke/java/simpleworklist/config/SimpleworklistProperties.java

@@ -19,6 +19,7 @@
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.thymeleaf.dialect.springdata.SpringDataDialect;
 
+import javax.validation.constraints.NotNull;
 import java.util.Locale;
 import java.util.Properties;
 
@@ -102,16 +103,16 @@ public MethodValidationPostProcessor methodValidationPostProcessor() {
         return new MethodValidationPostProcessor();
     }
 
-    public void addInterceptors(InterceptorRegistry registry) {
+    public void addInterceptors(@NotNull InterceptorRegistry registry) {
         registry.addInterceptor(localeChangeInterceptor());
     }
 
-    public void addViewControllers(ViewControllerRegistry registry) {
+    public void addViewControllers(@NotNull ViewControllerRegistry registry) {
         registry.addViewController("/").setViewName("redirect:/taskstate/inbox");
         registry.addViewController("/home").setViewName("redirect:/taskstate/inbox");
     }
 
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+    public void addResourceHandlers(@NotNull ResourceHandlerRegistry registry) {
         for(String h : simpleworklistProperties.getWebMvc().getStaticResourceHandler()){
             String location = "classpath:/static"+h+"/";
             registry.addResourceHandler(h+"/*").addResourceLocations(location);

src/main/java/org/woehlke/java/simpleworklist/config/WebMvcConfig.java

@@ -20,7 +20,7 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.woehlke.java.simpleworklist.domain.user.access.ApplicationUserDetailsService;
+import org.woehlke.java.simpleworklist.domain.security.access.ApplicationUserDetailsService;
 
 
 @Configuration
@@ -54,16 +54,6 @@ public WebSecurityConfig(
         this.simpleworklistProperties = simpleworklistProperties;
     }
 
-    /*
-    @Override
-    public void init(WebSecurity builder) throws Exception {
-
-    }
-    @Override
-    public void configure(WebSecurity builder) throws Exception {
-    }
-    */
-
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         http
@@ -102,21 +92,13 @@ public UserDetailsService userDetailsService(){
     }
 
     /**
-     * https://bcrypt-generator.com/
+     * @see <a href="https://bcrypt-generator.com/">bcrypt-generator.com</a>
      * @return PasswordEncoder encoder
      */
     @Bean
     public PasswordEncoder encoder(){
         int strength = simpleworklistProperties.getWebSecurity().getStrengthBCryptPasswordEncoder();
         return new BCryptPasswordEncoder(strength);
-        /*
-        CharSequence secret=this.simpleworklistProperties.getWebSecurity().getSecret();
-        int iterations=this.simpleworklistProperties.getWebSecurity().getIterations();
-        int hashWidth=this.simpleworklistProperties.getWebSecurity().getHashWidth();
-        Pbkdf2PasswordEncoder encoder = (new Pbkdf2PasswordEncoder(secret,iterations,hashWidth));
-        encoder.setEncodeHashAsBase64(true);
-        return encoder;
-        */
     }
 
     @Bean