diff --git a/alfa-client/package-lock.json b/alfa-client/package-lock.json
index 25a05fca0216901f24fa10cabc5db677d76ee6f2..04d669b344edd35238983c2f5560fc9939058646 100644
--- a/alfa-client/package-lock.json
+++ b/alfa-client/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "alfa",
- "version": "1.2.0-SNAPSHOT",
+ "version": "1.3.0-SNAPSHOT",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "alfa",
- "version": "1.2.0-SNAPSHOT",
+ "version": "1.3.0-SNAPSHOT",
"license": "MIT",
"dependencies": {
"@angular/animations": "18.2.8",
diff --git a/alfa-client/pom.xml b/alfa-client/pom.xml
index bc81db6f0027dec1daf0f85400b260d2e7a65201..3febc3da6d78398f1f339b6f8bd01aef9431593b 100644
--- a/alfa-client/pom.xml
+++ b/alfa-client/pom.xml
@@ -24,111 +24,113 @@
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>
- <groupId>de.ozgcloud.alfa</groupId>
- <artifactId>alfa</artifactId>
- <version>2.17.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>de.ozgcloud.alfa</groupId>
+ <artifactId>alfa</artifactId>
+ <version>2.17.0-SNAPSHOT</version>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>alfa-client</artifactId>
- <name>Alfa Client</name>
- <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>alfa-client</artifactId>
+ <name>Alfa Client</name>
+ <packaging>pom</packaging>
+ <inceptionYear>2020</inceptionYear>
- <build>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>dist</directory>
+ <includes>
+ <include>*</include>
+ <include>**/*</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <id>test-application</id>
+ <phase>test</phase>
+ <configuration>
+ <workingDirectory>./</workingDirectory>
+ <executable>npm</executable>
+ <arguments>
+ <argument>run</argument>
+ <argument>test</argument>
+ </arguments>
+ <skip>${skipTests}</skip>
+ </configuration>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>build-application</id>
+ <phase>compile</phase>
+ <configuration>
+ <workingDirectory>./</workingDirectory>
+ <executable>npm</executable>
+ <arguments>
+ <argument>run</argument>
+ <argument>ci-build</argument>
+ </arguments>
+ </configuration>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <activation>
+ <property>
+ <name>!skipNpmInstall</name>
+ </property>
+ </activation>
+ <id>npmInstall</id>
+ <build>
<plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <id>install-dependencies</id>
+ <phase>generate-sources</phase>
<configuration>
- <filesets>
- <fileset>
- <directory>dist</directory>
- <includes>
- <include>*</include>
- <include>**/*</include>
- </includes>
- </fileset>
- </filesets>
+ <workingDirectory>./</workingDirectory>
+ <executable>npm</executable>
+ <arguments>
+ <argument>install</argument>
+ </arguments>
</configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <id>test-application</id>
- <phase>test</phase>
- <configuration>
- <workingDirectory>./</workingDirectory>
- <executable>npm</executable>
- <arguments>
- <argument>run</argument>
- <argument>test</argument>
- </arguments>
- <skip>${skipTests}</skip>
- </configuration>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- <execution>
- <id>build-application</id>
- <phase>compile</phase>
- <configuration>
- <workingDirectory>./</workingDirectory>
- <executable>npm</executable>
- <arguments>
- <argument>run</argument>
- <argument>ci-build</argument>
- </arguments>
- </configuration>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <activation>
- <property>
- <name>!skipNpmInstall</name>
- </property>
- </activation>
- <id>npmInstall</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <id>install-dependencies</id>
- <phase>generate-sources</phase>
- <configuration>
- <workingDirectory>./</workingDirectory>
- <executable>npm</executable>
- <arguments>
- <argument>install</argument>
- </arguments>
- </configuration>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/alfa-server/pom.xml b/alfa-server/pom.xml
index 0e525317561ed9079b2ab7d835095f12c8bad3e9..cff63ab248d9cb1e6efab5b6e0966d541089c81e 100644
--- a/alfa-server/pom.xml
+++ b/alfa-server/pom.xml
@@ -10,6 +10,7 @@
<artifactId>alfa-server</artifactId>
<name>Alfa Server</name>
+ <inceptionYear>2020</inceptionYear>
<properties>
<maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/alfa-service/pom.xml b/alfa-service/pom.xml
index 93c8b05cf47e11929e6e9dd39f0cb4001c893e81..a5e3144088d89ef679170ab93b93d6f2e97fb441 100644
--- a/alfa-service/pom.xml
+++ b/alfa-service/pom.xml
@@ -38,6 +38,7 @@
<name>Alfa Service</name>
<description>Alfa Service implementation</description>
<packaging>jar</packaging>
+ <inceptionYear>2020</inceptionYear>
<properties>
<maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/GrpcConfiguration.java b/alfa-service/src/main/java/de/ozgcloud/alfa/GrpcConfiguration.java
index 97cac2f8ea30484287afa30ab96bf522d1034bd9..c2465218de5d0d97a0065a2112607497632131ab 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/GrpcConfiguration.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/GrpcConfiguration.java
@@ -13,11 +13,9 @@ import org.springframework.context.annotation.Configuration;
net.devh.boot.grpc.client.autoconfigure.GrpcClientMetricAutoConfiguration.class,
net.devh.boot.grpc.client.autoconfigure.GrpcClientHealthAutoConfiguration.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.common.autoconfigure.GrpcCommonCodecAutoConfiguration.class,
- net.devh.boot.grpc.common.autoconfigure.GrpcCommonTraceAutoConfiguration.class
})
public class GrpcConfiguration {
}
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/JwtTokenUtil.java b/alfa-service/src/main/java/de/ozgcloud/alfa/JwtTokenUtil.java
index 00cf59574f2d66748cdca97065e1104073e74868..1478ecbd5b6770353999c7950476f0552332a1f2 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/JwtTokenUtil.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/JwtTokenUtil.java
@@ -73,7 +73,7 @@ public class JwtTokenUtil {
}
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) {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/JwtTokenUtilTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/JwtTokenUtilTest.java
index 3f1cec61922fc4b62939c88a165ad734fe72a023..c05212e3b1aff78136eb19a4dde41110557080cc 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/JwtTokenUtilTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/JwtTokenUtilTest.java
@@ -105,7 +105,7 @@ class JwtTokenUtilTest {
}
private Claims getParsedBody() {
- return Jwts.parser().setSigningKey(TOKEN_SECRET.getBytes()).parseClaimsJws(generatedToken).getBody();
+ return Jwts.parser().setSigningKey(TOKEN_SECRET.getBytes()).build().parseSignedClaims(generatedToken).getPayload();
}
}
diff --git a/pom.xml b/pom.xml
index 5067c9c7799b3515533c79ca1a33dc45c85b2765..0d11e583143e4c12668b0c4391494d3abce95ecb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>4.3.2</version>
+ <version>4.6.0</version>
</parent>
<groupId>de.ozgcloud.alfa</groupId>
@@ -38,6 +38,7 @@
<version>2.17.0-SNAPSHOT</version>
<name>Alfa Parent</name>
<packaging>pom</packaging>
+ <inceptionYear>2020</inceptionYear>
<modules>
<module>alfa-client</module>
@@ -53,12 +54,12 @@
<vorgang-manager.version>2.13.0</vorgang-manager.version>
<nachrichten-manager.version>2.11.0</nachrichten-manager.version>
<ozgcloud-common-pdf.version>3.0.1</ozgcloud-common-pdf.version>
- <user-manager.version>2.8.0</user-manager.version>
- <zufi-manager.version>1.5.0</zufi-manager.version>
+ <user-manager.version>2.12.0-SNAPSHOT</user-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>
<!-- TODO: die Version über ozgcloud-common ziehen -->
- <jjwt.version>0.11.5</jjwt.version>
+ <jjwt.version>0.12.6</jjwt.version>
</properties>
<build>
@@ -67,32 +68,6 @@
<plugin>
<groupId>com.mycila</groupId>
<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>
</plugins>
</pluginManagement>