Skip to content

Commit 2ece708

Browse files
spring-buildsspring-builds
committed
Update SNAPSHOT to 3.1.6
1 parent 392a0d8 commit 2ece708

File tree

47 files changed

+125
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+125
-88
lines changed

‎README.adoc

Lines changed: 54 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -129,23 +129,9 @@ the `.mvn` configuration, so if you find you have to do it to make a
129129
build succeed, please raise a ticket to get the settings added to
130130
source control.
131131

132-
For hints on how to build the project look in `.travis.yml` if there
133-
is one. There should be a "script" and maybe "install" command. Also
134-
look at the "services" section to see if any services need to be
135-
running locally (e.g. mongo or rabbit). Ignore the git-related bits
136-
that you might find in "before_install" since they're related to setting git
137-
credentials and you already have those.
138-
139-
The projects that require middleware generally include a
140-
`docker-compose.yml`, so consider using
141-
https://docs.docker.com/compose/[Docker Compose] to run the middeware servers
142-
in Docker containers. See the README in the
143-
https://github.com/spring-cloud-samples/scripts[scripts demo
144-
repository] for specific instructions about the common cases of mongo,
145-
rabbit and redis.
146-
147-
NOTE: If all else fails, build with the command from `.travis.yml` (usually
148-
`./mvnw install`).
132+
The projects that require middleware (i.e. Redis) for testing generally
133+
require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.
134+
149135

150136
=== Documentation
151137

@@ -378,3 +364,54 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t
378364
- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
379365

380366
IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
367+
368+
=== Duplicate Finder
369+
370+
Spring Cloud Build brings along the `basepom:duplicate-finder-maven-plugin`, that enables flagging duplicate and conflicting classes and resources on the java classpath.
371+
372+
==== Duplicate Finder configuration
373+
374+
Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`.
375+
376+
.pom.xml
377+
[source,xml]
378+
----
379+
<build>
380+
<plugins>
381+
<plugin>
382+
<groupId>org.basepom.maven</groupId>
383+
<artifactId>duplicate-finder-maven-plugin</artifactId>
384+
</plugin>
385+
</plugins>
386+
</build>
387+
----
388+
389+
For other properties, we have set defaults as listed in the https://github.com/basepom/duplicate-finder-maven-plugin/wiki[plugin documentation].
390+
391+
You can easily override them but setting the value of the selected property prefixed with `duplicate-finder-maven-plugin`. For example, set `duplicate-finder-maven-plugin.skip` to `true` in order to skip duplicates check in your build.
392+
393+
If you need to add `ignoredClassPatterns` or `ignoredResourcePatterns` to your setup, make sure to add them in the plugin configuration section of your project:
394+
395+
[source,xml]
396+
----
397+
<build>
398+
<plugins>
399+
<plugin>
400+
<groupId>org.basepom.maven</groupId>
401+
<artifactId>duplicate-finder-maven-plugin</artifactId>
402+
<configuration>
403+
<ignoredClassPatterns>
404+
<ignoredClassPattern>org.joda.time.base.BaseDateTime</ignoredClassPattern>
405+
<ignoredClassPattern>.*module-info</ignoredClassPattern>
406+
</ignoredClassPatterns>
407+
<ignoredResourcePatterns>
408+
<ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
409+
</ignoredResourcePatterns>
410+
</configuration>
411+
</plugin>
412+
</plugins>
413+
</build>
414+
415+
416+
----
417+

‎docs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>spring-cloud-function-parent</artifactId>
10-
<version>3.1.6-SNAPSHOT</version>
10+
<version>3.1.6</version>
1111
</parent>
1212
<packaging>pom</packaging>
1313
<name>Spring Cloud Function Docs</name>

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<artifactId>spring-cloud-function-parent</artifactId>
88
<name>Spring Cloud Function Parent</name>
9-
<version>3.1.6-SNAPSHOT</version>
9+
<version>3.1.6</version>
1010
<packaging>pom</packaging>
1111

1212
<parent>

‎spring-cloud-function-adapters/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.springframework.cloud</groupId>
1212
<artifactId>spring-cloud-function-parent</artifactId>
13-
<version>3.1.6-SNAPSHOT</version>
13+
<version>3.1.6</version>
1414
</parent>
1515

1616
<name>spring-cloud-function-adapter-parent</name>

‎spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.cloud</groupId>
1515
<artifactId>spring-cloud-function-adapter-parent</artifactId>
16-
<version>3.1.6-SNAPSHOT</version>
16+
<version>3.1.6</version>
1717
</parent>
1818

1919
<properties>

‎spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.cloud</groupId>
1515
<artifactId>spring-cloud-function-adapter-parent</artifactId>
16-
<version>3.1.6-SNAPSHOT</version>
16+
<version>3.1.6</version>
1717
</parent>
1818

1919
<properties>

‎spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<artifactId>spring-cloud-function-adapter-parent</artifactId>
1313
<groupId>org.springframework.cloud</groupId>
14-
<version>3.1.6-SNAPSHOT</version>
14+
<version>3.1.6</version>
1515
</parent>
1616

1717
<properties>

‎spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.cloud</groupId>
1515
<artifactId>spring-cloud-function-adapter-parent</artifactId>
16-
<version>3.1.6-SNAPSHOT</version>
16+
<version>3.1.6</version>
1717
</parent>
1818

1919
<dependencies>

‎spring-cloud-function-compiler/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.cloud</groupId>
1414
<artifactId>spring-cloud-function-parent</artifactId>
15-
<version>3.1.6-SNAPSHOT</version>
15+
<version>3.1.6</version>
1616
</parent>
1717

1818
<dependencies>

‎spring-cloud-function-context/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.cloud</groupId>
1414
<artifactId>spring-cloud-function-parent</artifactId>
15-
<version>3.1.6-SNAPSHOT</version>
15+
<version>3.1.6</version>
1616
</parent>
1717

1818
<dependencies>

‎spring-cloud-function-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.cloud</groupId>
1414
<artifactId>spring-cloud-function-parent</artifactId>
15-
<version>3.1.6-SNAPSHOT</version>
15+
<version>3.1.6</version>
1616
</parent>
1717

1818
<dependencies>

‎spring-cloud-function-dependencies/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<artifactId>spring-cloud-dependencies-parent</artifactId>
88
<groupId>org.springframework.cloud</groupId>
9-
<version>3.0.5-SNAPSHOT</version>
9+
<version>3.0.5</version>
1010
<relativePath/>
1111
</parent>
1212
<artifactId>spring-cloud-function-dependencies</artifactId>
13-
<version>3.1.6-SNAPSHOT</version>
13+
<version>3.1.6</version>
1414
<packaging>pom</packaging>
1515
<name>Spring Cloud Function Dependencies</name>
1616
<description>Spring Cloud Function Dependencies</description>

‎spring-cloud-function-deployer/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.springframework.cloud</groupId>
1212
<artifactId>spring-cloud-function-parent</artifactId>
13-
<version>3.1.6-SNAPSHOT</version>
13+
<version>3.1.6</version>
1414
</parent>
1515

1616
<properties>

‎spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>2.5.5</version>
15+
<version>2.4.13</version>
1616
<relativePath/>
1717
</parent>
1818

1919
<properties>
2020
<java.version>1.8</java.version>
21-
<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
21+
<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
2222
<wrapper.version>1.0.27.RELEASE</wrapper.version>
2323
</properties>
2424

‎spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>2.5.5</version>
15+
<version>2.4.13</version>
1616
<relativePath />
1717
</parent>
1818

1919
<properties>
2020
<java.version>1.8</java.version>
21-
<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
21+
<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
2222
<wrapper.version>1.0.17.RELEASE</wrapper.version>
2323
</properties>
2424

‎spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>2.5.5</version>
15+
<version>2.4.13</version>
1616
<relativePath/>
1717
</parent>
1818

1919
<properties>
2020
<java.version>1.8</java.version>
21-
<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
21+
<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
2222
<wrapper.version>1.0.27.RELEASE</wrapper.version>
2323
</properties>
2424

‎spring-cloud-function-deployer/src/it/bootapp/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>2.5.5</version>
15+
<version>2.4.13</version>
1616
<relativePath/>
1717
</parent>
1818

1919
<properties>
2020
<java.version>1.8</java.version>
21-
<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
21+
<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
2222
<wrapper.version>1.0.27.RELEASE</wrapper.version>
2323
</properties>
2424

‎spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>2.5.5</version>
15+
<version>2.4.13</version>
1616
<relativePath/>
1717
</parent>
1818

1919
<properties>
2020
<java.version>1.8</java.version>
21-
<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
21+
<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
2222
<wrapper.version>1.0.27.RELEASE</wrapper.version>
2323
</properties>
2424

‎spring-cloud-function-deployer/src/it/bootjar/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>2.5.5</version>
15+
<version>2.4.13</version>
1616
<relativePath/>
1717
</parent>
1818

1919
<properties>
2020
<java.version>1.8</java.version>
21-
<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
21+
<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
2222
<wrapper.version>1.0.27.RELEASE</wrapper.version>
2323
</properties>
2424

‎spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>2.5.5</version>
15+
<version>2.4.13</version>
1616
<relativePath />
1717
</parent>
1818

1919
<properties>
2020
<java.version>1.8</java.version>
21-
<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
21+
<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
2222
<wrapper.version>1.0.27.RELEASE</wrapper.version>
2323
</properties>
2424

‎spring-cloud-function-kotlin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.cloud</groupId>
1414
<artifactId>spring-cloud-function-parent</artifactId>
15-
<version>3.1.6-SNAPSHOT</version>
15+
<version>3.1.6</version>
1616
</parent>
1717

1818
<dependencies>

‎spring-cloud-function-rsocket/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.cloud</groupId>
1414
<artifactId>spring-cloud-function-parent</artifactId>
15-
<version>3.1.6-SNAPSHOT</version>
15+
<version>3.1.6</version>
1616
</parent>
1717

1818
<properties>

‎spring-cloud-function-samples/function-functional-sample-aws/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.springframework.boot</groupId>
1717
<artifactId>spring-boot-starter-parent</artifactId>
18-
<version>2.5.5</version>
18+
<version>2.4.13</version>
1919
<relativePath/> <!-- lookup parent from repository -->
2020
</parent>
2121

@@ -25,7 +25,7 @@
2525
<java.version>1.8</java.version>
2626
<wrapper.version>1.0.27.RELEASE</wrapper.version>
2727
<aws-lambda-events.version>3.9.0</aws-lambda-events.version>
28-
<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
28+
<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
2929
</properties>
3030

3131
<dependencies>

‎spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.5.5</version>
8+
<version>2.4.13</version>
99
<relativePath /> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>io.spring.sample</groupId>
@@ -17,7 +17,7 @@
1717
<properties>
1818
<java.version>1.8</java.version>
1919
<wrapper.version>1.0.27.RELEASE</wrapper.version>
20-
<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
20+
<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
2121
</properties>
2222

2323
<dependencies>

‎spring-cloud-function-samples/function-sample-aws-custom/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.5.5</version>
8+
<version>2.4.13</version>
99
<relativePath /> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>io.spring.sample</groupId>
@@ -17,7 +17,7 @@
1717
<properties>
1818
<java.version>1.8</java.version>
1919
<wrapper.version>1.0.27.RELEASE</wrapper.version>
20-
<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
20+
<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
2121
</properties>
2222

2323
<dependencies>

‎spring-cloud-function-samples/function-sample-aws-routing/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.springframework.boot</groupId>
1717
<artifactId>spring-boot-starter-parent</artifactId>
18-
<version>2.5.5</version>
18+
<version>2.4.13</version>
1919
<relativePath/> <!-- lookup parent from repository -->
2020
</parent>
2121

@@ -25,7 +25,7 @@
2525
<java.version>1.8</java.version>
2626
<wrapper.version>1.0.27.RELEASE</wrapper.version>
2727
<aws-lambda-events.version>2.0.2</aws-lambda-events.version>
28-
<spring-cloud-function.version>3.1.6-SNAPSHOT</spring-cloud-function.version>
28+
<spring-cloud-function.version>3.1.6</spring-cloud-function.version>
2929
</properties>
3030

3131
<dependencies>

0 commit comments

Comments
 (0)