Skip to content

Commit b68c975

Browse files
thomaswoehlkethomaswoehlke
authored
Merge pull request #364 from Spring-Framework-Java-Apps/master
update for deployment
2 parents 3d9053a + e904875 commit b68c975

File tree

146 files changed

+1418
-1277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+1418
-1277
lines changed

‎.idea/dataSources.local.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SECURITY.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
These versions of the project are currently being supported with security updates.
66

7-
| Version | Supported |
8-
| -------- | ------------------ |
9-
| 2.3.x | :white_check_mark: |
10-
| < 2.3.25 | :x: |
7+
| Version | Supported |
8+
|---------|-----------|
9+
| 2.3.70 | #361 |
10+
| 2.3.70 | #362 |
1111

1212
## Reporting a Vulnerability
1313

‎pom.xml

Lines changed: 2 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.woehlke</groupId>
66
<artifactId>simpleworklist</artifactId>
7-
<version>2.3.66-SNAPSHOT</version>
7+
<version>2.3.71-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<parent>
@@ -80,7 +80,6 @@
8080
<version.thymeleaf-testing>3.1.0.M2</version.thymeleaf-testing>
8181
<version.thymeleaf-spring-data-dialect>3.5.0</version.thymeleaf-spring-data-dialect>
8282

83-
8483
<!-- Webjars -->
8584
<webjars.jquery.version>3.6.0</webjars.jquery.version>
8685
<webjars.popper.js.version>2.9.3</webjars.popper.js.version>
@@ -94,7 +93,7 @@
9493
<htmlunit.version>2.63.0</htmlunit.version>
9594
<groovy-all.version>2.4.21</groovy-all.version>
9695
<hamcrest.version>2.2</hamcrest.version>
97-
<jsoup.version>1.14.2</jsoup.version>
96+
<jsoup.version>1.15.3</jsoup.version>
9897
<pmdVersion>6.46.0</pmdVersion>
9998

10099
<!-- SCM and Releasing -->
@@ -109,8 +108,6 @@
109108
<docker-compose-maven-plugin.detachedMode>true</docker-compose-maven-plugin.detachedMode>
110109

111110
<!-- Maven Plugins -->
112-
113-
114111
<maven-release-plugin.version>3.0.0-M6</maven-release-plugin.version>
115112

116113
<!-- Maven Reports for Site -->
@@ -129,11 +126,6 @@
129126
</properties>
130127

131128
<repositories>
132-
<repository>
133-
<id>jcenter</id>
134-
<name>JCenter Repository</name>
135-
<url>https://jcenter.bintray.com/</url>
136-
</repository>
137129
<repository>
138130
<id>central</id>
139131
<name>Central</name>
@@ -144,23 +136,6 @@
144136
<name>Sonatype Repository</name>
145137
<url>https://oss.sonatype.org/content/repositories/releases/</url>
146138
</repository>
147-
<!--
148-
<repository>
149-
<id>springio-plugins-release</id>
150-
<name>Spring Plugins Repository</name>
151-
<url>https://repo.spring.io/plugins-release/</url>
152-
</repository>
153-
<repository>
154-
<id>springio-libs-release</id>
155-
<name>Spring Lib Release Repository</name>
156-
<url>https://repo.spring.io/libs-release/</url>
157-
</repository>
158-
<repository>
159-
<id>spring-libs-milestone</id>
160-
<name>Spring Lib M Repository</name>
161-
<url>https://repo.spring.io/libs-milestone/</url>
162-
</repository>
163-
-->
164139
<repository>
165140
<id>apache-releases</id>
166141
<name>Apache Releases</name>
@@ -186,13 +161,6 @@
186161
<name>WSO2 Public Repository</name>
187162
<url>https://maven.wso2.org/nexus/content/repositories/public/</url>
188163
</repository>
189-
<!--
190-
<repository>
191-
<id>hortonworks-releases</id>
192-
<name>Hortonworks Repository</name>
193-
<url>https://repo.hortonworks.com/content/repositories/releases/</url>
194-
</repository>
195-
-->
196164
<repository>
197165
<id>adobe-public</id>
198166
<name>AdobePublic Repository</name>
@@ -205,11 +173,6 @@
205173
</repository>
206174
</repositories>
207175
<pluginRepositories>
208-
<pluginRepository>
209-
<id>jcenter</id>
210-
<name>JCenter Repository</name>
211-
<url>https://jcenter.bintray.com/</url>
212-
</pluginRepository>
213176
<pluginRepository>
214177
<id>central</id>
215178
<name>Central</name>
@@ -220,31 +183,6 @@
220183
<name>Sonatype Repository</name>
221184
<url>https://oss.sonatype.org/content/repositories/releases/</url>
222185
</pluginRepository>
223-
<!--
224-
<pluginRepository>
225-
<id>springio-plugins-release</id>
226-
<name>Spring Plugins Repository</name>
227-
<url>https://repo.spring.io/plugins-release/</url>
228-
</pluginRepository>
229-
<pluginRepository>
230-
<id>springio-libs-release</id>
231-
<name>Spring Lib Release Repository</name>
232-
<url>https://repo.spring.io/libs-release/</url>
233-
</pluginRepository>
234-
<pluginRepository>
235-
<id>spring-libs-milestone</id>
236-
<name>Spring Lib M Repository</name>
237-
<url>https://repo.spring.io/libs-milestone/</url>
238-
</pluginRepository>
239-
<pluginRepository>
240-
<id>spring-snapshots</id>
241-
<url>https://repo.spring.io/snapshot/</url>
242-
</pluginRepository>
243-
<pluginRepository>
244-
<id>spring-milestones</id>
245-
<url>https://repo.spring.io/milestone/</url>
246-
</pluginRepository>
247-
-->
248186
<pluginRepository>
249187
<id>apache-releases</id>
250188
<name>Apache Releases</name>
@@ -270,13 +208,6 @@
270208
<name>WSO2 Public Repository</name>
271209
<url>https://maven.wso2.org/nexus/content/repositories/public/</url>
272210
</pluginRepository>
273-
<!--
274-
<pluginRepository>
275-
<id>hortonworks-releases</id>
276-
<name>Hortonworks Repository</name>
277-
<url>https://repo.hortonworks.com/content/repositories/releases/</url>
278-
</pluginRepository>
279-
-->
280211
<pluginRepository>
281212
<id>adobe-public</id>
282213
<name>AdobePublic Repository</name>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
value = {"rowCreatedAt", "rowUpdatedAt"},
2020
allowGetters = true
2121
)
22-
//@ToString
2322
@Getter
2423
@Setter
25-
//@EqualsAndHashCode(callSuper=false)
2624
public class AuditModel extends Object implements Serializable {
2725

2826
private static final long serialVersionUID = 4399373914714726911L;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.springframework.context.ApplicationListener;
77
import org.springframework.context.event.ContextRefreshedEvent;
88
import org.springframework.stereotype.Component;
9-
import org.woehlke.java.simpleworklist.domain.search.SearchService;
9+
import org.woehlke.java.simpleworklist.domain.db.search.service.SearchService;
1010

1111

1212
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.springframework.context.ApplicationListener;
66
import org.springframework.context.event.ContextStartedEvent;
77
import org.springframework.stereotype.Component;
8-
import org.woehlke.java.simpleworklist.domain.search.SearchService;
8+
import org.woehlke.java.simpleworklist.domain.db.search.service.SearchService;
99

1010
import org.springframework.beans.factory.annotation.Autowired;
1111

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import org.springframework.validation.annotation.Validated;
88

99
import javax.validation.Valid;
10-
import javax.validation.constraints.NotBlank;
1110
import javax.validation.constraints.NotNull;
1211

1312
@Component
@@ -126,14 +125,6 @@ public static class WebSecurity {
126125
@NotNull
127126
private Integer strengthBCryptPasswordEncoder;
128127

129-
/*
130-
@NotNull
131-
private Integer hashWidth;
132-
133-
@NotBlank
134-
private String secret;
135-
*/
136-
137128
}
138129

139130
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.springframework.web.servlet.i18n.SessionLocaleResolver;
2020
import org.thymeleaf.dialect.springdata.SpringDataDialect;
2121

22+
import javax.validation.constraints.NotNull;
2223
import java.util.Locale;
2324
import java.util.Properties;
2425

@@ -102,16 +103,16 @@ public MethodValidationPostProcessor methodValidationPostProcessor() {
102103
return new MethodValidationPostProcessor();
103104
}
104105

105-
public void addInterceptors(InterceptorRegistry registry) {
106+
public void addInterceptors(@NotNull InterceptorRegistry registry) {
106107
registry.addInterceptor(localeChangeInterceptor());
107108
}
108109

109-
public void addViewControllers(ViewControllerRegistry registry) {
110+
public void addViewControllers(@NotNull ViewControllerRegistry registry) {
110111
registry.addViewController("/").setViewName("redirect:/taskstate/inbox");
111112
registry.addViewController("/home").setViewName("redirect:/taskstate/inbox");
112113
}
113114

114-
public void addResourceHandlers(ResourceHandlerRegistry registry) {
115+
public void addResourceHandlers(@NotNull ResourceHandlerRegistry registry) {
115116
for(String h : simpleworklistProperties.getWebMvc().getStaticResourceHandler()){
116117
String location = "classpath:/static"+h+"/";
117118
registry.addResourceHandler(h+"/*").addResourceLocations(location);

‎src/main/java/org/woehlke/java/simpleworklist/config/WebSecurityConfig.java

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.springframework.security.crypto.password.PasswordEncoder;
2121
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
2222
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
23-
import org.woehlke.java.simpleworklist.domain.user.access.ApplicationUserDetailsService;
23+
import org.woehlke.java.simpleworklist.domain.security.access.ApplicationUserDetailsService;
2424

2525

2626
@Configuration
@@ -54,16 +54,6 @@ public WebSecurityConfig(
5454
this.simpleworklistProperties = simpleworklistProperties;
5555
}
5656

57-
/*
58-
@Override
59-
public void init(WebSecurity builder) throws Exception {
60-
61-
}
62-
@Override
63-
public void configure(WebSecurity builder) throws Exception {
64-
}
65-
*/
66-
6757
@Override
6858
protected void configure(HttpSecurity http) throws Exception {
6959
http
@@ -102,21 +92,13 @@ public UserDetailsService userDetailsService(){
10292
}
10393

10494
/**
105-
* https://bcrypt-generator.com/
95+
* @see <a href="https://bcrypt-generator.com/">bcrypt-generator.com</a>
10696
* @return PasswordEncoder encoder
10797
*/
10898
@Bean
10999
public PasswordEncoder encoder(){
110100
int strength = simpleworklistProperties.getWebSecurity().getStrengthBCryptPasswordEncoder();
111101
return new BCryptPasswordEncoder(strength);
112-
/*
113-
CharSequence secret=this.simpleworklistProperties.getWebSecurity().getSecret();
114-
int iterations=this.simpleworklistProperties.getWebSecurity().getIterations();
115-
int hashWidth=this.simpleworklistProperties.getWebSecurity().getHashWidth();
116-
Pbkdf2PasswordEncoder encoder = (new Pbkdf2PasswordEncoder(secret,iterations,hashWidth));
117-
encoder.setEncodeHashAsBase64(true);
118-
return encoder;
119-
*/
120102
}
121103

122104
@Bean

0 commit comments

Comments
 (0)