Skip to content
Snippets Groups Projects
Commit 995e3b98 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6544: OZG-7191: Commons Update. Fix setup of license plugin

parent 77c8bf61
No related branches found
No related tags found
No related merge requests found
{ {
"name": "alfa", "name": "alfa",
"version": "1.2.0-SNAPSHOT", "version": "1.3.0-SNAPSHOT",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "alfa", "name": "alfa",
"version": "1.2.0-SNAPSHOT", "version": "1.3.0-SNAPSHOT",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@angular/animations": "18.2.8", "@angular/animations": "18.2.8",
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
unter der Lizenz sind dem Lizenztext zu entnehmen. unter der Lizenz sind dem Lizenztext zu entnehmen.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>de.ozgcloud.alfa</groupId> <groupId>de.ozgcloud.alfa</groupId>
...@@ -36,6 +37,7 @@ ...@@ -36,6 +37,7 @@
<artifactId>alfa-client</artifactId> <artifactId>alfa-client</artifactId>
<name>Alfa Client</name> <name>Alfa Client</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<inceptionYear>2020</inceptionYear>
<build> <build>
<plugins> <plugins>
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<artifactId>alfa-server</artifactId> <artifactId>alfa-server</artifactId>
<name>Alfa Server</name> <name>Alfa Server</name>
<inceptionYear>2020</inceptionYear>
<properties> <properties>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
<name>Alfa Service</name> <name>Alfa Service</name>
<description>Alfa Service implementation</description> <description>Alfa Service implementation</description>
<packaging>jar</packaging> <packaging>jar</packaging>
<inceptionYear>2020</inceptionYear>
<properties> <properties>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
......
...@@ -13,11 +13,9 @@ import org.springframework.context.annotation.Configuration; ...@@ -13,11 +13,9 @@ import org.springframework.context.annotation.Configuration;
net.devh.boot.grpc.client.autoconfigure.GrpcClientMetricAutoConfiguration.class, net.devh.boot.grpc.client.autoconfigure.GrpcClientMetricAutoConfiguration.class,
net.devh.boot.grpc.client.autoconfigure.GrpcClientHealthAutoConfiguration.class, net.devh.boot.grpc.client.autoconfigure.GrpcClientHealthAutoConfiguration.class,
net.devh.boot.grpc.client.autoconfigure.GrpcClientSecurityAutoConfiguration.class, net.devh.boot.grpc.client.autoconfigure.GrpcClientSecurityAutoConfiguration.class,
net.devh.boot.grpc.client.autoconfigure.GrpcClientTraceAutoConfiguration.class,
net.devh.boot.grpc.client.autoconfigure.GrpcDiscoveryClientAutoConfiguration.class, net.devh.boot.grpc.client.autoconfigure.GrpcDiscoveryClientAutoConfiguration.class,
net.devh.boot.grpc.common.autoconfigure.GrpcCommonCodecAutoConfiguration.class, net.devh.boot.grpc.common.autoconfigure.GrpcCommonCodecAutoConfiguration.class,
net.devh.boot.grpc.common.autoconfigure.GrpcCommonTraceAutoConfiguration.class
}) })
public class GrpcConfiguration { public class GrpcConfiguration {
} }
...@@ -73,7 +73,7 @@ public class JwtTokenUtil { ...@@ -73,7 +73,7 @@ public class JwtTokenUtil {
} }
public Optional<Claims> getAllClaimsFromToken(String token) { public Optional<Claims> getAllClaimsFromToken(String token) {
return Optional.of(Jwts.parser().setSigningKey(downloadTokenProperties.getSecret().getBytes()).parseClaimsJws(token).getBody()); return Optional.of(Jwts.parser().setSigningKey(downloadTokenProperties.getSecret().getBytes()).build().parseSignedClaims(token).getPayload());
} }
public List<SimpleGrantedAuthority> getRolesFromToken(String token) { public List<SimpleGrantedAuthority> getRolesFromToken(String token) {
......
...@@ -105,7 +105,7 @@ class JwtTokenUtilTest { ...@@ -105,7 +105,7 @@ class JwtTokenUtilTest {
} }
private Claims getParsedBody() { private Claims getParsedBody() {
return Jwts.parser().setSigningKey(TOKEN_SECRET.getBytes()).parseClaimsJws(generatedToken).getBody(); return Jwts.parser().setSigningKey(TOKEN_SECRET.getBytes()).build().parseSignedClaims(generatedToken).getPayload();
} }
} }
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<parent> <parent>
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId> <artifactId>ozgcloud-common-parent</artifactId>
<version>4.3.2</version> <version>4.6.0</version>
</parent> </parent>
<groupId>de.ozgcloud.alfa</groupId> <groupId>de.ozgcloud.alfa</groupId>
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
<version>2.17.0-SNAPSHOT</version> <version>2.17.0-SNAPSHOT</version>
<name>Alfa Parent</name> <name>Alfa Parent</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<inceptionYear>2020</inceptionYear>
<modules> <modules>
<module>alfa-client</module> <module>alfa-client</module>
...@@ -53,12 +54,12 @@ ...@@ -53,12 +54,12 @@
<vorgang-manager.version>2.13.0</vorgang-manager.version> <vorgang-manager.version>2.13.0</vorgang-manager.version>
<nachrichten-manager.version>2.11.0</nachrichten-manager.version> <nachrichten-manager.version>2.11.0</nachrichten-manager.version>
<ozgcloud-common-pdf.version>3.0.1</ozgcloud-common-pdf.version> <ozgcloud-common-pdf.version>3.0.1</ozgcloud-common-pdf.version>
<user-manager.version>2.8.0</user-manager.version> <user-manager.version>2.12.0-SNAPSHOT</user-manager.version>
<zufi-manager.version>1.5.0</zufi-manager.version> <zufi-manager.version>1.6.0-SNAPSHOT</zufi-manager.version>
<spring-cloud-config-client.version>4.1.3</spring-cloud-config-client.version> <spring-cloud-config-client.version>4.1.3</spring-cloud-config-client.version>
<!-- TODO: die Version über ozgcloud-common ziehen --> <!-- TODO: die Version über ozgcloud-common ziehen -->
<jjwt.version>0.11.5</jjwt.version> <jjwt.version>0.12.6</jjwt.version>
</properties> </properties>
<build> <build>
...@@ -67,32 +68,6 @@ ...@@ -67,32 +68,6 @@
<plugin> <plugin>
<groupId>com.mycila</groupId> <groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<version>4.1</version>
<configuration>
<mapping>
<ts>SLASHSTAR_STYLE</ts>
<config>SCRIPT_STYLE</config>
</mapping>
<licenseSets>
<licenseSet>
<header>license/eupl_v1_2_de/header.txt</header>
<excludes>
<exclude>**/README</exclude>
<exclude>src/test/resources/**</exclude>
<exclude>src/main/resources/**</exclude>
<exclude>**/alfa-e2e/reports/videos/**</exclude>
<exclude>**/.angular/cache/**</exclude>
</excludes>
</licenseSet>
</licenseSets>
</configuration>
<dependencies>
<dependency>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-license</artifactId>
<version>${ozgcloud.license.version}</version>
</dependency>
</dependencies>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment