Skip to content
Snippets Groups Projects
Commit 6e15f059 authored by Tobias Bruns's avatar Tobias Bruns
Browse files

OZG-6988 fix dependency track version; cleanup pom

parent 2d672467
No related branches found
No related tags found
1 merge request!3Ozg 6988 add reporting
This commit is part of merge request !3. Comments created here will be created in the context of that merge request.
...@@ -246,7 +246,7 @@ String buildVersionNameWithoutCommidId() { ...@@ -246,7 +246,7 @@ String buildVersionNameWithoutCommidId() {
if (isReleaseBranch()) { if (isReleaseBranch()) {
return getPomVersion() return getPomVersion()
} }
return "${getPomVersion()}-${validateBranchName(env.BRANCH_NAME)}}".replaceAll("_", "-") return "${getPomVersion()}-${validateBranchName(env.BRANCH_NAME)}".replaceAll("_", "-")
} }
String getPomVersion() { String getPomVersion() {
......
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
<testcontainers-keycloak.version>3.3.1</testcontainers-keycloak.version> <testcontainers-keycloak.version>3.3.1</testcontainers-keycloak.version>
<mongock.version>5.4.0</mongock.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> <zufi-manager.version>1.6.0</zufi-manager.version>
<shedlock.version>5.16.0</shedlock.version> <shedlock.version>5.16.0</shedlock.version>
...@@ -271,6 +270,7 @@ ...@@ -271,6 +270,7 @@
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.sonarsource.scanner.maven</groupId> <groupId>org.sonarsource.scanner.maven</groupId>
...@@ -287,66 +287,10 @@ ...@@ -287,66 +287,10 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <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>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <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> </plugin>
</plugins> </plugins>
</build> </build>
......
...@@ -33,11 +33,6 @@ import org.springframework.validation.beanvalidation.SpringValidatorAdapter; ...@@ -33,11 +33,6 @@ import org.springframework.validation.beanvalidation.SpringValidatorAdapter;
@Configuration @Configuration
public class AdministrationRepositoryRestConfigurer implements RepositoryRestConfigurer { public class AdministrationRepositoryRestConfigurer implements RepositoryRestConfigurer {
// @Override
// public void configureRepositoryRestConfiguration(RepositoryRestConfiguration config, CorsRegistry cors) {
// config.setLinkRelationProvider(new DefaultLinkRelationProvider());
// }
@Override @Override
public void configureValidatingRepositoryEventListener(ValidatingRepositoryEventListener listener) { public void configureValidatingRepositoryEventListener(ValidatingRepositoryEventListener listener) {
var validator = Validation.buildDefaultValidatorFactory().getValidator(); var validator = Validation.buildDefaultValidatorFactory().getValidator();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment