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.

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

Jump to bottom

:feat: upgrade spring-springboot-camel-artemis #4046

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

:feat: upgrade spring-springboot-camel-artemis #4046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
134 changes: 134 additions & 0 deletions assembly/broker-artemis/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
<packaging>pom</packaging>
<artifactId>kapua-assembly-broker-artemis</artifactId>

<properties>
<netty-artemis.version>4.1.107.Final</netty-artemis.version>
<jetty-artemis.version>10.0.20</jetty-artemis.version>
</properties>
<dependencies>
<dependency>
<groupId>org.eclipse.kapua</groupId>
Expand Down Expand Up @@ -207,6 +211,136 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-socks</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-mqtt</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-classes-epoll</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-classes-kqueue</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty-artemis.version}</version>
<classifier>linux-x86_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>${netty-artemis.version}</version>
<classifier>osx-aarch_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>${netty-artemis.version}</version>
<classifier>osx-x86_64</classifier>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty-artemis.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
<version>${jetty-artemis.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
<version>${jetty-artemis.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${jetty-artemis.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
<version>${jetty-artemis.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>${jetty-artemis.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-xml</artifactId>
<version>${jetty-artemis.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
<version>${jetty-artemis.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${jetty-artemis.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
91 changes: 91 additions & 0 deletions broker/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,98 @@

<artifactId>kapua-broker</artifactId>

<properties>
<netty-artemis.version>4.1.107.Final</netty-artemis.version>
</properties>
<modules>
<module>artemis</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-socks</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-mqtt</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-classes-epoll</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-classes-kqueue</artifactId>
<version>${netty-artemis.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty-artemis.version}</version>
<classifier>linux-x86_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>${netty-artemis.version}</version>
<classifier>osx-aarch_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>${netty-artemis.version}</version>
<classifier>osx-x86_64</classifier>
</dependency>
</dependencies>
</dependencyManagement>
</project>
20 changes: 7 additions & 13 deletions client/security/src/main/java/org/eclipse/kapua/client/security/bean/KapuaPrincipalImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@
*
* @since 1.0
*/
public class KapuaPrincipalImpl implements KapuaPrincipal {
public class KapuaPrincipalImpl extends org.apache.activemq.artemis.spi.core.security.jaas.UserPrincipal implements KapuaPrincipal {

private static final long serialVersionUID = -2120917772921438176L;

private String name;
private String clientId;
private boolean internal;
/**
Expand All @@ -45,7 +44,7 @@
* @param authResponse
*/
public KapuaPrincipalImpl(AuthResponse authResponse) {
name = authResponse.getUsername() + "@" + authResponse.getClientId();
super(authResponse.getUsername() + "@" + authResponse.getClientId());

Check warning on line 47 in client/security/src/main/java/org/eclipse/kapua/client/security/bean/KapuaPrincipalImpl.java

View check run for this annotation

Codecov / codecov/patch

client/security/src/main/java/org/eclipse/kapua/client/security/bean/KapuaPrincipalImpl.java#L47 

Added line #L47 was not covered by tests
clientId = authResponse.getClientId();
accessTokenId = authResponse.getAccessTokenId();
userId = KapuaEid.parseCompactId(authResponse.getUserId());
Expand All @@ -61,17 +60,12 @@
* @param clientId
*/
public KapuaPrincipalImpl(KapuaId accountId, String username, String clientId) {
super(username + "@" + clientId);

Check warning on line 63 in client/security/src/main/java/org/eclipse/kapua/client/security/bean/KapuaPrincipalImpl.java

View check run for this annotation

Codecov / codecov/patch

client/security/src/main/java/org/eclipse/kapua/client/security/bean/KapuaPrincipalImpl.java#L63 

Added line #L63 was not covered by tests
internal = true;
this.accountId = accountId;
name = username + "@" + clientId;
this.clientId = clientId;
}

@Override
public String getName() {
return name;
}

@Override
public String getTokenId() {
return accessTokenId;
Expand Down Expand Up @@ -110,7 +104,7 @@
@Override
public int hashCode() {
//name is unique so let's use it for hashing
return (name == null ? 0 : name.hashCode());
return (getName() == null ? 0 : getName().hashCode());
}

@Override
Expand All @@ -125,11 +119,11 @@
return false;
}
KapuaPrincipalImpl other = (KapuaPrincipalImpl) obj;
if (name == null) {
if (other.name != null) {
if (getName() == null) {
if (other.getName() != null) {
return false;
}
} else if (!name.equals(other.name)) {
} else if (!getName().equals(other.getName())) {
return false;
}
return true;
Expand Down
8 changes: 8 additions & 0 deletions consumer/lifecycle-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,14 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/services/org.eclipse.kapua.translator.Translator</resource>
</transformer>

<!-- add by 2.7 -->
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports</resource>
</transformer>
<!--
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.handlers</resource>
Expand Down
8 changes: 8 additions & 0 deletions consumer/telemetry-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,14 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/services/org.eclipse.kapua.translator.Translator</resource>
</transformer>

<!-- add by 2.7 -->
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports</resource>
</transformer>
</transformers>
<artifactSet/>
<outputFile>${project.build.directory}/kapua-consumer-telemetry-${project.version}-app.jar</outputFile>
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
<console.maven.toolchain.jdk.version>8</console.maven.toolchain.jdk.version>

<!-- Dependencies versions -->
<camel.version>3.21.0</camel.version> <!-- latest 3.11.0 -->
<spring.version>5.3.23</spring.version> <!-- latest 5.3.8 -->
<spring-security.version>5.7.5</spring-security.version> <!-- latest 5.5.1 -->
<spring-boot.version>2.5.14</spring-boot.version> <!-- latest 2.5.2 --> <!-- 2.3.x is not fully supported by camel (will be on camel 3.4) -->
<camel.version>3.22.2</camel.version>
<spring.version>5.3.36</spring.version>
<spring-security.version>5.8.12</spring-security.version>
<spring-boot.version>2.7.18</spring-boot.version>

<aopalliance.version>1.0</aopalliance.version>
<artemis.version>2.31.2</artemis.version>
<artemis.version>2.33.0</artemis.version>
<assertj.version>3.2.0</assertj.version>
<checker-framework.version>3.15.0</checker-framework.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
Expand Down
8 changes: 8 additions & 0 deletions service/authentication-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,14 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/services/org.eclipse.kapua.translator.Translator</resource>
</transformer>

<!-- add by 2.7 -->
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports</resource>
</transformer>
</transformers>
<outputFile>${project.build.directory}/kapua-service-authentication-${project.version}-app.jar</outputFile>
</configuration>
Expand Down
Loading