iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BAEL-8962 Fix surefire configs of twitterhdfs, spring cloud projects

Browse Source 
- Surefire config fixes
- pom fixes and standardization
- test names standardization
- added packaging pom at spring-cloud-bus and spring-cloud/spring-cloud-task level
This commit is contained in:
Dhawal Kapil 2018-09-25 23:22:58 +05:30
parent 738d65b9be
commit 9d8b90794e
17 changed files with 196 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@ -475,6 +475,7 @@
<module>spring-boot-logging-log4j2</module> <module>spring-boot-logging-log4j2</module>
<module>spring-cloud-data-flow</module> <module>spring-cloud-data-flow</module>
<module>spring-cloud</module> <module>spring-cloud</module>
<module>spring-cloud-bus</module>
<module>spring-core</module> <module>spring-core</module>
<module>spring-cucumber</module> <module>spring-cucumber</module>
<module>spring-ejb</module> <module>spring-ejb</module>
@ -640,7 +641,7 @@
<module>spring-data-rest-querydsl</module> <module>spring-data-rest-querydsl</module>
<!-- <module>spring-groovy</module> --><!-- PMD voilation --> <!-- <module>spring-groovy</module> --><!-- PMD voilation -->
<module>spring-mobile</module> <module>spring-mobile</module>
<!-- <module>spring-mustache</module> --><!-- PMD voilation --> <module>spring-mustache</module>
<module>spring-mvc-simple</module> <module>spring-mvc-simple</module>
<!-- <module>spring-mybatis</module> --><!-- Compilation failure --> <!-- <module>spring-mybatis</module> --><!-- Compilation failure -->
<module>spring-rest-hal-browser</module> <module>spring-rest-hal-browser</module>
@ -822,6 +823,7 @@
<module>spring-boot-logging-log4j2</module> <module>spring-boot-logging-log4j2</module>
<module>spring-cloud-data-flow</module> <module>spring-cloud-data-flow</module>
<module>spring-cloud</module> <module>spring-cloud</module>
<module>spring-cloud-bus</module>
<module>spring-core</module> <module>spring-core</module>
<module>spring-cucumber</module> <module>spring-cucumber</module>
<module>spring-ejb</module> <module>spring-ejb</module>
@ -957,7 +959,7 @@
<module>spring-data-rest-querydsl</module> <module>spring-data-rest-querydsl</module>
<!-- <module>spring-groovy</module> --><!-- PMD voilation --> <!-- <module>spring-groovy</module> --><!-- PMD voilation -->
<module>spring-mobile</module> <module>spring-mobile</module>
<!-- <module>spring-mustache</module> --><!-- PMD voilation --> <module>spring-mustache</module>
<module>spring-mvc-simple</module> <module>spring-mvc-simple</module>
<!-- <module>spring-mybatis</module> --><!-- Compilation failure --> <!-- <module>spring-mybatis</module> --><!-- Compilation failure -->
<module>spring-rest-hal-browser</module> <module>spring-rest-hal-browser</module>
@ -1176,6 +1178,7 @@
<module>spring-boot-logging-log4j2</module> <module>spring-boot-logging-log4j2</module>
<module>spring-cloud-data-flow</module> <module>spring-cloud-data-flow</module>
<module>spring-cloud</module> <module>spring-cloud</module>
<module>spring-cloud-bus</module>
<module>spring-core</module> <module>spring-core</module>
<module>spring-cucumber</module> <module>spring-cucumber</module>
<module>spring-ejb</module> <module>spring-ejb</module>

42
spring-5-data-reactive/pom.xml
View File

@ -62,28 +62,6 @@
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
<version>${junit.platform.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-runner</artifactId>
<version>${junit.platform.version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -175,32 +153,12 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkCount>3</forkCount>
<reuseForks>true</reuseForks>
<parallel>methods</parallel>
<useUnlimitedThreads>true</useUnlimitedThreads>
<excludes>
<exclude>**/*IntegrationTest.java</exclude>
<exclude>**/*IntTest.java</exclude>
<exclude>**/*LiveTest.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<kotlin.version>1.2.40</kotlin.version> <kotlin.version>1.2.40</kotlin.version>
<kotlin-maven-plugin.version>1.2.40</kotlin-maven-plugin.version> <kotlin-maven-plugin.version>1.2.40</kotlin-maven-plugin.version>
<junit.platform.version>1.0.0</junit.platform.version>
<junit.jupiter.version>5.0.2</junit.jupiter.version>
</properties> </properties>
</project> </project>

39
spring-cloud-bus/pom.xml Normal file
View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung.spring.cloud</groupId>
<artifactId>spring-cloud-bus</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<artifactId>parent-boot-1</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-boot-1</relativePath>
</parent>
<modules>
<module>spring-cloud-config-client</module>
<module>spring-cloud-config-server</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud-dependencies.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<properties>
<spring-cloud-dependencies.version>Brixton.SR7</spring-cloud-dependencies.version>
</properties>
</project>

107
spring-cloud-bus/spring-cloud-config-client/pom.xml
View File

@ -1,76 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-config-client</artifactId>
<packaging>jar</packaging>
<groupId>com.baeldung.spring.cloud</groupId> <name>spring-cloud-config-client</name>
<artifactId>spring-cloud-config-client</artifactId> <description>Demo Spring Cloud Config Client</description>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>spring-cloud-config-client</name> <parent>
<description>Demo Spring Cloud Config Client</description> <artifactId>spring-cloud-bus</artifactId>
<groupId>com.baeldung.spring.cloud</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<parent> <dependencies>
<artifactId>parent-boot-1</artifactId> <dependency>
<groupId>com.baeldung</groupId> <groupId>org.springframework.cloud</groupId>
<version>0.0.1-SNAPSHOT</version> <artifactId>spring-cloud-starter-config</artifactId>
<relativePath>../../parent-boot-1</relativePath> </dependency>
</parent> <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependencies> <dependency>
<dependency> <groupId>org.springframework.boot</groupId>
<groupId>org.springframework.cloud</groupId> <artifactId>spring-boot-starter-test</artifactId>
<artifactId>spring-cloud-starter-config</artifactId> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-actuator</artifactId>
<scope>test</scope> </dependency>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-boot-actuator</artifactId> <artifactId>spring-cloud-starter-bus-amqp</artifactId>
</dependency> </dependency>
</dependencies>
<dependency> <build>
<groupId>org.springframework.cloud</groupId> <plugins>
<artifactId>spring-cloud-starter-bus-amqp</artifactId> <plugin>
</dependency> <groupId>org.springframework.boot</groupId>
</dependencies> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<dependencyManagement> </plugins>
<dependencies> </build>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>Dalston.SR1</spring-cloud.version>
</properties>
</project> </project>

107
spring-cloud-bus/spring-cloud-config-server/pom.xml
View File

@ -1,77 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-config-server</artifactId>
<packaging>jar</packaging>
<groupId>com.baeldung.spring.cloud</groupId> <name>spring-cloud-config-server</name>
<artifactId>spring-cloud-config-server</artifactId> <description>Demo Spring Cloud Config Server</description>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>spring-cloud-config-server</name> <parent>
<description>Demo Spring Cloud Config Server</description> <artifactId>spring-cloud-bus</artifactId>
<groupId>com.baeldung.spring.cloud</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<parent> <dependencies>
<artifactId>parent-boot-1</artifactId> <dependency>
<groupId>com.baeldung</groupId> <groupId>org.springframework.cloud</groupId>
<version>0.0.1-SNAPSHOT</version> <artifactId>spring-cloud-config-server</artifactId>
<relativePath>../../parent-boot-1</relativePath> </dependency>
</parent>
<dependencies> <dependency>
<dependency> <groupId>org.springframework.boot</groupId>
<groupId>org.springframework.cloud</groupId> <artifactId>spring-boot-starter-security</artifactId>
<artifactId>spring-cloud-config-server</artifactId> </dependency>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId> <artifactId>spring-boot-starter-test</artifactId>
</dependency> <scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-cloud-config-monitor</artifactId>
<scope>test</scope> </dependency>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config-monitor</artifactId> <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
</dependency> </dependency>
</dependencies>
<dependency> <build>
<groupId>org.springframework.cloud</groupId> <plugins>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId> <plugin>
</dependency> <groupId>org.springframework.boot</groupId>
</dependencies> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<dependencyManagement> </plugins>
<dependencies> </build>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>Dalston.SR1</spring-cloud.version>
</properties>
</project> </project>

2
spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringCloudConfigServerApplicationTests.java → spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringCloudConfigServerApplicationIntegrationTest.java
View File

@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
public class SpringCloudConfigServerApplicationTests { public class SpringCloudConfigServerApplicationIntegrationTest {
@Test @Test
public void contextLoads() { public void contextLoads() {

1
spring-cloud/pom.xml
View File

@ -36,6 +36,7 @@
<module>spring-cloud-functions</module> <module>spring-cloud-functions</module>
<module>spring-cloud-vault</module> <module>spring-cloud-vault</module>
<module>spring-cloud-security</module> <module>spring-cloud-security</module>
<module>spring-cloud-task</module>
</modules> </modules>
<build> <build>

11
spring-cloud/spring-cloud-config/client/pom.xml
View File

@ -15,18 +15,15 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId> <artifactId>spring-cloud-starter-config</artifactId>
<version>${spring-cloud-starter-config.version}</version> </dependency>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<version>${org.springframework.boot.version}</version> </dependency>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<version>${org.springframework.boot.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -40,8 +37,4 @@
</plugins> </plugins>
</build> </build>
<properties>
<spring-cloud-starter-config.version>1.2.2.RELEASE</spring-cloud-starter-config.version>
<org.springframework.boot.version>1.4.2.RELEASE</org.springframework.boot.version>
</properties>
</project> </project>

18
spring-cloud/spring-cloud-config/server/pom.xml
View File

@ -15,23 +15,19 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config-server</artifactId> <artifactId>spring-cloud-config-server</artifactId>
<version>${spring-cloud-config-server.version}</version> </dependency>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId> <artifactId>spring-boot-starter-security</artifactId>
<version>${org.springframework.boot.version}</version> </dependency>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<version>${org.springframework.boot.version}</version> </dependency>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<version>${org.springframework.boot.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -41,14 +37,8 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>${org.springframework.boot.version}</version> </plugin>
</plugin>
</plugins> </plugins>
</build> </build>
<properties>
<spring-cloud-config-server.version>1.2.2.RELEASE</spring-cloud-config-server.version>
<org.springframework.boot.version>1.4.2.RELEASE</org.springframework.boot.version>
</properties>
</project> </project>

11
spring-cloud/spring-cloud-stream-starters/twitterhdfs/pom.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns="http://maven.apache.org/POM/4.0.0"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung.twitterhdfs</groupId> <groupId>com.baeldung.twitterhdfs</groupId>
<artifactId>twitterhdfs</artifactId> <artifactId>twitterhdfs</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0.0</version> <version>1.0.0-SNAPSHOT</version>
<name>twitterhdfs</name> <name>twitterhdfs</name>
<parent> <parent>
@ -45,9 +45,6 @@
</build> </build>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-cloud-starter-stream.version>1.3.1.RELEASE</spring-cloud-starter-stream.version> <spring-cloud-starter-stream.version>1.3.1.RELEASE</spring-cloud-starter-stream.version>
</properties> </properties>

46
spring-cloud/spring-cloud-task/pom.xml Normal file
View File

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung.spring.cloud</groupId>
<artifactId>spring-cloud-task</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<artifactId>parent-boot-1</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-1</relativePath>
</parent>
<modules>
<module>springcloudtaskbatch</module>
<module>springcloudtasksink</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-dependencies</artifactId>
<version>${spring-cloud-task.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud-dependencies.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<properties>
<spring-cloud-dependencies.version>Brixton.SR7</spring-cloud-dependencies.version>
<spring-cloud-task.version>1.2.2.RELEASE</spring-cloud-task.version>
</properties>
</project>

26
spring-cloud/spring-cloud-task/springcloudtaskbatch/pom.xml
View File

@ -3,14 +3,12 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.baeldung.cloud</groupId> <groupId>org.baeldung.cloud</groupId>
<artifactId>springcloudtaskbatch</artifactId> <artifactId>springcloudtaskbatch</artifactId>
<version>0.0.1-SNAPSHOT</version> <name>springcloudtaskbatch</name>
<name>springcloudtaskbatch</name>
<parent> <parent>
<artifactId>parent-boot-1</artifactId> <artifactId>spring-cloud-task</artifactId>
<groupId>com.baeldung</groupId> <groupId>com.baeldung.spring.cloud</groupId>
<version>0.0.1-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../../parent-boot-1</relativePath>
</parent> </parent>
<dependencies> <dependencies>
@ -47,18 +45,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-dependencies</artifactId>
<version>${spring-cloud-task.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -70,10 +56,6 @@
<properties> <properties>
<start-class>com.baeldung.TaskDemo</start-class> <start-class>com.baeldung.TaskDemo</start-class>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-cloud-task.version>1.2.2.RELEASE</spring-cloud-task.version>
</properties> </properties>
</project> </project>

40
spring-cloud/spring-cloud-task/springcloudtasksink/pom.xml
View File

@ -2,19 +2,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung</groupId>
<artifactId>SpringCloudTaskSink</artifactId> <artifactId>SpringCloudTaskSink</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>SpringCloudTaskSink</name> <name>SpringCloudTaskSink</name>
<description>Demo project for Spring Boot</description> <description>Demo project for Spring Boot</description>
<parent> <parent>
<artifactId>parent-boot-1</artifactId> <artifactId>spring-cloud-task</artifactId>
<groupId>com.baeldung</groupId> <groupId>com.baeldung.spring.cloud</groupId>
<version>0.0.1-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../../parent-boot-1</relativePath>
</parent> </parent>
<dependencies> <dependencies>
@ -36,11 +32,6 @@
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
@ -49,25 +40,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-dependencies</artifactId>
<version>${spring-cloud-task.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -78,11 +50,7 @@
</build> </build>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-cloud-task.version>1.2.2.RELEASE</spring-cloud-task.version> <spring-cloud-task.version>1.2.2.RELEASE</spring-cloud-task.version>
<spring-cloud.version>Edgware.SR2</spring-cloud.version>
<spring-cloud-deployer.version>1.3.0.RELEASE</spring-cloud-deployer.version> <spring-cloud-deployer.version>1.3.0.RELEASE</spring-cloud-deployer.version>
</properties> </properties>

2
spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplicationTests.java → spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplicationIntegrationTest.java
View File

@ -24,7 +24,7 @@ import static org.mockito.Mockito.verify;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest( @SpringBootTest(
classes = SpringCloudTaskSinkApplication.class) classes = SpringCloudTaskSinkApplication.class)
public class SpringCloudTaskSinkApplicationTests { public class SpringCloudTaskSinkApplicationIntegrationTest {
@Autowired @Autowired
ApplicationContext context; ApplicationContext context;

7
spring-data-keyvalue/pom.xml
View File

@ -1,9 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung</groupId>
<artifactId>spring-data-keyvalue</artifactId> <artifactId>spring-data-keyvalue</artifactId>
<version>1.0</version>
<parent> <parent>
<artifactId>parent-boot-2</artifactId> <artifactId>parent-boot-2</artifactId>
@ -13,7 +11,6 @@
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId> <artifactId>spring-boot-starter</artifactId>
@ -30,8 +27,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<properties>
<spring-data-keyvalue.version>2.0.3.RELEASE</spring-data-keyvalue.version>
</properties>
</project> </project>

5
spring-mustache/pom.xml
View File

@ -3,9 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung</groupId>
<artifactId>spring-mustache</artifactId> <artifactId>spring-mustache</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>spring-mustache</name> <name>spring-mustache</name>
<description>Demo project for Spring Boot</description> <description>Demo project for Spring Boot</description>
@ -50,9 +48,6 @@
</build> </build>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<bootstrap.version>3.3.7</bootstrap.version> <bootstrap.version>3.3.7</bootstrap.version>
<datafactory.version>0.8</datafactory.version> <datafactory.version>0.8</datafactory.version>
</properties> </properties>

2
spring-mustache/src/test/java/com/baeldung/springmustache/SpringMustacheApplicationTests.java → spring-mustache/src/test/java/com/baeldung/springmustache/SpringMustacheApplicationIntegrationTest.java
View File

@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
public class SpringMustacheApplicationTests { public class SpringMustacheApplicationIntegrationTest {
@Autowired @Autowired
private TestRestTemplate restTemplate; private TestRestTemplate restTemplate;