In the release process of SCDF, it was identified that Spring Cloud Deployer had been upgraded to JDK 1.8 which was not desirable at the given time. As part of the rollback, the deployer implementations provided remained at 1.8, but the SPI was rolled back to 1.7. This commit addresses the difference between the different versions as well as updates the code to use the latest `TaskLauncher` code.
299 lines
9.6 KiB
XML
Executable File
299 lines
9.6 KiB
XML
Executable File
<?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" 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>
|
|
|
|
<parent>
|
|
<groupId>org.springframework.cloud</groupId>
|
|
<artifactId>spring-cloud-build</artifactId>
|
|
<version>1.2.1.RELEASE</version>
|
|
<relativePath />
|
|
</parent>
|
|
|
|
<groupId>org.springframework.cloud</groupId>
|
|
<artifactId>spring-cloud-task-parent</artifactId>
|
|
<version>1.1.0.BUILD-SNAPSHOT</version>
|
|
<packaging>pom</packaging>
|
|
<name>Spring Cloud Task Build</name>
|
|
<description>Spring Cloud Task Build</description>
|
|
<url>https://cloud.spring.io/spring-cloud-task/</url>
|
|
<organization>
|
|
<name>Pivotal Software, Inc.</name>
|
|
<url>https://www.spring.io</url>
|
|
</organization>
|
|
<licenses>
|
|
<license>
|
|
<name>Apache License, Version 2.0</name>
|
|
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
|
|
</license>
|
|
</licenses>
|
|
<scm>
|
|
<url>https://github.com/spring-cloud/spring-cloud-task</url>
|
|
</scm>
|
|
<developers>
|
|
<developer>
|
|
<id>mminella</id>
|
|
<name>Michael Minella</name>
|
|
<email>mminella at pivotal.io</email>
|
|
<organization>Pivotal Software, Inc.</organization>
|
|
<organizationUrl>https://www.spring.io</organizationUrl>
|
|
<roles>
|
|
<role>Project Lead</role>
|
|
</roles>
|
|
</developer>
|
|
<developer>
|
|
<id>cppwfs</id>
|
|
<name>Glenn Renfro</name>
|
|
<email>grenfro at pivotal.io</email>
|
|
<organization>Pivotal Software, Inc.</organization>
|
|
<organizationUrl>https://www.spring.io</organizationUrl>
|
|
</developer>
|
|
</developers>
|
|
<prerequisites>
|
|
<maven>3.2.1</maven>
|
|
</prerequisites>
|
|
|
|
<dependencyManagement>
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>org.springframework.cloud</groupId>
|
|
<artifactId>spring-cloud-task-dependencies</artifactId>
|
|
<version>1.1.0.BUILD-SNAPSHOT</version>
|
|
<type>pom</type>
|
|
<scope>import</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.cloud</groupId>
|
|
<artifactId>spring-cloud-deployer-spi</artifactId>
|
|
<version>${spring-cloud-deployer-spi.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.cloud</groupId>
|
|
<artifactId>spring-cloud-deployer-local</artifactId>
|
|
<version>${spring-cloud-deployer-local.version}</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.cloud</groupId>
|
|
<artifactId>spring-cloud-deployer-resource-support</artifactId>
|
|
<version>${spring-cloud-deployer-resource-support.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.batch</groupId>
|
|
<artifactId>spring-batch-core</artifactId>
|
|
<version>${spring-batch.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.batch</groupId>
|
|
<artifactId>spring-batch-infrastructure</artifactId>
|
|
<version>${spring-batch.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.batch</groupId>
|
|
<artifactId>spring-batch-integration</artifactId>
|
|
<version>${spring-batch.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.cloud</groupId>
|
|
<artifactId>spring-cloud-deployer-resource-maven</artifactId>
|
|
<version>${spring-cloud-deployer-resource-maven.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.cloud</groupId>
|
|
<artifactId>spring-cloud-stream-test-support-internal</artifactId>
|
|
<version>${spring-cloud-stream.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.cloud</groupId>
|
|
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
|
|
<version>${spring-cloud-stream-binder-rabbit.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.cloud</groupId>
|
|
<artifactId>spring-cloud-stream</artifactId>
|
|
<version>${spring-cloud-stream.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.cloud</groupId>
|
|
<artifactId>spring-cloud-stream-test-support</artifactId>
|
|
<version>${spring-cloud-stream.version}</version>
|
|
</dependency>
|
|
</dependencies>
|
|
</dependencyManagement>
|
|
|
|
<modules>
|
|
<module>spring-cloud-task-dependencies</module>
|
|
<module>spring-cloud-task-core</module>
|
|
<module>spring-cloud-task-batch</module>
|
|
<module>spring-cloud-task-stream</module>
|
|
<module>spring-cloud-starter-task</module>
|
|
<module>spring-cloud-task-samples</module>
|
|
<module>spring-cloud-task-integration-tests</module>
|
|
<module>spring-cloud-task-docs</module>
|
|
</modules>
|
|
|
|
<properties>
|
|
<spring-cloud-stream.version>1.1.0.RELEASE</spring-cloud-stream.version>
|
|
<spring-cloud-deployer-spi.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-deployer-spi.version>
|
|
<spring-cloud-deployer-local.version>1.1.0.RELEASE</spring-cloud-deployer-local.version>
|
|
<spring-cloud-stream-binder-rabbit.version>1.1.1.RELEASE</spring-cloud-stream-binder-rabbit.version>
|
|
<spring-cloud-deployer-resource-support.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-deployer-resource-support.version>
|
|
<spring-cloud-deployer-resource-maven.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-deployer-resource-maven.version>
|
|
<spring-batch.version>3.0.7.RELEASE</spring-batch.version>
|
|
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco-ut.exec</sonar.jacoco.reportPath>
|
|
</properties>
|
|
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-surefire-plugin</artifactId>
|
|
<version>2.12.4</version>
|
|
<configuration>
|
|
<includes>
|
|
<include>**/*Tests.java</include>
|
|
</includes>
|
|
<argLine>${surefireArgLine}</argLine>
|
|
</configuration>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
|
<version>3.5.1</version>
|
|
<configuration>
|
|
<source>1.7</source>
|
|
<target>1.7</target>
|
|
<testSource>1.8</testSource>
|
|
<testTarget>1.8</testTarget>
|
|
</configuration>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-javadoc-plugin</artifactId>
|
|
<version>2.10.3</version>
|
|
<executions>
|
|
<execution>
|
|
<id>attach-javadocs</id>
|
|
<goals>
|
|
<goal>jar</goal>
|
|
</goals>
|
|
</execution>
|
|
<!--<execution>-->
|
|
<!--<id>aggregate</id>-->
|
|
<!--<phase>package</phase>-->
|
|
<!--<goals>-->
|
|
<!--<goal>aggregate</goal>-->
|
|
<!--</goals>-->
|
|
<!--</execution>-->
|
|
</executions>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-source-plugin</artifactId>
|
|
<version>3.0.1</version>
|
|
<executions>
|
|
<execution>
|
|
<id>attach-sources</id>
|
|
<goals>
|
|
<goal>jar</goal>
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.jacoco</groupId>
|
|
<artifactId>jacoco-maven-plugin</artifactId>
|
|
<version>0.7.5.201505241946</version>
|
|
<executions>
|
|
<!--
|
|
Prepares the property pointing to the JaCoCo runtime agent which
|
|
is passed as VM argument when Maven the Surefire plugin is executed.
|
|
-->
|
|
<execution>
|
|
<id>pre-unit-test</id>
|
|
<goals>
|
|
<goal>prepare-agent</goal>
|
|
</goals>
|
|
<configuration>
|
|
<!-- Sets the path to the file which contains the execution data. -->
|
|
<destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
|
|
<!--
|
|
Sets the name of the property containing the settings
|
|
for JaCoCo runtime agent.
|
|
-->
|
|
<propertyName>surefireArgLine</propertyName>
|
|
</configuration>
|
|
</execution>
|
|
<!--
|
|
Ensures that the code coverage report for unit tests is created after
|
|
unit tests have been run.
|
|
-->
|
|
<execution>
|
|
<id>post-unit-test</id>
|
|
<phase>test</phase>
|
|
<goals>
|
|
<goal>report</goal>
|
|
</goals>
|
|
<configuration>
|
|
<!-- Sets the path to the file which contains the execution data. -->
|
|
<dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
|
|
<!-- Sets the output directory for the code coverage report. -->
|
|
<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
<profiles>
|
|
<profile>
|
|
<id>spring</id>
|
|
<repositories>
|
|
<repository>
|
|
<id>spring-snapshots</id>
|
|
<name>Spring Snapshots</name>
|
|
<url>https://repo.spring.io/libs-snapshot-local</url>
|
|
<snapshots>
|
|
<enabled>true</enabled>
|
|
</snapshots>
|
|
</repository>
|
|
<repository>
|
|
<id>spring-milestones</id>
|
|
<name>Spring Milestones</name>
|
|
<url>https://repo.spring.io/libs-milestone-local</url>
|
|
<snapshots>
|
|
<enabled>false</enabled>
|
|
</snapshots>
|
|
</repository>
|
|
<repository>
|
|
<id>spring-releases</id>
|
|
<name>Spring Releases</name>
|
|
<url>https://repo.spring.io/release</url>
|
|
<snapshots>
|
|
<enabled>false</enabled>
|
|
</snapshots>
|
|
</repository>
|
|
</repositories>
|
|
<pluginRepositories>
|
|
<pluginRepository>
|
|
<id>spring-snapshots</id>
|
|
<name>Spring Snapshots</name>
|
|
<url>https://repo.spring.io/libs-snapshot-local</url>
|
|
<snapshots>
|
|
<enabled>true</enabled>
|
|
</snapshots>
|
|
</pluginRepository>
|
|
<pluginRepository>
|
|
<id>spring-milestones</id>
|
|
<name>Spring Milestones</name>
|
|
<url>https://repo.spring.io/libs-milestone-local</url>
|
|
<snapshots>
|
|
<enabled>false</enabled>
|
|
</snapshots>
|
|
</pluginRepository>
|
|
</pluginRepositories>
|
|
</profile>
|
|
</profiles>
|
|
</project>
|