diff --git a/ozgcloud-common-parent/pom.xml b/ozgcloud-common-parent/pom.xml index 7b0866e5a685f33b6e9b23c288d7123354dc7d11..df2d74907b4f4ee385d253b4d665df0e979ceebc 100644 --- a/ozgcloud-common-parent/pom.xml +++ b/ozgcloud-common-parent/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>3.3.7</version> + <version>3.4.1</version> <relativePath /> </parent> @@ -81,7 +81,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>3.0.5</version> + <version>${spring-boot.version}</version> <exclusions> <exclusion> <groupId>org.springframework.boot</groupId> @@ -220,12 +220,12 @@ </env> </image> <docker> - <publishRegistry> - <username>${docker.publishRegistry.username}</username> - <password>${docker.publishRegistry.password}</password> - <url>${docker.publishRegistry.url}</url> - </publishRegistry> - </docker> + <publishRegistry> + <username>${docker.publishRegistry.username}</username> + <password>${docker.publishRegistry.password}</password> + <url>${docker.publishRegistry.url}</url> + </publishRegistry> + </docker> </configuration> <executions> <execution> @@ -375,7 +375,8 @@ <dependencyTrackBaseUrl>https://dependency-track.ozg-sh.de</dependencyTrackBaseUrl> <failOnError>true</failOnError> <createProject>true</createProject> - <bomLocation>${project.build.outputDirectory}/META-INF/sbom/application.cdx.json</bomLocation> + <bomLocation> + ${project.build.outputDirectory}/META-INF/sbom/application.cdx.json</bomLocation> </configuration> </plugin> </plugins> @@ -428,45 +429,45 @@ </snapshotRepository> </distributionManagement> -<profiles> - <profile> - <id>ci-build</id> - <build> - <plugins> - <plugin> - <groupId>io.github.pmckeown</groupId> - <artifactId>dependency-track-maven-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.cyclonedx</groupId> - <artifactId>cyclonedx-maven-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>makeAggregateBom</goal> - <goal>makeBom</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>${project.build.outputDirectory}/META-INF/sbom</directory> - <includes> - <include>application.cdx.json</include> - </includes> - <targetPath>META-INF/sbom</targetPath> - </resource> - </resources> - </build> - </profile> -</profiles> + <profiles> + <profile> + <id>ci-build</id> + <build> + <plugins> + <plugin> + <groupId>io.github.pmckeown</groupId> + <artifactId>dependency-track-maven-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.cyclonedx</groupId> + <artifactId>cyclonedx-maven-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>makeAggregateBom</goal> + <goal>makeBom</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>${project.build.outputDirectory}/META-INF/sbom</directory> + <includes> + <include>application.cdx.json</include> + </includes> + <targetPath>META-INF/sbom</targetPath> + </resource> + </resources> + </build> + </profile> + </profiles> </project> \ No newline at end of file