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

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

Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 3.2.5 to 3.3.0.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v3.2.5...v3.3.0)

---
updated-dependencies:
- dependency-name: org.springframework.boot
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore(deps): Bump org.apache.kafka:kafka-clients from 3.6.1 to 3.7.0

Bumps org.apache.kafka:kafka-clients from 3.6.1 to 3.7.0.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-clients
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore(jms): fix spring jms configuration after 3.3.0 upgrade

* chore(deps)!: update actuator endpoint

Actuators have a single path with different operations, but not multiple paths.
Also, only json is supported.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Timon Back <[email protected]>

build.gradle

@@ -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

dependencies.gradle

@@ -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'

springwolf-core/src/main/java/io/github/springwolf/core/controller/ActuatorAsyncApiController.java

@@ -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 {
         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);
-    }
 }

springwolf-examples/springwolf-jms-example/README.md

@@ -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.

springwolf-examples/springwolf-jms-example/docker-compose.yml

@@ -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"

springwolf-examples/springwolf-jms-example/src/main/resources/application.properties

@@ -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
 
 
 #########
@@ -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
 

springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ApiIntegrationWithActuatorIntegrationTest.java

@@ -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");