SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add spring-cloud-function-dependencies and use it throughout

Browse Source
This commit is contained in:
Dave Syer
2017-09-15 08:43:34 +01:00
parent 55655d69ac
commit 61a902ce9a
21 changed files with 275 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pom.xml
View File

@@ -10,32 +10,29 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId> <artifactId>spring-cloud-build</artifactId>
<version>1.3.3.RELEASE</version> <version>1.3.5.RELEASE</version>
<relativePath /> <relativePath />
</parent> </parent>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<reactor-bom.version>Aluminium-SR3</reactor-bom.version> <spring-cloud-stream.version>Chelsea.SR2</spring-cloud-stream.version>
<spring-cloud-stream.version>Chelsea.SR1</spring-cloud-stream.version> <wrapper.version>1.0.7.RELEASE</wrapper.version>
<wrapper.version>1.0.5.RELEASE</wrapper.version> <spring-boot.version>1.5.7.RELEASE</spring-boot.version>
<spring-boot.version>1.5.4.RELEASE</spring-boot.version>
<docs.main>spring-cloud-function</docs.main> <docs.main>spring-cloud-function</docs.main>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>commons-io</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId> <artifactId>commons-io</artifactId>
<version>${spring-cloud-stream.version}</version> <version>2.3</version>
<type>pom</type>
<scope>import</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.projectreactor</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>reactor-bom</artifactId> <artifactId>spring-cloud-function-dependencies</artifactId>
<version>${reactor-bom.version}</version> <version>${project.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@@ -50,6 +47,7 @@
</dependencyManagement> </dependencyManagement>
<modules> <modules>
<module>spring-cloud-function-dependencies</module>
<module>spring-cloud-function-compiler</module> <module>spring-cloud-function-compiler</module>
<module>spring-cloud-function-core</module> <module>spring-cloud-function-core</module>
<module>spring-cloud-function-context</module> <module>spring-cloud-function-context</module>

2
spring-cloud-function-adapters/pom.xml
View File

@@ -19,7 +19,7 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId> <artifactId>spring-cloud-dependencies</artifactId>
<version>Dalston.BUILD-SNAPSHOT</version> <version>Dalston.SR3</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

22
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml
View File

@@ -5,17 +5,15 @@
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-adapter-aws</artifactId> <artifactId>spring-cloud-function-adapter-aws</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>spring-cloud-function-adapter-aws</name> <name>spring-cloud-function-adapter-aws</name>
<description>AWS Lambda Adapter for Spring Cloud Function</description> <description>AWS Lambda Adapter for Spring Cloud Function</description>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-cloud-function-adapter-parent</artifactId>
<version>1.5.3.RELEASE</version> <version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<properties> <properties>
@@ -23,14 +21,12 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<aws-lambda-events.version>1.2.1</aws-lambda-events.version> <aws-lambda-events.version>1.2.1</aws-lambda-events.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-context</artifactId> <artifactId>spring-cloud-function-context</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@@ -59,18 +55,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Dalston.BUILD-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<repositories> <repositories>
<repository> <repository>
<id>spring-snapshots</id> <id>spring-snapshots</id>

29
spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml
View File

@@ -5,32 +5,21 @@
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-adapter-openwhisk</artifactId> <artifactId>spring-cloud-function-adapter-openwhisk</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>spring-cloud-function-adapter-openwhisk</name> <name>spring-cloud-function-adapter-openwhisk</name>
<description>Apache OpenWhisk Adapter for Spring Cloud Function</description> <description>Apache OpenWhisk Adapter for Spring Cloud Function</description>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-cloud-function-adapter-parent</artifactId>
<version>1.5.3.RELEASE</version> <version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
<wrapper.version>1.0.5.RELEASE</wrapper.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-context</artifactId> <artifactId>spring-cloud-function-context</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@@ -47,18 +36,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Dalston.BUILD-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

7
spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/pom.xml
View File

@@ -33,7 +33,6 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-adapter-aws</artifactId> <artifactId>spring-cloud-function-adapter-aws</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
@@ -69,14 +68,16 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId> <artifactId>spring-cloud-dependencies</artifactId>
<version>Dalston.BUILD-SNAPSHOT</version> <version>Dalston.SR3</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-web</artifactId> <artifactId>spring-cloud-function-dependencies</artifactId>
<version>${spring-cloud-function.version}</version> <version>${spring-cloud-function.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

2
spring-cloud-function-compiler/pom.xml
View File

@@ -26,7 +26,6 @@
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>2.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>
@@ -39,7 +38,6 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-core</artifactId> <artifactId>spring-cloud-function-core</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

6
spring-cloud-function-context/pom.xml
View File

@@ -14,15 +14,10 @@
<version>1.0.0.BUILD-SNAPSHOT</version> <version>1.0.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<properties>
<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-core</artifactId> <artifactId>spring-cloud-function-core</artifactId>
<version>${spring-cloud-function.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
@@ -49,7 +44,6 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-compiler</artifactId> <artifactId>spring-cloud-function-compiler</artifactId>
<version>${spring-cloud-function.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

8
spring-cloud-function-core/pom.xml
View File

@@ -14,6 +14,10 @@
</parent> </parent>
<dependencies> <dependencies>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId> <artifactId>spring-boot-starter</artifactId>
@@ -22,10 +26,6 @@
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
</dependency> </dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>

130
spring-cloud-function-dependencies/pom.xml Normal file
View File

@@ -0,0 +1,130 @@
<?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>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>1.3.5.RELEASE</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Cloud Function Dependencies</name>
<description>Spring Cloud Function Dependencies</description>
<properties>
<reactor-bom.version>Aluminium-SR3</reactor-bom.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-bom</artifactId>
<version>${reactor-bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-context</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-stream</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-compiler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-task</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-web</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-deployer</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-adapter-aws</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-adapter-openwhisk</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<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>
<releases>
<enabled>false</enabled>
</releases>
</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>
<releases>
<enabled>false</enabled>
</releases>
</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>

14
spring-cloud-function-deployer/pom.xml
View File

@@ -15,24 +15,21 @@
</parent> </parent>
<properties> <properties>
<spring-cloud-deployer-thin.version>1.0.6.RELEASE</spring-cloud-deployer-thin.version> <spring-cloud-deployer-thin.version>1.0.7.RELEASE</spring-cloud-deployer-thin.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-core</artifactId> <artifactId>spring-cloud-function-core</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-web</artifactId> <artifactId>spring-cloud-function-web</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-stream</artifactId> <artifactId>spring-cloud-function-stream</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@@ -58,17 +55,10 @@
<artifactId>maven-aether-provider</artifactId> <artifactId>maven-aether-provider</artifactId>
<version>3.3.9</version> <version>3.3.9</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-parent</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId> <artifactId>spring-cloud-dependencies</artifactId>
<version>Dalston.BUILD-SNAPSHOT</version> <version>Dalston.SR3</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

12
spring-cloud-function-samples/spring-cloud-function-sample-compiler/build.gradle
View File

@@ -1,7 +1,7 @@
buildscript { buildscript {
ext { ext {
springBootVersion = '1.5.2.RELEASE' springBootVersion = '1.5.2.RELEASE'
wrapperVersion = '1.0.6.RELEASE' wrapperVersion = '1.0.7.RELEASE'
} }
repositories { repositories {
mavenLocal() mavenLocal()
@@ -41,8 +41,14 @@ ext['reactor.version'] = "3.0.7.RELEASE"
// TODO: remove this when pom.xml generator is fixed // TODO: remove this when pom.xml generator is fixed
jar.dependsOn = [thinProperties] jar.dependsOn = [thinProperties]
dependencyManagement {
imports {
mavenBom "org.springframework.cloud:spring-cloud-function-dependencies:${springCloudFunctionVersion}"
}
}
dependencies { dependencies {
compile("org.springframework.cloud:spring-cloud-function-web:${springCloudFunctionVersion}") compile('org.springframework.cloud:spring-cloud-function-web')
compile("org.springframework.cloud:spring-cloud-function-compiler:${springCloudFunctionVersion}") compile('org.springframework.cloud:spring-cloud-function-compiler')
testCompile('org.springframework.boot:spring-boot-starter-test') testCompile('org.springframework.boot:spring-boot-starter-test')
} }

28
spring-cloud-function-samples/spring-cloud-function-sample-compiler/pom.xml
View File

@@ -20,30 +20,27 @@
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version> <spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
<wrapper.version>1.0.5.RELEASE</wrapper.version> <spring-cloud-stream.version>Chelsea.SR2</spring-cloud-stream.version>
<reactor.version>3.0.6.RELEASE</reactor.version> <reactor.version>3.0.7.RELEASE</reactor.version>
<wrapper.version>1.0.7.RELEASE</wrapper.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-web</artifactId> <artifactId>spring-cloud-function-web</artifactId>
<version>${spring-cloud-function.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-stream</artifactId> <artifactId>spring-cloud-function-stream</artifactId>
<version>${spring-cloud-function.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId> <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<version>1.2.0.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-compiler</artifactId> <artifactId>spring-cloud-function-compiler</artifactId>
<version>${spring-cloud-function.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@@ -52,6 +49,25 @@
</dependency> </dependency>
</dependencies> </dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>${spring-cloud-function.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>${spring-cloud-stream.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

12
spring-cloud-function-samples/spring-cloud-function-sample-pof/build.gradle
View File

@@ -1,7 +1,7 @@
buildscript { buildscript {
ext { ext {
springBootVersion = '1.5.2.RELEASE' springBootVersion = '1.5.2.RELEASE'
wrapperVersion = '1.0.6.RELEASE' wrapperVersion = '1.0.7.RELEASE'
} }
repositories { repositories {
mavenLocal() mavenLocal()
@@ -41,8 +41,14 @@ ext['reactor.version'] = "3.0.7.RELEASE"
// TODO: remove this when pom.xml generator is fixed // TODO: remove this when pom.xml generator is fixed
jar.dependsOn = [thinProperties] jar.dependsOn = [thinProperties]
dependencyManagement {
imports {
mavenBom "org.springframework.cloud:spring-cloud-function-dependencies:${springCloudFunctionVersion}"
}
}
dependencies { dependencies {
compile("org.springframework.cloud:spring-cloud-function-web:${springCloudFunctionVersion}") compile('org.springframework.cloud:spring-cloud-function-web')
compile("org.springframework.cloud:spring-cloud-function-compiler:${springCloudFunctionVersion}") compile('org.springframework.cloud:spring-cloud-function-compiler')
testCompile('org.springframework.boot:spring-boot-starter-test') testCompile('org.springframework.boot:spring-boot-starter-test')
} }

14
spring-cloud-function-samples/spring-cloud-function-sample-pof/pom.xml
View File

@@ -28,15 +28,25 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-web</artifactId> <artifactId>spring-cloud-function-web</artifactId>
<version>${spring-cloud-function.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-context</artifactId> <artifactId>spring-cloud-function-context</artifactId>
<version>${spring-cloud-function.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>${spring-cloud-function.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

12
spring-cloud-function-samples/spring-cloud-function-sample-pojo/build.gradle
View File

@@ -1,7 +1,7 @@
buildscript { buildscript {
ext { ext {
springBootVersion = '1.5.2.RELEASE' springBootVersion = '1.5.2.RELEASE'
wrapperVersion = '1.0.6.RELEASE' wrapperVersion = '1.0.7.RELEASE'
} }
repositories { repositories {
mavenLocal() mavenLocal()
@@ -41,8 +41,14 @@ ext['reactor.version'] = "3.0.7.RELEASE"
// TODO: remove this when pom.xml generator is fixed // TODO: remove this when pom.xml generator is fixed
jar.dependsOn = [thinProperties] jar.dependsOn = [thinProperties]
dependencyManagement {
imports {
mavenBom "org.springframework.cloud:spring-cloud-function-dependencies:${springCloudFunctionVersion}"
}
}
dependencies { dependencies {
compile("org.springframework.cloud:spring-cloud-function-web:${springCloudFunctionVersion}") compile('org.springframework.cloud:spring-cloud-function-web')
compile("org.springframework.cloud:spring-cloud-function-compiler:${springCloudFunctionVersion}") compile('org.springframework.cloud:spring-cloud-function-compiler')
testCompile('org.springframework.boot:spring-boot-starter-test') testCompile('org.springframework.boot:spring-boot-starter-test')
} }

14
spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml
View File

@@ -20,15 +20,14 @@
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version> <spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
<wrapper.version>1.0.5.RELEASE</wrapper.version> <wrapper.version>1.0.7.RELEASE</wrapper.version>
<reactor.version>3.0.7.BUILD-SNAPSHOT</reactor.version> <reactor.version>3.0.7.RELEASE</reactor.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-web</artifactId> <artifactId>spring-cloud-function-web</artifactId>
<version>${spring-cloud-function.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@@ -44,10 +43,17 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>${spring-cloud-function.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId> <artifactId>spring-cloud-dependencies</artifactId>
<version>Dalston.RELEASE</version> <version>Dalston.SR3</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

13
spring-cloud-function-samples/spring-cloud-function-sample-task/build.gradle
View File

@@ -1,7 +1,7 @@
buildscript { buildscript {
ext { ext {
springBootVersion = '1.5.2.RELEASE' springBootVersion = '1.5.2.RELEASE'
wrapperVersion = '1.0.6.RELEASE' wrapperVersion = '1.0.7.RELEASE'
} }
repositories { repositories {
mavenLocal() mavenLocal()
@@ -41,9 +41,14 @@ ext['reactor.version'] = "3.0.7.RELEASE"
// TODO: remove this when pom.xml generator is fixed // TODO: remove this when pom.xml generator is fixed
jar.dependsOn = [thinProperties] jar.dependsOn = [thinProperties]
dependencyManagement {
imports {
mavenBom "org.springframework.cloud:spring-cloud-function-dependencies:${springCloudFunctionVersion}"
}
}
dependencies { dependencies {
compile("org.springframework.cloud:spring-cloud-function-task:${springCloudFunctionVersion}") compile('org.springframework.cloud:spring-cloud-function-task')
compile("org.springframework.cloud:spring-cloud-function-context:${springCloudFunctionVersion}") compile('org.springframework.cloud:spring-cloud-function-compiler')
compile("org.springframework.cloud:spring-cloud-function-compiler:${springCloudFunctionVersion}")
testCompile('org.springframework.boot:spring-boot-starter-test') testCompile('org.springframework.boot:spring-boot-starter-test')
} }

19
spring-cloud-function-samples/spring-cloud-function-sample-task/pom.xml
View File

@@ -20,25 +20,22 @@
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version> <spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
<wrapper.version>1.0.5.RELEASE</wrapper.version> <wrapper.version>1.0.7.RELEASE</wrapper.version>
<reactor.version>3.0.6.RELEASE</reactor.version> <reactor.version>3.0.7.RELEASE</reactor.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-task</artifactId> <artifactId>spring-cloud-function-task</artifactId>
<version>${spring-cloud-function.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-context</artifactId> <artifactId>spring-cloud-function-context</artifactId>
<version>${spring-cloud-function.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-compiler</artifactId> <artifactId>spring-cloud-function-compiler</artifactId>
<version>${spring-cloud-function.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@@ -47,6 +44,18 @@
</dependency> </dependency>
</dependencies> </dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>${spring-cloud-function.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

12
spring-cloud-function-samples/spring-cloud-function-sample/build.gradle
View File

@@ -1,7 +1,7 @@
buildscript { buildscript {
ext { ext {
springBootVersion = '1.5.2.RELEASE' springBootVersion = '1.5.2.RELEASE'
wrapperVersion = '1.0.6.RELEASE' wrapperVersion = '1.0.7.RELEASE'
} }
repositories { repositories {
mavenLocal() mavenLocal()
@@ -41,8 +41,14 @@ ext['reactor.version'] = "3.0.7.RELEASE"
// TODO: remove this when pom.xml generator is fixed // TODO: remove this when pom.xml generator is fixed
jar.dependsOn = [thinProperties] jar.dependsOn = [thinProperties]
dependencyManagement {
imports {
mavenBom "org.springframework.cloud:spring-cloud-function-dependencies:${springCloudFunctionVersion}"
}
}
dependencies { dependencies {
compile("org.springframework.cloud:spring-cloud-function-web:${springCloudFunctionVersion}") compile('org.springframework.cloud:spring-cloud-function-web')
compile("org.springframework.cloud:spring-cloud-function-compiler:${springCloudFunctionVersion}") compile('org.springframework.cloud:spring-cloud-function-compiler')
testCompile('org.springframework.boot:spring-boot-starter-test') testCompile('org.springframework.boot:spring-boot-starter-test')
} }

19
spring-cloud-function-samples/spring-cloud-function-sample/pom.xml
View File

@@ -20,25 +20,22 @@
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version> <spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
<wrapper.version>1.0.6.RELEASE</wrapper.version> <reactor.version>3.0.7.RELEASE</reactor.version>
<reactor.version>3.0.7.BUILD-SNAPSHOT</reactor.version> <wrapper.version>1.0.7.RELEASE</wrapper.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-web</artifactId> <artifactId>spring-cloud-function-web</artifactId>
<version>${spring-cloud-function.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-context</artifactId> <artifactId>spring-cloud-function-context</artifactId>
<version>${spring-cloud-function.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-compiler</artifactId> <artifactId>spring-cloud-function-compiler</artifactId>
<version>${spring-cloud-function.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@@ -52,6 +49,18 @@
</dependency> </dependency>
</dependencies> </dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>${spring-cloud-function.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

2
spring-cloud-function-stream/pom.xml
View File

@@ -34,12 +34,10 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-core</artifactId> <artifactId>spring-cloud-function-core</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-context</artifactId> <artifactId>spring-cloud-function-context</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>