Skip to content

Commit afb1861

Browse files
committed
Use Stork 2.7.7
Put relocations in place
1 parent 12e8772 commit afb1861

File tree

19 files changed

+32
-183
lines changed

19 files changed

+32
-183
lines changed

.github/native-tests.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
{
100100
"category": "HTTP",
101101
"timeout": 130,
102-
"test-modules": "elytron-resteasy, resteasy-jackson, elytron-resteasy-reactive, resteasy-mutiny, resteasy-reactive-kotlin/standard, vertx, vertx-http, vertx-web, vertx-http-compressors/all, vertx-http-compressors/some, vertx-web-jackson, vertx-graphql, virtual-http, rest-client, rest-client-reactive, rest-client-reactive-stork, rest-client-reactive-multipart, websockets, websockets-next, management-interface, management-interface-auth, mutiny-native-jctools",
102+
"test-modules": "elytron-resteasy, resteasy-jackson, elytron-resteasy-reactive, resteasy-mutiny, resteasy-reactive-kotlin/standard, vertx, vertx-http, vertx-web, vertx-http-compressors/all, vertx-http-compressors/some, vertx-web-jackson, vertx-graphql, virtual-http, rest-client, rest-client-reactive, rest-client-reactive-stork, rest-client-reactive-multipart, websockets, websockets-next, management-interface, management-interface-auth, mutiny-native-jctools, smallrye-stork-consul-registration",
103103
"os-name": "ubuntu-latest"
104104
},
105105
{

bom/application/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<smallrye-reactive-types-converter.version>3.0.3</smallrye-reactive-types-converter.version>
5858
<smallrye-mutiny-vertx-binding.version>3.21.3</smallrye-mutiny-vertx-binding.version>
5959
<smallrye-reactive-messaging.version>4.31.0</smallrye-reactive-messaging.version>
60-
<smallrye-stork.version>2.7.3</smallrye-stork.version>
60+
<smallrye-stork.version>2.7.7</smallrye-stork.version>
6161
<jakarta.activation.version>2.1.4</jakarta.activation.version>
6262
<jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
6363
<jakarta.authentication-api>3.1.0</jakarta.authentication-api>

docs/src/main/asciidoc/stork-registration.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ When the application starts and the `stork-service-registration-consul` dependen
3030

3131
- Quarkus performs a build-time check for registration configuration.
3232
- If valid configuration is detected (or can be inferred), registration metadata is generated.
33-
- The application registers itself automatically using the detected or configured IP address and port.
33+
- **During startup**, the application registers itself automatically using the detected or configured IP address and port.
3434
- During shutdown, the service is automatically deregistered.
3535

3636
The solution is located in the `stork-automatic-consul-registration-quickstart` link:{quickstarts-tree-url}/stork-automatic-consul-registration-quickstart[directory].
@@ -73,7 +73,7 @@ No `quarkus.stork.my-service.service-registrar.type` is needed because there's o
7373

7474
=== Case 3: multiple services registrars
7575

76-
When multiple services are configured, you must specify the `quarkus.stork.<service-name>.service-registrar.typetype`:
76+
When multiple services are configured, you must specify the `quarkus.stork.<service-name>.service-registrar.type`:
7777

7878
[source,properties]
7979
----

extensions/smallrye-stork/deployment/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</dependency>
3232
<dependency>
3333
<groupId>io.quarkus</groupId>
34-
<artifactId>quarkus-junit5-internal</artifactId>
34+
<artifactId>quarkus-junit-internal</artifactId>
3535
<scope>test</scope>
3636
</dependency>
3737
<dependency>
@@ -60,12 +60,6 @@
6060
</execution>
6161
</executions>
6262
</plugin>
63-
<plugin>
64-
<artifactId>maven-surefire-plugin</artifactId>
65-
<configuration>
66-
<skip>true</skip>
67-
</configuration>
68-
</plugin>
6963
</plugins>
7064
</build>
7165

extensions/smallrye-stork/deployment/src/main/java/io/quarkus/stork/deployment/SmallRyeStorkProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ private static String getDefaultHealthCheckPath(Capabilities capabilities, Confi
148148
smallryeHealthCheckDefaultPath = quarkusConfig.getConfigValue("quarkus.management.root-path").getValue() + "/"
149149
+ quarkusConfig.getConfigValue("quarkus.smallrye-health.root-path").getValue() + "/"
150150
+ quarkusConfig.getConfigValue("quarkus.smallrye-health.liveness-path").getValue();
151-
LOGGER.infof("Using Smallrye Health Check defaults: %s", smallryeHealthCheckDefaultPath);
151+
LOGGER.debugf("Using Smallrye Health Check defaults: %s", smallryeHealthCheckDefaultPath);
152152
}
153153
return smallryeHealthCheckDefaultPath;
154154
}

extensions/smallrye-stork/deployment/src/test/java/io/quarkus/stork/ConsulContainerWithFixedPortsTestResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
public class ConsulContainerWithFixedPortsTestResource implements QuarkusTestResourceLifecycleManager {
1717

1818
private GenericContainer<?> containerWithFixedPorts;
19-
protected static final String IMAGE = "consul:1.7";
19+
protected static final String IMAGE = "consul:latest";
2020

2121
@Override
2222
public Map<String, String> start() {

extensions/smallrye-stork/deployment/src/test/java/io/quarkus/stork/HealthExtensionCheckTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@
2222
public class HealthExtensionCheckTest {
2323
@RegisterExtension
2424
static final QuarkusUnitTest TEST = new QuarkusUnitTest()
25-
.setLogRecordPredicate(record -> record.getLevel().intValue() >= Level.INFO.intValue())
25+
.withApplicationRoot((jar) -> jar
26+
.addAsResource("application.properties"))
2627
.setForcedDependencies(
2728
Arrays.asList(
2829
Dependency.of("io.quarkus", "quarkus-smallrye-stork", Version.getVersion()),
2930
Dependency.of("io.quarkus", "quarkus-smallrye-health", Version.getVersion()),
30-
Dependency.of("io.smallrye.stork", "stork-service-registration-consul", "2.7.4")))
31+
Dependency.of("io.smallrye.stork", "stork-service-registration-consul", "2.7.6")))
32+
.setLogRecordPredicate(record -> record.getLevel().intValue() >= Level.FINE.intValue())
3133
.assertLogRecords(logRecords -> {
3234
List<LogRecord> logs = logRecords.stream()
3335
.filter(l -> l.getMessage().contains("Using Smallrye Health Check defaults: %s"))

extensions/smallrye-stork/deployment/src/test/java/io/quarkus/stork/NoHealthExtensionTest.java

Lines changed: 0 additions & 40 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
quarkus.log.category."io.quarkus.stork.deployment".level=DEBUG

extensions/smallrye-stork/runtime/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</dependency>
4747
<dependency>
4848
<groupId>io.quarkus</groupId>
49-
<artifactId>quarkus-junit5-internal</artifactId>
49+
<artifactId>quarkus-junit-internal</artifactId>
5050
<scope>test</scope>
5151
</dependency>
5252
</dependencies>

0 commit comments

Comments
 (0)