这是indexloc提供的服务，不要输入任何密码
Skip to content

[JAVA-42103] #18621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 1, 2025
Merged

[JAVA-42103] #18621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b0de925
[JAVA-42103] Moved spring-problem from spring-boot-libraries to sprin…
panos-kakos Jun 9, 2025
8b16b2d
[JAVA-42103] Moved tooglz from spring-boot-libraries to spring-boot-l…
panos-kakos Jun 9, 2025
a12f5c0
[JAVA-42103] Moved modulith from spring-boot-libraries to spring-boot…
panos-kakos Jun 9, 2025
de669a7
[JAVA-42103] Moved resilient from spring-boot-libraries-2 to spring-b…
panos-kakos Jun 9, 2025
a60bc9a
[JAVA-42103] Moved openapi from spring-boot-libraries-2 to spring-boo…
panos-kakos Jun 9, 2025
a13d151
[JAVA-42103] Clean up spring-boot-libraries-2
panos-kakos Jun 24, 2025
c54ae2a
[JAVA-42103] Clean up spring-boot-libraries
panos-kakos Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 36 additions & 85 deletions spring-boot-modules/spring-boot-libraries-2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,6 @@
<version>1.0.0-SNAPSHOT</version>
</parent>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.modulith</groupId>
<artifactId>spring-modulith-bom</artifactId>
<version>${spring-modulith-bom.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -36,10 +24,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
Expand All @@ -54,22 +38,6 @@
<artifactId>jobrunr-spring-boot-starter</artifactId>
<version>${jobrunr-spring-boot-starter.version}</version>
</dependency>
<!-- openapi -->
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator</artifactId>
<version>${openapi-generator.version}</version>
</dependency>
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>jackson-databind-nullable</artifactId>
<version>${jackson-databind-nullable.version}</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<version>${springdoc.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
Expand All @@ -91,62 +59,49 @@
<artifactId>jandex</artifactId>
<version>${jandex.version}</version>
</dependency>
<!-- Problem Spring Web -->
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-spring-boot2</artifactId>
<version>${resilience4j-spring-boot2.version}</version>
<groupId>org.zalando</groupId>
<artifactId>problem-spring-web</artifactId>
<version>${problem-spring-web.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.github.tomakehurst/wiremock-jre8 -->
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
<version>${wiremock-jre8.version}</version>
<scope>test</scope>
<groupId>org.zalando</groupId>
<artifactId>jackson-datatype-problem</artifactId>
<version>${jackson-datatype-problem.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.modulith</groupId>
<artifactId>spring-modulith-api</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<!-- togglez -->
<dependency>
<groupId>org.springframework.modulith</groupId>
<artifactId>spring-modulith-starter-test</artifactId>
<scope>test</scope>
<groupId>org.togglz</groupId>
<artifactId>togglz-spring-boot-starter</artifactId>
<version>${togglz.version}</version>
</dependency>
<dependency>
<groupId>org.togglz</groupId>
<artifactId>togglz-spring-security</artifactId>
<version>${togglz.version}</version>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
<version>${jakarta.persistence-api.version}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<version>${openapi-generator.version}</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<inputSpec>
${project.basedir}/src/main/resources/petstore.yml
</inputSpec>
<generatorName>spring</generatorName>
<apiPackage>com.baeldung.openapi.api</apiPackage>
<modelPackage>com.baeldung.openapi.model</modelPackage>
<generateApis>true</generateApis>
<generateModels>true</generateModels>
<generateSupportingFiles>true</generateSupportingFiles>
<supportingFilesToGenerate>
ApiUtil.java
</supportingFilesToGenerate>
<configOptions>
<delegatePattern>false</delegatePattern>
<useJakartaEe>true</useJakartaEe>
<!--useSpringBoot3>true</useSpringBoot3--> <!--we can uncomment this option if the project uses Spring Boot 3 and above-->
</configOptions>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
Expand All @@ -172,20 +127,16 @@
</build>

<properties>
<spring-modulith-bom.version>1.2.2</spring-modulith-bom.version>
<jobrunr-spring-boot-starter.version>5.1.7</jobrunr-spring-boot-starter.version>
<awaitility.version>4.0.3</awaitility.version>
<openapi-generator.version>7.8.0</openapi-generator.version>
<spring.data.version>2.4.5</spring.data.version>
<jackson-databind-nullable.version>0.2.1</jackson-databind-nullable.version>
<reflections.version>0.10.2</reflections.version>
<jandex.version>2.4.3.Final</jandex.version>
<resilience4j-spring-boot2.version>2.0.2</resilience4j-spring-boot2.version>
<wiremock-jre8.version>2.34.0</wiremock-jre8.version>
<jandex-maven-plugin.version>1.2.3</jandex-maven-plugin.version>
<springdoc.version>1.7.0</springdoc.version>
<start-class>com.baeldung.openapi.OpenApiApplication</start-class>
<spring-boot.version>3.2.2</spring-boot.version>
<start-class>com.baeldung.kong.StockApp</start-class>
<problem-spring-web.version>0.29.1</problem-spring-web.version>
<jackson-datatype-problem.version>0.27.1</jackson-datatype-problem.version>
<togglz.version>4.4.0</togglz.version>
<jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
</properties>

</project>
0 ...oot/problem/SpringProblemApplication.java → ...oot/problem/SpringProblemApplication.java
View file
Open in desktop
File renamed without changes.
0 ...boot/problem/advice/ExceptionHandler.java → ...boot/problem/advice/ExceptionHandler.java
View file
Open in desktop
File renamed without changes.
0 ...blem/advice/SecurityExceptionHandler.java → ...blem/advice/SecurityExceptionHandler.java
View file
Open in desktop
File renamed without changes.
0 ...nfiguration/ProblemDemoConfiguration.java → ...nfiguration/ProblemDemoConfiguration.java
View file
Open in desktop
File renamed without changes.
0 .../configuration/SecurityConfiguration.java → .../configuration/SecurityConfiguration.java
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...lem/controller/ProblemDemoController.java → ...lem/controller/ProblemDemoController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import java.util.Map;

import org.springframework.http.MediaType;
//import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
Expand Down
0 ...a/com/baeldung/boot/problem/dto/Task.java → ...a/com/baeldung/boot/problem/dto/Task.java
View file
Open in desktop
File renamed without changes.
0 ...problem/problems/TaskNotFoundProblem.java → ...problem/problems/TaskNotFoundProblem.java
View file
Open in desktop
File renamed without changes.
0 ...in/java/com/baeldung/toggle/Employee.java → ...in/java/com/baeldung/toggle/Employee.java
View file
Open in desktop
File renamed without changes.
0 ...m/baeldung/toggle/EmployeeRepository.java → ...m/baeldung/toggle/EmployeeRepository.java
View file
Open in desktop
File renamed without changes.
0 ...m/baeldung/toggle/FeatureAssociation.java → ...m/baeldung/toggle/FeatureAssociation.java
View file
Open in desktop
File renamed without changes.
0 ...a/com/baeldung/toggle/FeaturesAspect.java → ...a/com/baeldung/toggle/FeaturesAspect.java
View file
Open in desktop
File renamed without changes.
0 .../java/com/baeldung/toggle/MyFeatures.java → .../java/com/baeldung/toggle/MyFeatures.java
View file
Open in desktop
File renamed without changes.
0 ...com/baeldung/toggle/SalaryController.java → ...com/baeldung/toggle/SalaryController.java
View file
Open in desktop
File renamed without changes.
0 ...va/com/baeldung/toggle/SalaryService.java → ...va/com/baeldung/toggle/SalaryService.java
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...om/baeldung/toggle/ToggleApplication.java → ...om/baeldung/toggle/ToggleApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.baeldung.toggle;

import jakarta.annotation.security.RolesAllowed;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

import jakarta.annotation.security.RolesAllowed;

@SpringBootApplication
public class ToggleApplication {
@RolesAllowed("*")
Expand Down
0 .../baeldung/toggle/ToggleConfiguration.java → .../baeldung/toggle/ToggleConfiguration.java
View file
Open in desktop
File renamed without changes.
0 .../resources/application-problem.properties → .../resources/application-problem.properties
View file
Open in desktop
File renamed without changes.
0 ...ProblemDemoControllerIntegrationTest.java → ...ProblemDemoControllerIntegrationTest.java
View file
Open in desktop
File renamed without changes.
24 changes: 24 additions & 0 deletions ...t-modules/spring-boot-libraries-2/src/test/java/com/baeldung/toggle/TestTogglzConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.baeldung.toggle;

import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.context.annotation.Bean;
import org.togglz.core.manager.FeatureManager;
import org.togglz.core.manager.FeatureManagerBuilder;
import org.togglz.core.repository.mem.InMemoryStateRepository;
import org.togglz.core.user.NoOpUserProvider;
import org.togglz.core.context.StaticFeatureManagerProvider;


@TestConfiguration
public class TestTogglzConfig {
@Bean
public FeatureManager featureManager() {
FeatureManager manager = new FeatureManagerBuilder()
.featureEnum(MyFeatures.class)
.stateRepository(new InMemoryStateRepository())
.userProvider(new NoOpUserProvider())
.build();
StaticFeatureManagerProvider.setFeatureManager(manager);
return manager;
}
}
2 changes: 1 addition & 1 deletion ...aeldung/toggle/ToggleIntegrationTest.java → ...aeldung/toggle/ToggleIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import org.springframework.web.context.WebApplicationContext;

@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK, classes = ToggleApplication.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK, classes = {ToggleApplication.class, TestTogglzConfig.class})
@AutoConfigureMockMvc
public class ToggleIntegrationTest {

Expand Down
Loading