diff --git a/ozgcloud-common-dependencies/pom.xml b/ozgcloud-common-dependencies/pom.xml index 9b308279f4b58c87d223e1c842407b911c0ac1ce..1da8d8ba39924aaae17bb3ae2ab067402cd066bd 100644 --- a/ozgcloud-common-dependencies/pom.xml +++ b/ozgcloud-common-dependencies/pom.xml @@ -48,8 +48,8 @@ <maven.compiler.target>${java.version}</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <spring-boot.version>3.3.6</spring-boot.version> - <spring.version>6.1.15</spring.version> + <spring-boot.version>3.3.7</spring-boot.version> + <spring.version>6.1.16</spring.version> <grpc.spring-boot-starter.version>5.1.5</grpc.spring-boot-starter.version> diff --git a/ozgcloud-common-parent/pom.xml b/ozgcloud-common-parent/pom.xml index 51718f343dab04d014c39156e500924a69e884cf..bf79fcad84060c693ac3ac75979029b3d32dca7d 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.6</version> + <version>3.3.7</version> <relativePath /> </parent> @@ -50,10 +50,10 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <ozgcloud-common.version>4.8.0-SNAPSHOT</ozgcloud-common.version> - <ozgcloud.license.version>1.11.0-SNAPSHOT</ozgcloud.license.version> + <ozgcloud.license.version>1.10.0</ozgcloud.license.version> <mapstruct.version>1.6.0</mapstruct.version> - <spring-boot.version>3.3.6</spring-boot.version> + <spring-boot.version>3.3.7</spring-boot.version> <!-- plugins --> <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version> @@ -378,20 +378,6 @@ <version>${rewrite.plugin.version}</version> </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> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> @@ -405,19 +391,6 @@ </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> <distributionManagement> @@ -445,4 +418,45 @@ </snapshotRepository> </distributionManagement> +<profiles> + <profile> + <id>ci</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