From 17bcca65b5045ee28e7e61f46f3bc640d713ebb0 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 22 Dec 2021 08:52:20 +0100
Subject: [PATCH] OZG-1518 fix repository id, changes for spring-boot update
---
goofy-server/pom.xml | 57 +---
.../de/itvsh/goofy/SecurityConfiguration.java | 8 -
.../main/java/de/itvsh/goofy/WebConfig.java | 7 +
.../src/main/resources/application.yml | 3 +
pom.xml | 281 +-----------------
5 files changed, 17 insertions(+), 339 deletions(-)
diff --git a/goofy-server/pom.xml b/goofy-server/pom.xml
index 1cfe7aa234..842d1d6b73 100644
--- a/goofy-server/pom.xml
+++ b/goofy-server/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
@@ -73,7 +73,7 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
</dependency>
-
+
<!-- log4j -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -162,7 +162,6 @@
<dependency>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
- <version>6.3</version>
</dependency>
<dependency>
@@ -225,35 +224,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- <fork>true</fork>
- <annotationProcessorPaths>
- <path>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- </path>
- <path>
- <groupId>org.mapstruct</groupId>
- <artifactId>mapstruct-processor</artifactId>
- <version>${mapstruct.version}</version>
- </path>
- <!-- other annotation processors -->
- </annotationProcessorPaths>
-
- <showWarnings>true</showWarnings>
- <compilerArgs>
- <compilerArg>
- -Amapstruct.defaultComponentModel=spring
- </compilerArg>
- <compilerArg>
- -Amapstruct.unmappedTargetPolicy=WARN
- </compilerArg>
- </compilerArgs>
- </configuration>
</plugin>
<plugin>
@@ -270,9 +240,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jacoco.args}</argLine>
- </configuration>
+<!-- <configuration> -->
+<!-- <argLine>${surefire.jacoco.args}</argLine> -->
+<!-- </configuration> -->
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
@@ -300,23 +270,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>pl.project13.maven</groupId>
- <artifactId>git-commit-id-plugin</artifactId>
- <configuration>
- <offline>true</offline>
- </configuration>
- <executions>
- <execution>
- <id>get-the-git-infos</id>
- <goals>
- <goal>revision</goal>
- </goals>
- <phase>initialize</phase>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/SecurityConfiguration.java b/goofy-server/src/main/java/de/itvsh/goofy/SecurityConfiguration.java
index 3774ff785b..109df5fa37 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/SecurityConfiguration.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/SecurityConfiguration.java
@@ -1,12 +1,9 @@
package de.itvsh.goofy;
-import org.keycloak.adapters.KeycloakConfigResolver;
-import org.keycloak.adapters.springboot.KeycloakSpringBootConfigResolver;
import org.keycloak.adapters.springsecurity.KeycloakConfiguration;
import org.keycloak.adapters.springsecurity.authentication.KeycloakAuthenticationProvider;
import org.keycloak.adapters.springsecurity.config.KeycloakWebSecurityConfigurerAdapter;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
import org.springframework.http.HttpMethod;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
@@ -61,11 +58,6 @@ public class SecurityConfiguration extends KeycloakWebSecurityConfigurerAdapter
auth.authenticationProvider(keyCloakAuthProvider);
}
- @Bean
- public KeycloakConfigResolver keyCloakConfigResolver() {
- return new KeycloakSpringBootConfigResolver();
- }
-
@Override
protected SessionAuthenticationStrategy sessionAuthenticationStrategy() {
return new NullAuthenticatedSessionStrategy();
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/WebConfig.java b/goofy-server/src/main/java/de/itvsh/goofy/WebConfig.java
index 6e304d9c4e..a2974f341f 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/WebConfig.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/WebConfig.java
@@ -3,6 +3,9 @@ package de.itvsh.goofy;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
+import org.keycloak.adapters.KeycloakConfigResolver;
+import org.keycloak.adapters.springboot.KeycloakSpringBootConfigResolver;
+import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.Resource;
import org.springframework.http.CacheControl;
@@ -38,7 +41,11 @@ public class WebConfig implements WebMvcConfigurer {
: super.getResource("index.html", location);
}
});
+ }
+ @Bean
+ public KeycloakConfigResolver keyCloakConfigResolver() {
+ return new KeycloakSpringBootConfigResolver();
}
}
diff --git a/goofy-server/src/main/resources/application.yml b/goofy-server/src/main/resources/application.yml
index ee75e0ec50..a8cf2c4b0c 100644
--- a/goofy-server/src/main/resources/application.yml
+++ b/goofy-server/src/main/resources/application.yml
@@ -6,6 +6,9 @@ logging:
'[org.keycloak.adapters]': WARN
spring:
+ mvc:
+ pathmatch:
+ matching-strategy: ant-path-matcher
application:
name: Goofy
jackson:
diff --git a/pom.xml b/pom.xml
index d34402cfd9..7cc2f67992 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,12 +8,11 @@
<version>0.18.0-SNAPSHOT</version>
<name>Goofy Parent</name>
<packaging>pom</packaging>
-
+
<parent>
<groupId>de.itvsh.kop</groupId>
<artifactId>kop-common-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath/>
</parent>
<modules>
@@ -24,12 +23,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>17</java.version>
<pluto.version>0.18.0-SNAPSHOT</pluto.version>
- <spring.boot.version>2.4.12</spring.boot.version>
-
<grpc.spring-boot-starter.version>2.12.0.RELEASE</grpc.spring-boot-starter.version>
<spring-admin.version>2.3.1</spring-admin.version>
<mapstruct.version>1.4.2.Final</mapstruct.version>
@@ -43,291 +39,18 @@
<java-jwt.version>3.18.2</java-jwt.version>
<jjwt.version>0.9.1</jjwt.version>
-
- <!-- plugins -->
- <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
- <resources.plugin.version>3.1.0</resources.plugin.version>
- <maven.surefire.version>3.0.0-M5</maven.surefire.version>
- <maven.failsafe.version>3.0.0-M5</maven.failsafe.version>
- <git-comit-id.plugin.version>4.0.3</git-comit-id.plugin.version>
- <sonarqube.version>3.8.2</sonarqube.version>
- <jacoco.plugin.version>0.8.7</jacoco.plugin.version>
-
- <log4j2.version>2.17.0</log4j2.version>
</properties>
<dependencyManagement>
<dependencies>
- <!-- spring -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
-
- <!-- keycloak -->
- <dependency>
- <groupId>org.keycloak.bom</groupId>
- <artifactId>keycloak-adapter-bom</artifactId>
- <version>${keycloak-adapter.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-admin-client</artifactId>
- <version>${keycloak-adapter.version}</version>
- </dependency>
-
- <dependency>
- <groupId>de.codecentric</groupId>
- <artifactId>spring-boot-admin-starter-client</artifactId>
- <version>${spring-admin.version}</version>
- </dependency>
-
- <!-- commons -->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>${commons-beanutils.version}</version>
- </dependency>
-
- <!-- log4j -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring.boot.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-log4j2</artifactId>
- <version>${spring.boot.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jul</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j2.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jul</artifactId>
- <version>${log4j2.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- <version>${log4j2.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- tools -->
- <dependency>
- <groupId>org.mapstruct</groupId>
- <artifactId>mapstruct</artifactId>
- <version>${mapstruct.version}</version>
- </dependency>
- <dependency>
- <groupId>net.devh</groupId>
- <artifactId>grpc-client-spring-boot-starter</artifactId>
- <version>${grpc.spring-boot-starter.version}</version>
- </dependency>
-
<dependency>
<groupId>de.itvsh.ozg.pluto</groupId>
<artifactId>pluto-interface</artifactId>
<version>${pluto.version}</version>
</dependency>
-
- <dependency>
- <groupId>com.thedeanda</groupId>
- <artifactId>lorem</artifactId>
- <version>${lorem.version}</version>
- <scope>test</scope>
- </dependency>
-
-
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- </dependency>
-
- <!-- jwt -->
- <dependency>
- <groupId>com.auth0</groupId>
- <artifactId>java-jwt</artifactId>
- <version>${java-jwt.version}</version>
- </dependency>
- <dependency>
- <groupId>io.jsonwebtoken</groupId>
- <artifactId>jjwt</artifactId>
- <version>${jjwt.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${resources.plugin.version}</version>
- </plugin>
-
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
- <executions>
- <execution>
- <id>repackage</id>
- <goals>
- <goal>repackage</goal>
- </goals>
- </execution>
-
- <execution>
- <id>build info</id>
- <goals>
- <goal>build-info</goal>
- </goals>
- <!-- <configuration> <additionalProperties> <jenkins.build.number>${buildnumber}</jenkins.build.number>
- </additionalProperties> </configuration> -->
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven.surefire.version}</version>
- <configuration>
- <argLine>
- --illegal-access=permit
- </argLine>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.sonarsource.scanner.maven</groupId>
- <artifactId>sonar-maven-plugin</artifactId>
- <version>${sonarqube.version}</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${maven.failsafe.version}</version>
- <configuration>
- <argLine>
- --illegal-access=permit
- </argLine>
- <classesDirectory>${project.build.outputDirectory}</classesDirectory>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>pl.project13.maven</groupId>
- <artifactId>git-commit-id-plugin</artifactId>
- <version>${git-comit-id.plugin.version}</version>
- <configuration>
- <offline>true</offline>
- </configuration>
- <executions>
- <execution>
- <id>get-the-git-infos</id>
- <goals>
- <goal>revision</goal>
- </goals>
- <phase>initialize</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco.plugin.version}</version>
- <executions>
- <execution>
- <id>start-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <propertyName>surefire.jacoco.args</propertyName>
- </configuration>
- </execution>
- <execution>
- <id>generate-report</id>
- <phase>package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<distributionManagement>
<repository>
<id>ozg-nexus</id>
@@ -335,7 +58,7 @@
<url>https://nexus.ozg-sh.de/repository/ozg-releases/</url>
</repository>
<snapshotRepository>
- <id>ozg-nexus</id>
+ <id>ozg-snapshots-nexus</id>
<name>ozg-snapshots</name>
<url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url>
</snapshotRepository>
--
GitLab