Skip to content

Commit

Permalink
Update to Camunda 7.17.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiasschaefer committed Apr 9, 2022
1 parent d4cb78d commit 914710a
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 25 deletions.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -446,8 +446,8 @@ implementation("info.novatec:micronaut-camunda-bpm-feature:2.6.0") {
exclude group: 'org.camunda.bpm', module: 'camunda-engine'
}
implementation("org.camunda.bpm.webapp:camunda-webapp-webjar-ee:7.16.0-ee")
implementation("org.camunda.bpm:camunda-engine:7.16.0-ee")
implementation("org.camunda.bpm.webapp:camunda-webapp-webjar-ee:7.17.0-ee")
implementation("org.camunda.bpm:camunda-engine:7.17.0-ee")
```
</details>
<details>
Expand All @@ -473,12 +473,12 @@ In `pom.xml`:
<dependency>
<groupId>org.camunda.bpm.webapp</groupId>
<artifactId>camunda-webapp-webjar-ee</artifactId>
<version>7.16.0-ee</version>
<version>7.17.0-ee</version>
</dependency>
<dependency>
<groupId>org.camunda.bpm</groupId>
<artifactId>camunda-engine</artifactId>
<version>7.16.0-ee</version>
<version>7.17.0-ee</version>
</dependency>
```
</details>
Expand All @@ -505,7 +505,7 @@ You can either
Example with the LDAP plugin:

```groovy
implementation("org.camunda.bpm.identity:camunda-identity-ldap:7.16.0")
implementation("org.camunda.bpm.identity:camunda-identity-ldap:7.17.0")
```

```java
Expand Down Expand Up @@ -788,7 +788,7 @@ Process tests can easily be implemented with JUnit 5 by adding the `camunda-bpm-
<summary>Click to show Gradle dependencies</summary>

```groovy
testImplementation("org.camunda.bpm.assert:camunda-bpm-assert:13.0.0")
testImplementation("org.camunda.bpm:camunda-bpm-assert:7.17.0")
testImplementation("org.assertj:assertj-core")
```
</details>
Expand All @@ -798,15 +798,15 @@ testImplementation("org.assertj:assertj-core")

```xml
<dependency>
<groupId>org.camunda.bpm.assert</groupId>
<groupId>org.camunda.bpm</groupId>
<artifactId>camunda-bpm-assert</artifactId>
<version>13.0.0</version>
<version>7.17.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.20.2</version>
<version>3.21.0</version>
<scope>test</scope>
</dependency>
```
Expand Down
3 changes: 1 addition & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ micronautLibraryPluginVersion=3.3.2
jettyVersion=9.4.43.v20210629
tomcatVersion=9.0.58
undertowVersion=2.2.14.Final
camundaVersion=7.16.0
camundaPlatformAssert=13.0.0
camundaVersion=7.17.0
# Latest Jersey, that implements JAX-RS 2.1 API: see https://eclipse-ee4j.github.io/jersey/download.html
jerseyVersion=2.35
# Prevent upload of maven-metadata.xml.sha256/sha512 files to oss.sonatype.org
Expand Down
2 changes: 1 addition & 1 deletion micronaut-camunda-bpm-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies {
// Test
testImplementation("io.micronaut:micronaut-http-client")

testImplementation("org.camunda.bpm.assert:camunda-bpm-assert:$camundaPlatformAssert")
testImplementation("org.camunda.bpm:camunda-bpm-assert:$camundaVersion")
testImplementation("org.assertj:assertj-core")
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
import io.undertow.Version;
import jakarta.inject.Singleton;
import org.apache.catalina.util.ServerInfo;
import org.camunda.bpm.engine.impl.telemetry.dto.ApplicationServer;
import org.camunda.bpm.engine.impl.telemetry.dto.ApplicationServerImpl;
import org.eclipse.jetty.util.Jetty;

import java.util.Map;
import java.util.Optional;

/**
* Bean factory for {@link ApplicationServer} containing the embedded server version.
* Bean factory for {@link ApplicationServerImpl} containing the embedded server version.
* <p>
* Note: We're not using javax.servlet.ServletContainerInitializer to not rely on micronaut-servlet and therefore
* minimize dependencies.
Expand All @@ -50,33 +50,33 @@ public class ApplicationServerFactory {

@Singleton
@Requires(classes = {NettyHttpServer.class, io.netty.util.Version.class})
public ApplicationServer nettyServerInfo() {
public ApplicationServerImpl nettyServerInfo() {
assertEmbeddedServerIsActive(NettyHttpServer.class);
return io.netty.util.Version.identify().entrySet().stream()
.min(Map.Entry.comparingByKey())
.map(entry -> new ApplicationServer("netty-" + entry.getValue().artifactVersion()))
.map(entry -> new ApplicationServerImpl("netty-" + entry.getValue().artifactVersion()))
.orElseThrow(() -> new DisabledBeanException("Version information is not available for Netty."));
}

@Singleton
@Requires(classes = {JettyServer.class, Jetty.class})
public ApplicationServer jettyServerInfo() {
public ApplicationServerImpl jettyServerInfo() {
assertEmbeddedServerIsActive(JettyServer.class);
return new ApplicationServer("jetty/" + Jetty.VERSION);
return new ApplicationServerImpl("jetty/" + Jetty.VERSION);
}

@Singleton
@Requires(classes = {TomcatServer.class, ServerInfo.class})
public ApplicationServer tomcatServerInfo() {
public ApplicationServerImpl tomcatServerInfo() {
assertEmbeddedServerIsActive(TomcatServer.class);
return new ApplicationServer(ServerInfo.getServerInfo());
return new ApplicationServerImpl(ServerInfo.getServerInfo());
}

@Singleton
@Requires(classes = {UndertowServer.class, Version.class})
public ApplicationServer undertowServerInfo() {
public ApplicationServerImpl undertowServerInfo() {
assertEmbeddedServerIsActive(UndertowServer.class);
return new ApplicationServer(Version.getFullVersionString());
return new ApplicationServerImpl(Version.getFullVersionString());
}

protected void assertEmbeddedServerIsActive(Class<?> clazz) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import jakarta.inject.Singleton;
import org.camunda.bpm.engine.impl.telemetry.TelemetryRegistry;
import org.camunda.bpm.engine.impl.telemetry.dto.ApplicationServer;
import org.camunda.bpm.engine.impl.telemetry.dto.ApplicationServerImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -35,11 +35,11 @@ public class MnTelemetryRegistry extends TelemetryRegistry {

protected static final String INTEGRATION_NAME = "micronaut-camunda";

public MnTelemetryRegistry(Optional<ApplicationServer> applicationServer) {
public MnTelemetryRegistry(Optional<ApplicationServerImpl> applicationServer) {
setCamundaIntegration(INTEGRATION_NAME);
if (applicationServer.isPresent()) {
log.info("Server runtime version: vendor={}, version={}", applicationServer.get().getVendor(), applicationServer.get().getVersion());
setApplicationServer(applicationServer.get());
setApplicationServer(applicationServer.get().getVersion());
} else {
log.warn("Unable to identify the application server for the telemetry data!");
}
Expand Down

0 comments on commit 914710a

Please # to comment.