Skip to content

Commit f1ca565

Browse files
authored
Merge pull request #197 from xdev-software/develop
Release
2 parents d3a637e + 3a6dd3d commit f1ca565

File tree

60 files changed

+836
-176
lines changed

Some content is hidden

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

60 files changed

+836
-176
lines changed

.config/pmd/java/ruleset.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<rule ref="category/java/codestyle.xml/NoPackage"/>
4343
<rule ref="category/java/codestyle.xml/PrematureDeclaration"/>
4444
<rule ref="category/java/codestyle.xml/UnnecessarySemicolon"/>
45+
<rule ref="category/java/codestyle.xml/VariableCanBeInlined"/>
4546

4647
<rule ref="category/java/design.xml">
4748
<!-- Sometimes abstract classes have just fields -->
@@ -138,6 +139,7 @@
138139
<rule ref="category/java/errorprone.xml/AvoidMultipleUnaryOperators"/>
139140
<rule ref="category/java/errorprone.xml/AvoidUsingOctalValues"/>
140141
<rule ref="category/java/errorprone.xml/BrokenNullCheck"/>
142+
<rule ref="category/java/errorprone.xml/CollectionTypeMismatch"/>
141143
<rule ref="category/java/errorprone.xml/ComparisonWithNaN"/>
142144
<rule ref="category/java/errorprone.xml/DoNotCallGarbageCollectionExplicitly"/>
143145
<rule ref="category/java/errorprone.xml/DontImportSun"/>
@@ -155,7 +157,7 @@
155157
<rule ref="category/java/errorprone.xml/SingletonClassReturningNewInstance"/>
156158
<rule ref="category/java/errorprone.xml/UnconditionalIfStatement"/>
157159
<rule ref="category/java/errorprone.xml/UnnecessaryCaseChange"/>
158-
<rule ref="category/java/errorprone.xml/UselessOperationOnImmutable"/>
160+
<rule ref="category/java/errorprone.xml/UselessPureMethodCall"/>
159161

160162

161163
<rule ref="category/java/multithreading.xml">

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
8888
- name: Create Release
8989
id: create-release
90-
uses: shogo82148/actions-create-release@4661dc54f7b4b564074e9fbf73884d960de569a3 # v1
90+
uses: shogo82148/actions-create-release@7b89596097b26731bda0852f1504f813499079ee # v1
9191
with:
9292
tag_name: v${{ steps.version.outputs.release }}
9393
release_name: v${{ steps.version.outputs.release }}
Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
1+
wrapperVersion=3.3.4
2+
distributionType=only-script
173
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
# 1.3.0
2+
* Actuator
3+
* Added support for custom password hashers
4+
* The default built-in password-hasher is still using `SHA-256`
5+
* `ActuatorUserConfig#passwordSha256` was renamed to `passwordHash`
6+
* `passwordSha256` is deprecated and will be removed in a future release
7+
* Now utilizes password hash caching if possible
8+
* The cache defaults to a maximum size of 100 and a cached duration of 1h
9+
* Enabled when one of the following libraries is detected on the class-path:
10+
* [caffeine](https://github.com/ben-manes/caffeine)
11+
* [expiring-limited-cache](https://github.com/xdev-software/expiring-limited-cache)
12+
* Can be disabled with `sse.sidecar.actuator.password-hash.cache.enabled` if required
13+
* See source code for details configuration options
14+
* Updated dependencies
15+
116
# 1.2.2
217
* Minor code cleanup
318
* Updated dependencies

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Please note that more detailed descriptions are available in the individual modu
3232
* [web-sidecar-actuator](./web-sidecar-actuator/)
3333
* Secures Spring Boot's Actuator
3434
* Multi-User support
35-
* Allows securing different endpoint per user
35+
* Allows securing different endpoints per user
3636
* Only password hashes are stored on the server side
3737
* [web-sidecar-common](./web-sidecar-common/)
3838
* Host static resources without creating sessions

bom/pom.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev.sse</groupId>
88
<artifactId>bom</artifactId>
9-
<version>1.2.3-SNAPSHOT</version>
9+
<version>1.3.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<name>bom</name>
@@ -51,62 +51,62 @@
5151
<dependency>
5252
<groupId>software.xdev.sse</groupId>
5353
<artifactId>client-storage</artifactId>
54-
<version>1.2.3-SNAPSHOT</version>
54+
<version>1.3.0-SNAPSHOT</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>software.xdev.sse</groupId>
5858
<artifactId>crypto-symmetric</artifactId>
59-
<version>1.2.3-SNAPSHOT</version>
59+
<version>1.3.0-SNAPSHOT</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>software.xdev.sse</groupId>
6363
<artifactId>crypto-symmetric-managed</artifactId>
64-
<version>1.2.3-SNAPSHOT</version>
64+
<version>1.3.0-SNAPSHOT</version>
6565
</dependency>
6666
<dependency>
6767
<groupId>software.xdev.sse</groupId>
6868
<artifactId>codec-sha256</artifactId>
69-
<version>1.2.3-SNAPSHOT</version>
69+
<version>1.3.0-SNAPSHOT</version>
7070
</dependency>
7171
<dependency>
7272
<groupId>software.xdev.sse</groupId>
7373
<artifactId>csp</artifactId>
74-
<version>1.2.3-SNAPSHOT</version>
74+
<version>1.3.0-SNAPSHOT</version>
7575
</dependency>
7676
<dependency>
7777
<groupId>software.xdev.sse</groupId>
7878
<artifactId>metrics</artifactId>
79-
<version>1.2.3-SNAPSHOT</version>
79+
<version>1.3.0-SNAPSHOT</version>
8080
</dependency>
8181
<dependency>
8282
<groupId>software.xdev.sse</groupId>
8383
<artifactId>oauth2-oidc</artifactId>
84-
<version>1.2.3-SNAPSHOT</version>
84+
<version>1.3.0-SNAPSHOT</version>
8585
</dependency>
8686
<dependency>
8787
<groupId>software.xdev.sse</groupId>
8888
<artifactId>oauth2-oidc-remember-me</artifactId>
89-
<version>1.2.3-SNAPSHOT</version>
89+
<version>1.3.0-SNAPSHOT</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.xdev.sse</groupId>
9393
<artifactId>vaadin</artifactId>
94-
<version>1.2.3-SNAPSHOT</version>
94+
<version>1.3.0-SNAPSHOT</version>
9595
</dependency>
9696
<dependency>
9797
<groupId>software.xdev.sse</groupId>
9898
<artifactId>web</artifactId>
99-
<version>1.2.3-SNAPSHOT</version>
99+
<version>1.3.0-SNAPSHOT</version>
100100
</dependency>
101101
<dependency>
102102
<groupId>software.xdev.sse</groupId>
103103
<artifactId>web-sidecar-actuator</artifactId>
104-
<version>1.2.3-SNAPSHOT</version>
104+
<version>1.3.0-SNAPSHOT</version>
105105
</dependency>
106106
<dependency>
107107
<groupId>software.xdev.sse</groupId>
108108
<artifactId>web-sidecar-common</artifactId>
109-
<version>1.2.3-SNAPSHOT</version>
109+
<version>1.3.0-SNAPSHOT</version>
110110
</dependency>
111111
</dependencies>
112112
</dependencyManagement>

client-storage/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev.sse</groupId>
88
<artifactId>client-storage</artifactId>
9-
<version>1.2.3-SNAPSHOT</version>
9+
<version>1.3.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>client-storage</name>
@@ -261,12 +261,12 @@
261261
<dependency>
262262
<groupId>net.sourceforge.pmd</groupId>
263263
<artifactId>pmd-core</artifactId>
264-
<version>7.16.0</version>
264+
<version>7.17.0</version>
265265
</dependency>
266266
<dependency>
267267
<groupId>net.sourceforge.pmd</groupId>
268268
<artifactId>pmd-java</artifactId>
269-
<version>7.16.0</version>
269+
<version>7.17.0</version>
270270
</dependency>
271271
</dependencies>
272272
</plugin>

codec-sha256/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev.sse</groupId>
88
<artifactId>codec-sha256</artifactId>
9-
<version>1.2.3-SNAPSHOT</version>
9+
<version>1.3.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>codec-sha256</name>
@@ -150,7 +150,7 @@
150150
<plugin>
151151
<groupId>org.apache.maven.plugins</groupId>
152152
<artifactId>maven-surefire-plugin</artifactId>
153-
<version>3.5.3</version>
153+
<version>3.5.4</version>
154154
</plugin>
155155
</plugins>
156156
</build>
@@ -268,12 +268,12 @@
268268
<dependency>
269269
<groupId>net.sourceforge.pmd</groupId>
270270
<artifactId>pmd-core</artifactId>
271-
<version>7.16.0</version>
271+
<version>7.17.0</version>
272272
</dependency>
273273
<dependency>
274274
<groupId>net.sourceforge.pmd</groupId>
275275
<artifactId>pmd-java</artifactId>
276-
<version>7.16.0</version>
276+
<version>7.17.0</version>
277277
</dependency>
278278
</dependencies>
279279
</plugin>

crypto-symmetric-managed/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev.sse</groupId>
88
<artifactId>crypto-symmetric-managed</artifactId>
9-
<version>1.2.3-SNAPSHOT</version>
9+
<version>1.3.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>crypto-symmetric-managed</name>
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>org.springframework.boot</groupId>
5656
<artifactId>spring-boot-dependencies</artifactId>
57-
<version>3.5.5</version>
57+
<version>3.5.6</version>
5858
<type>pom</type>
5959
<scope>import</scope>
6060
</dependency>
@@ -287,12 +287,12 @@
287287
<dependency>
288288
<groupId>net.sourceforge.pmd</groupId>
289289
<artifactId>pmd-core</artifactId>
290-
<version>7.16.0</version>
290+
<version>7.17.0</version>
291291
</dependency>
292292
<dependency>
293293
<groupId>net.sourceforge.pmd</groupId>
294294
<artifactId>pmd-java</artifactId>
295-
<version>7.16.0</version>
295+
<version>7.17.0</version>
296296
</dependency>
297297
</dependencies>
298298
</plugin>

crypto-symmetric/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev.sse</groupId>
88
<artifactId>crypto-symmetric</artifactId>
9-
<version>1.2.3-SNAPSHOT</version>
9+
<version>1.3.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>crypto-symmetric</name>
@@ -150,7 +150,7 @@
150150
<plugin>
151151
<groupId>org.apache.maven.plugins</groupId>
152152
<artifactId>maven-surefire-plugin</artifactId>
153-
<version>3.5.3</version>
153+
<version>3.5.4</version>
154154
</plugin>
155155
</plugins>
156156
</build>
@@ -268,12 +268,12 @@
268268
<dependency>
269269
<groupId>net.sourceforge.pmd</groupId>
270270
<artifactId>pmd-core</artifactId>
271-
<version>7.16.0</version>
271+
<version>7.17.0</version>
272272
</dependency>
273273
<dependency>
274274
<groupId>net.sourceforge.pmd</groupId>
275275
<artifactId>pmd-java</artifactId>
276-
<version>7.16.0</version>
276+
<version>7.17.0</version>
277277
</dependency>
278278
</dependencies>
279279
</plugin>

0 commit comments

Comments
 (0)