From 6e15f05972f4bbe67b6d5f67119df9739cf992f6 Mon Sep 17 00:00:00 2001
From: Tobias Bruns <tobias.bruns@mgm-tp.com>
Date: Fri, 3 Jan 2025 14:31:32 +0100
Subject: [PATCH] OZG-6988 fix dependency track version; cleanup pom

---
 Jenkinsfile                                   |  2 +-
 pom.xml                                       | 58 +------------------
 ...dministrationRepositoryRestConfigurer.java |  5 --
 3 files changed, 2 insertions(+), 63 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 060abb0d..8cc0e69e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -246,7 +246,7 @@ String buildVersionNameWithoutCommidId() {
 	if (isReleaseBranch()) {
         return getPomVersion()
     }
-    return "${getPomVersion()}-${validateBranchName(env.BRANCH_NAME)}}".replaceAll("_", "-")
+    return "${getPomVersion()}-${validateBranchName(env.BRANCH_NAME)}".replaceAll("_", "-")
 }
 
 String getPomVersion() {
diff --git a/pom.xml b/pom.xml
index 57499b2f..0471331b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,6 @@
 		<testcontainers-keycloak.version>3.3.1</testcontainers-keycloak.version>
 
 		<mongock.version>5.4.0</mongock.version>
-		<lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
 
 		<zufi-manager.version>1.6.0</zufi-manager.version>
 		<shedlock.version>5.16.0</shedlock.version>
@@ -271,6 +270,7 @@
 				</plugin>
 			</plugins>
 		</pluginManagement>
+		
 		<plugins>
 			<plugin>
 				<groupId>org.sonarsource.scanner.maven</groupId>
@@ -287,66 +287,10 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<!--
-				<configuration>
-					<image>
-						<name>${imageName}:${imageTag}</name>
-						<publish>${publishImage}</publish>
-					</image>
-					<docker>
-						<publishRegistry>
-							<username>${docker.publishRegistry.username}</username>
-							<password>${docker.publishRegistry.password}</password>
-						</publishRegistry>
-					</docker>
-					<excludes>
-						<exclude>
-							<groupId>org.projectlombok</groupId>
-							<artifactId>lombok</artifactId>
-						</exclude>
-					</excludes>
-				</configuration>
-				<executions>
-					<execution>
-						<id>build-info</id>
-						<goals>
-							<goal>build-info</goal>
-						</goals>
-						<configuration>
-							<additionalProperties>
-								<number>${build.number}</number>
-							</additionalProperties>
-						</configuration>
-					</execution>
-				</executions>-->
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-<!--				<configuration>-->
-<!--					<annotationProcessorPaths>-->
-<!--						<path>-->
-<!--							<groupId>org.mapstruct</groupId>-->
-<!--							<artifactId>mapstruct-processor</artifactId>-->
-<!--							<version>${mapstruct.version}</version>-->
-<!--						</path>-->
-<!--						<path>-->
-<!--							<groupId>org.projectlombok</groupId>-->
-<!--							<artifactId>lombok</artifactId>-->
-<!--							<version>${lombok.version}</version>-->
-<!--						</path>-->
-<!--						<path>-->
-<!--							<groupId>org.projectlombok</groupId>-->
-<!--							<artifactId>lombok-mapstruct-binding</artifactId>-->
-<!--							<version>${lombok-mapstruct-binding.version}</version>-->
-<!--						</path>-->
-<!--						   <path>-->
-<!--						    <groupId>org.springframework.boot</groupId>-->
-<!--						    <artifactId>spring-boot-configuration-processor</artifactId>-->
-<!--						    <version>3.3.6</version>-->
-<!--						  </path>-->
-<!--					</annotationProcessorPaths>-->
-<!--				</configuration>-->
 			</plugin>
 		</plugins>
 	</build>
diff --git a/src/main/java/de/ozgcloud/admin/AdministrationRepositoryRestConfigurer.java b/src/main/java/de/ozgcloud/admin/AdministrationRepositoryRestConfigurer.java
index 99d1d43f..277a9713 100644
--- a/src/main/java/de/ozgcloud/admin/AdministrationRepositoryRestConfigurer.java
+++ b/src/main/java/de/ozgcloud/admin/AdministrationRepositoryRestConfigurer.java
@@ -33,11 +33,6 @@ import org.springframework.validation.beanvalidation.SpringValidatorAdapter;
 @Configuration
 public class AdministrationRepositoryRestConfigurer implements RepositoryRestConfigurer {
 
-//	@Override
-//	public void configureRepositoryRestConfiguration(RepositoryRestConfiguration config, CorsRegistry cors) {
-//		config.setLinkRelationProvider(new DefaultLinkRelationProvider());
-//	}
-
 	@Override
 	public void configureValidatingRepositoryEventListener(ValidatingRepositoryEventListener listener) {
 		var validator = Validation.buildDefaultValidatorFactory().getValidator();
-- 
GitLab