Skip to content
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.

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

chore(deps): Bump org.springframework.boot from 3.2.5 to 3.3.0 #804

Merged
merged 4 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
id 'ca.cutterslade.analyze' version '1.9.1'
id 'io.spring.dependency-management' version '1.1.5' apply false
id 'org.springframework.boot' version '3.2.5' apply false
id 'org.springframework.boot' version '3.3.0' apply false
id 'org.owasp.dependencycheck' version '9.2.0'
id 'com.diffplug.spotless' version '6.25.0'
id 'com.bmuschko.docker-spring-boot-application' version '9.4.0' apply false
Expand Down
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ext {

kafkaAvroSerializerVersion = '7.6.0'

kafkaClientsVersion = '3.6.1'
kafkaClientsVersion = '3.7.0'
kafkaStreamsVersion = '3.7.0'

kafkaProtobufSerializerVersion = '7.6.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,20 @@
import io.github.springwolf.core.asyncapi.AsyncApiService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.actuate.endpoint.web.annotation.RestControllerEndpoint;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
import org.springframework.boot.actuate.endpoint.web.annotation.WebEndpoint;

@Slf4j
@RestControllerEndpoint(id = "springwolf")
@WebEndpoint(id = "springwolf")
@RequiredArgsConstructor
public class ActuatorAsyncApiController {

private final AsyncApiService asyncApiService;
private final AsyncApiSerializerService serializer;

@GetMapping(
path = {"/docs", "/docs.json"},
produces = MediaType.APPLICATION_JSON_VALUE)
@ReadOperation
public String asyncApiJson() throws JsonProcessingException {
sam0r040 marked this conversation as resolved.
Show resolved Hide resolved
AsyncAPI asyncAPI = asyncApiService.getAsyncAPI();
return serializer.toJsonString(asyncAPI);
}

@GetMapping(path = "/docs.yaml", produces = "application/yaml")
public String asyncApiYaml() throws JsonProcessingException {
AsyncAPI asyncAPI = asyncApiService.getAsyncAPI();
return serializer.toYaml(asyncAPI);
}
}
1 change: 1 addition & 0 deletions springwolf-examples/springwolf-jms-example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
1. Copy the `docker-compose.yml` file to your machine.
2. Run `$ docker-compose up`.
3. Visit `localhost:8080/springwolf/asyncapi-ui.html` or try the API: `$ curl localhost:8080/springwolf/docs`.
4. ActiveMQ Management: `http://localhost:8161` using `artemis:artemis` as login

### Run with gradle
Note: You need to execute the gradle `bootRun` task since the IntelliJ spring application will not include springwolf-ui correctly.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ services:
- activemq

activemq:
image: apache/activemq-artemis:2.31.2
image: apache/activemq-artemis:2.34.0
environment:
EXTRA_ARGS: --http-host 0.0.0.0 --relax-jolokia --nio
ARTEMIS_USER: artemis
ARTEMIS_PASSWORD: artemis
ports:
- "61616:61616"
- "8161:8161"
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ spring.application.name=Springwolf example project - JMS

#########
# JMS configuration
spring.artemis.broker-url=${BOOTSTRAP_SERVER:tcp://localhost:61616}
spring.artemis.user=artemis
spring.artemis.password=artemis
spring.activemq.broker-url=${BOOTSTRAP_SERVER:tcp://localhost:61616}
spring.activemq.user=artemis
spring.activemq.password=artemis


#########
Expand All @@ -23,7 +23,7 @@ [email protected]
springwolf.docket.info.contact.url=https://github.com/springwolf/springwolf-core
springwolf.docket.info.license.name=Apache License 2.0
springwolf.docket.servers.jms-server.protocol=jms
springwolf.docket.servers.jms-server.host=${spring.artemis.broker-url}
springwolf.docket.servers.jms-server.host=${spring.activemq.broker-url}

springwolf.plugin.jms.publishing.enabled=true

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class ApiIntegrationWithActuatorIntegrationTest {

@Test
void asyncApiResourceArtifactTest() throws IOException {
String url = "http://localhost:" + managementPort + "/actuator/springwolf/docs";
String url = "http://localhost:" + managementPort + "/actuator/springwolf";
String actual = restTemplate.getForObject(url, String.class);

InputStream s = this.getClass().getResourceAsStream("/asyncapi.json");
Expand Down
Loading