Skip to content

Commit 9e28495

Browse files
authored
Merge pull request #406 from xdev-software/develop
Release
2 parents a703acc + 9110671 commit 9e28495

16 files changed

Lines changed: 803 additions & 41 deletions

File tree

.config/pmd/java/ruleset.xml

Lines changed: 765 additions & 6 deletions
Large diffs are not rendered by default.

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 2.7.2
2+
* `LazyNetwork`: Use explicitly defined `ExecutorService`
3+
* Updated dependencies
4+
15
# 2.7.1
26
* Readd missing whitespace in `TCITracer`
37

advanced-demo/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<dependency>
110110
<groupId>software.xdev.sse</groupId>
111111
<artifactId>bom</artifactId>
112-
<version>1.2.2</version>
112+
<version>1.4.0</version>
113113
<type>pom</type>
114114
<scope>import</scope>
115115
</dependency>
@@ -143,7 +143,7 @@
143143
<plugin>
144144
<groupId>org.apache.maven.plugins</groupId>
145145
<artifactId>maven-compiler-plugin</artifactId>
146-
<version>3.14.0</version>
146+
<version>3.14.1</version>
147147
<configuration>
148148
<release>${maven.compiler.release}</release>
149149
<compilerArgs>

advanced-demo/webapp/src/main/java/software/xdev/tci/demo/security/MainWebSecurity.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ public SecurityFilterChain configure(
5151
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Content-Type-Options
5252
.contentTypeOptions(Customizer.withDefaults())
5353
.contentSecurityPolicy(csp -> csp.policyDirectives(cspGenerator.buildCSP())))
54-
.sessionManagement(c ->
55-
// Limit maximum session per user
56-
c.sessionConcurrency(sc -> sc.maximumSessions(5)))
5754
.oauth2Login(c -> c.defaultSuccessUrl("/"))
5855
// Disable CSRF for REST API for demo purposes
5956
.csrf(c -> c.ignoringRequestMatchers("/api/**"))

base-demo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<plugin>
5858
<groupId>org.apache.maven.plugins</groupId>
5959
<artifactId>maven-compiler-plugin</artifactId>
60-
<version>3.14.0</version>
60+
<version>3.14.1</version>
6161
<configuration>
6262
<release>${maven.compiler.release}</release>
6363
<compilerArgs>

base/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
<plugin>
148148
<groupId>org.apache.maven.plugins</groupId>
149149
<artifactId>maven-compiler-plugin</artifactId>
150-
<version>3.14.0</version>
150+
<version>3.14.1</version>
151151
<executions>
152152
<execution>
153153
<id>compile-java-17</id>
@@ -192,7 +192,7 @@
192192
<plugin>
193193
<groupId>org.apache.maven.plugins</groupId>
194194
<artifactId>maven-javadoc-plugin</artifactId>
195-
<version>3.11.3</version>
195+
<version>3.12.0</version>
196196
<executions>
197197
<execution>
198198
<id>attach-javadocs</id>
@@ -250,7 +250,7 @@
250250
<plugin>
251251
<groupId>org.codehaus.mojo</groupId>
252252
<artifactId>flatten-maven-plugin</artifactId>
253-
<version>1.7.2</version>
253+
<version>1.7.3</version>
254254
<configuration>
255255
<flattenMode>ossrh</flattenMode>
256256
</configuration>

base/src/main/java/software/xdev/tci/network/LazyNetwork.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
import com.github.dockerjava.api.DockerClient;
4141
import com.github.dockerjava.api.command.CreateNetworkCmd;
4242

43+
import software.xdev.tci.concurrent.TCIExecutorServiceHolder;
44+
4345

4446
/**
4547
* A better implementation of {@link Network} in relation to {@link org.testcontainers.containers.Network.NetworkImpl}.
@@ -88,7 +90,7 @@ public class LazyNetwork implements Network
8890

8991
public LazyNetwork create()
9092
{
91-
return this.create(CompletableFuture::runAsync);
93+
return this.create(r -> CompletableFuture.runAsync(r, TCIExecutorServiceHolder.instance()));
9294
}
9395

9496
public LazyNetwork create(final Function<Runnable, CompletableFuture<Void>> executor)

bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<plugin>
121121
<groupId>org.codehaus.mojo</groupId>
122122
<artifactId>flatten-maven-plugin</artifactId>
123-
<version>1.7.2</version>
123+
<version>1.7.3</version>
124124
<configuration>
125125
<flattenMode>bom</flattenMode>
126126
</configuration>

db-jdbc-spring-orm-hibernate/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<plugin>
117117
<groupId>org.apache.maven.plugins</groupId>
118118
<artifactId>maven-compiler-plugin</artifactId>
119-
<version>3.14.0</version>
119+
<version>3.14.1</version>
120120
<configuration>
121121
<release>${maven.compiler.release}</release>
122122
<compilerArgs>
@@ -127,7 +127,7 @@
127127
<plugin>
128128
<groupId>org.apache.maven.plugins</groupId>
129129
<artifactId>maven-javadoc-plugin</artifactId>
130-
<version>3.11.3</version>
130+
<version>3.12.0</version>
131131
<executions>
132132
<execution>
133133
<id>attach-javadocs</id>
@@ -185,7 +185,7 @@
185185
<plugin>
186186
<groupId>org.codehaus.mojo</groupId>
187187
<artifactId>flatten-maven-plugin</artifactId>
188-
<version>1.7.2</version>
188+
<version>1.7.3</version>
189189
<configuration>
190190
<flattenMode>ossrh</flattenMode>
191191
</configuration>

db-jdbc-spring-orm/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<plugin>
117117
<groupId>org.apache.maven.plugins</groupId>
118118
<artifactId>maven-compiler-plugin</artifactId>
119-
<version>3.14.0</version>
119+
<version>3.14.1</version>
120120
<configuration>
121121
<release>${maven.compiler.release}</release>
122122
<compilerArgs>
@@ -127,7 +127,7 @@
127127
<plugin>
128128
<groupId>org.apache.maven.plugins</groupId>
129129
<artifactId>maven-javadoc-plugin</artifactId>
130-
<version>3.11.3</version>
130+
<version>3.12.0</version>
131131
<executions>
132132
<execution>
133133
<id>attach-javadocs</id>
@@ -185,7 +185,7 @@
185185
<plugin>
186186
<groupId>org.codehaus.mojo</groupId>
187187
<artifactId>flatten-maven-plugin</artifactId>
188-
<version>1.7.2</version>
188+
<version>1.7.3</version>
189189
<configuration>
190190
<flattenMode>ossrh</flattenMode>
191191
</configuration>

0 commit comments

Comments
 (0)