Merge pull request #14703 from panos-kakos/JAVA-24377

[JAVA-24377] Clean up
This commit is contained in:
Kasra Madadipouya 2023-09-03 23:53:00 +02:00 committed by GitHub
commit 09b4688925
23 changed files with 78 additions and 56 deletions

View File

@ -49,7 +49,6 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<!-- Treiber: nicht gegen diese API programmieren, erst zur Laufzeit benötigt -->
<scope>runtime</scope>
</dependency>
<dependency>

View File

@ -23,7 +23,7 @@
<dependency>
<groupId>com.amazonaws.serverless</groupId>
<artifactId>aws-serverless-java-container-springboot2</artifactId>
<version>${springboot2.aws.version}</version>
<version>${aws-serverless-java-container-springboot2.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@ -64,16 +64,18 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>11</source>
<target>11</target>
<source>${maven.compiler.source.version}</source>
<target>${maven.compiler.target.version}</target>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<springboot2.aws.version>1.9.1</springboot2.aws.version>
<aws-serverless-java-container-springboot2.version>1.9.1</aws-serverless-java-container-springboot2.version>
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
<maven.compiler.source.version>11</maven.compiler.source.version>
<maven.compiler.target.version>11</maven.compiler.target.version>
</properties>
</project>

View File

@ -34,7 +34,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version>
<version>${jacoco-maven-plugin.version}</version>
<executions>
<execution>
<id>default-prepare-agent</id>
@ -65,7 +65,7 @@
<plugin>
<groupId>com.heroku.sdk</groupId>
<artifactId>heroku-maven-plugin</artifactId>
<version>3.0.2</version>
<version>${heroku-maven-plugin.version}</version>
<configuration>
<appName>spring-boot-ci-cd</appName>
<processTypes>
@ -88,7 +88,7 @@
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.2.0</version>
<version>${jib-maven-plugin.version}</version>
<configuration>
<to>
<image>registry.hub.docker.com/baeldungjib/baeldung-ci-cd-process</image>
@ -104,4 +104,10 @@
</profile>
</profiles>
<properties>
<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
<heroku-maven-plugin.version>3.0.2</heroku-maven-plugin.version>
<jib-maven-plugin.version>2.2.0</jib-maven-plugin.version>
</properties>
</project>

View File

@ -6,7 +6,6 @@
<artifactId>spring-boot-cli</artifactId>
<name>spring-boot-cli</name>
<packaging>jar</packaging>
<description></description>
<parent>
<groupId>com.baeldung.spring-boot-modules</groupId>

View File

@ -59,7 +59,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<version>${maven-assembly-plugin.version}</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
@ -78,4 +78,8 @@
</plugins>
</build>
<properties>
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
</properties>
</project>

View File

@ -27,7 +27,7 @@
<dependency>
<groupId>com.amazonaws.secretsmanager</groupId>
<artifactId>aws-secretsmanager-jdbc</artifactId>
<version>${aws.secrets.manager.jdbc}</version>
<version>${aws-secretsmanager-jdbc.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
@ -46,7 +46,7 @@
<dependency>
<groupId>io.awspring.cloud</groupId>
<artifactId>spring-cloud-starter-aws-secrets-manager-config</artifactId>
<version>${aws.secrets.manager.config}</version>
<version>${spring-cloud-starter-aws-secrets-manager-config.version}</version>
</dependency>
</dependencies>
@ -60,8 +60,8 @@
</build>
<properties>
<aws.secrets.manager.config>2.4.4</aws.secrets.manager.config>
<aws.secrets.manager.jdbc>1.0.11</aws.secrets.manager.jdbc>
<spring-cloud-starter-aws-secrets-manager-config.version>2.4.4</spring-cloud-starter-aws-secrets-manager-config.version>
<aws-secretsmanager-jdbc.version>1.0.11</aws-secretsmanager-jdbc.version>
</properties>
</project>

View File

@ -113,7 +113,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.18</version>
<version>${maven-failsafe-plugin.version}</version>
<executions>
<!-- Invokes both the integration-test and the verify goals -->
<!-- of the Failsafe Maven plugin -->
@ -181,6 +181,7 @@
<jpa.version>2.2</jpa.version>
<subethasmtp.version>3.1.7</subethasmtp.version>
<httpclient.version>4.5.8</httpclient.version>
<maven-failsafe-plugin.version>2.18</maven-failsafe-plugin.version>
</properties>
</project>

View File

@ -48,7 +48,7 @@
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-core-jakarta</artifactId>
<version>${swagger-core.version}</version>
<version>${swagger-core-jakarta.version}</version>
</dependency>
<dependency>
<groupId>io.github.springwolf</groupId>
@ -92,7 +92,7 @@
</build>
<properties>
<swagger-core.version>2.2.11</swagger-core.version>
<swagger-core-jakarta.version>2.2.11</swagger-core-jakarta.version>
<springwolf-kafka.version>0.12.1</springwolf-kafka.version>
<springwolf-ui.version>0.8.0</springwolf-ui.version>
<testcontainers-kafka.version>1.18.3</testcontainers-kafka.version>

View File

@ -18,7 +18,7 @@
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
<version>1.7.0</version>
<version>${os-maven-plugin.version}</version>
</extension>
</extensions>
<plugins>
@ -43,17 +43,6 @@
</plugins>
</build>
<properties>
<protobuf.version>3.19.2</protobuf.version>
<protobuf-plugin.version>0.6.1</protobuf-plugin.version>
<grpc.version>1.43.2</grpc.version>
<grpc.spring.version>2.13.1.RELEASE</grpc.spring.version>
<jsonassert.version>1.5.1</jsonassert.version>
<jakarta.annotation.version>1.3.5</jakarta.annotation.version>
<os-maven-plugin.version>1.6.2</os-maven-plugin.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@ -88,7 +77,7 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotation.version}</version>
<version>${jakarta.annotation-api.version}</version>
<optional>true</optional>
</dependency>
<dependency>
@ -119,4 +108,16 @@
</dependency>
</dependencies>
<properties>
<protobuf.version>3.19.2</protobuf.version>
<protobuf-plugin.version>0.6.1</protobuf-plugin.version>
<grpc.version>1.43.2</grpc.version>
<grpc.spring.version>2.13.1.RELEASE</grpc.spring.version>
<jsonassert.version>1.5.1</jsonassert.version>
<jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
<os-maven-plugin.version>1.6.2</os-maven-plugin.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
<os-maven-plugin.version>1.7.0</os-maven-plugin.version>
</properties>
</project>

View File

@ -50,7 +50,7 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>1.9.0</version>
<version>${gmavenplus-plugin.version}</version>
<executions>
<execution>
<goals>
@ -72,6 +72,7 @@
<properties>
<start-class>com.baeldung.springwithgroovy.SpringBootGroovyApplication</start-class>
<groovy.version>3.0.13</groovy.version>
<gmavenplus-plugin.version>1.9.0</gmavenplus-plugin.version>
</properties>
</project>

View File

@ -46,10 +46,6 @@
</plugins>
</build>
<properties>
<jasypt.version>2.0.0</jasypt.version>
</properties>
<repositories>
<repository>
<id>spring-milestone</id>
@ -57,4 +53,8 @@
<url>https://repo.spring.io/milestone</url>
</repository>
</repositories>
<properties>
<jasypt.version>2.0.0</jasypt.version>
</properties>
</project>

View File

@ -17,10 +17,6 @@
<relativePath>../../parent-boot-2</relativePath>
</parent>
<properties>
<keycloak.version>21.0.1</keycloak.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@ -88,4 +84,8 @@
</plugins>
</build>
<properties>
<keycloak.version>21.0.1</keycloak.version>
</properties>
</project>

View File

@ -55,7 +55,7 @@
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<version>1.6.3</version>
<version>${wsdl4j.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@ -105,6 +105,7 @@
<properties>
<start-class>com.baeldung.keycloak.SpringBoot</start-class>
<jaxb-runtime.version>4.0.0</jaxb-runtime.version>
<wsdl4j.version>1.6.3</wsdl4j.version>
<jaxb2-maven-plugin.version>2.5.0</jaxb2-maven-plugin.version>
</properties>

View File

@ -47,7 +47,7 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.10</version>
<version>${commons-configuration.version}</version>
</dependency>
</dependencies>
@ -68,6 +68,7 @@
<spring.fox.version>3.0.0</spring.fox.version>
<start-class>com.baeldung.springboot.swagger.ArticleApplication</start-class>
<spring-cloud.version>2021.0.5</spring-cloud.version>
<commons-configuration.version>1.10</commons-configuration.version>
</properties>
</project>

View File

@ -25,7 +25,7 @@
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>chaos-monkey-spring-boot</artifactId>
<version>${chaos.monkey.version}</version>
<version>${chaos-monkey-spring-boot.version}</version>
</dependency>
</dependencies>
@ -48,7 +48,7 @@
<properties>
<!-- The main class to start by executing java -jar -->
<start-class>com.baeldung.lazyinitialization.Application</start-class>
<chaos.monkey.version>2.0.0</chaos.monkey.version>
<chaos-monkey-spring-boot.version>2.0.0</chaos-monkey-spring-boot.version>
</properties>
</project>

View File

@ -30,7 +30,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
<version>${commons-lang.version}</version>
</dependency>
</dependencies>

View File

@ -56,7 +56,7 @@
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<version>${maven-resources-plugin.version}</version>
<executions>
<execution>
<id>copy-resources</id>
@ -135,6 +135,7 @@
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
<frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
<node.version>v14.18.0</node.version>
<yarn.version>v1.12.1</yarn.version>

View File

@ -44,13 +44,13 @@
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
<version>0.7.3</version>
<version>${embedded-redis.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webflux</artifactId>
<version>6.0.3</version>
<version>${spring-webflux.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@ -74,6 +74,8 @@
<properties>
<java.version>15</java.version>
<spring-webflux.version>6.0.3</spring-webflux.version>
<embedded-redis.version>0.7.3</embedded-redis.version>
</properties>
</project>

View File

@ -20,12 +20,12 @@
<dependency>
<groupId>org.telegram</groupId>
<artifactId>telegrambots-spring-boot-starter</artifactId>
<version>6.7.0</version>
<version>${telegrambots.version}</version>
</dependency>
<dependency>
<groupId>org.telegram</groupId>
<artifactId>telegrambots-abilities</artifactId>
<version>6.7.0</version>
<version>${telegrambots.version}</version>
</dependency>
</dependencies>
@ -40,6 +40,7 @@
<properties>
<java.version>17</java.version>
<telegrambots.version>6.7.0</telegrambots.version>
</properties>
</project>

View File

@ -43,7 +43,7 @@
<dependency>
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-test</artifactId>
<version>3.1.3</version>
<version>${spring-ws-test.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@ -75,7 +75,7 @@
<dependency>
<groupId>com.redis.testcontainers</groupId>
<artifactId>testcontainers-redis-junit-jupiter</artifactId>
<version>1.4.6</version>
<version>${testcontainers-redis-junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@ -85,7 +85,7 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.15.1</version>
<version>${maven-jaxb2-plugin.version}</version>
<executions>
<execution>
<id>xjc</id>
@ -107,8 +107,11 @@
<properties>
<start-class>com.baeldung.boot.Application</start-class>
<spring-ws-test.version>3.1.3</spring-ws-test.version>
<testcontainers.version>1.17.2</testcontainers.version>
<testcontainers-keycloak.version>1.10.0</testcontainers-keycloak.version>
<testcontainers-redis-junit-jupiter.version>1.4.6</testcontainers-redis-junit-jupiter.version>
<maven-jaxb2-plugin.version>0.15.1</maven-jaxb2-plugin.version>
</properties>
</project>

View File

@ -64,7 +64,7 @@
<dependency>
<groupId>it.ozimov</groupId>
<artifactId>embedded-redis</artifactId>
<version>${redis.version}</version>
<version>${embedded-redis.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@ -121,7 +121,7 @@
<git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
<spock.version>2.4-M1-groovy-4.0</spock.version>
<gmavenplus-plugin.version>3.0.0</gmavenplus-plugin.version>
<redis.version>0.7.2</redis.version>
<embedded-redis.version>0.7.2</embedded-redis.version>
<spring-boot.version>2.5.0</spring-boot.version>
<log4j2.version>2.17.1</log4j2.version>
</properties>

View File

@ -78,7 +78,6 @@
<properties>
<ehcache.version>3.5.2</ehcache.version>
<lombok.version>1.18.26</lombok.version>
</properties>
</project>

View File

@ -134,7 +134,7 @@
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<version>3.3.0</version>
<version>${rest-assured.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@ -163,6 +163,7 @@
<start-class>com.baeldung.SpringBootRestApplication</start-class>
<xstream.version>1.4.11.1</xstream.version>
<modelmapper.version>3.1.0</modelmapper.version>
<rest-assured.version>3.3.0</rest-assured.version>
<jaxb-runtime.version>2.3.7</jaxb-runtime.version>
</properties>
</project>