SpringCloud/spring-functions-catalog
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor hardcoded versions in functions submodule branches

Browse Source 
This is so they can be updated in a minimal amount of places and leverage the maven hierarchy to propagate them where appropriate.
While working with SNAPSHOT releases of Spring Boot, Spring Integration, and Spring Cloud, it required touching every pom.xml file
in order to reflect the use of the SNAPSHOT. After this change, it will only be required to change the property in the top
functions pom.xml and the versions will reflect to all submodules.

Maven introduced the ability use a key property, revision to propagate this information to the <parent> declarations in each pom.

This was enabled in Maven 3.5+
https://maven.apache.org/maven-ci-friendly.html
This commit is contained in:
Daniel Frey
2020-10-09 16:49:58 -04:00
committed by Soby Chacko
parent c309fabf08
commit 724c4ace5f
74 changed files with 871 additions and 1722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
function/aggregator-function/pom.xml
View File

@@ -2,18 +2,17 @@
<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>
<artifactId>aggregator-function</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>aggregator-function</name>
<description>Spring Native Function for Aggregator</description>
<parent>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spring-functions-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../spring-functions-parent</relativePath>
<artifactId>java-functions-function-parent</artifactId>
<version>${revision}</version>
</parent>
<artifactId>aggregator-function</artifactId>
<name>aggregator-function</name>
<description>Spring Native Function for Aggregator</description>
<dependencies>
<dependency>
<groupId>org.springframework.cloud.fn</groupId>

13
function/filter-function/pom.xml
View File

@@ -2,18 +2,17 @@
<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>
<artifactId>filter-function</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>filter-function</name>
<description>Spring Native Function for applying filter SpEL expressions</description>
<parent>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spring-functions-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../spring-functions-parent</relativePath>
<artifactId>java-functions-function-parent</artifactId>
<version>${revision}</version>
</parent>
<artifactId>filter-function</artifactId>
<name>filter-function</name>
<description>Spring Native Function for applying filter SpEL expressions</description>
<dependencies>
<dependency>
<groupId>org.springframework.cloud.fn</groupId>

13
function/header-enricher-function/pom.xml
View File

@@ -2,18 +2,17 @@
<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>
<artifactId>header-enricher-function</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>header-enricher-function</name>
<description>Spring Native Function for applying message header enrichment</description>
<parent>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spring-functions-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../spring-functions-parent</relativePath>
<artifactId>java-functions-function-parent</artifactId>
<version>${revision}</version>
</parent>
<artifactId>header-enricher-function</artifactId>
<name>header-enricher-function</name>
<description>Spring Native Function for applying message header enrichment</description>
<dependencies>
<dependency>
<groupId>org.springframework.cloud.fn</groupId>

46
function/http-request-function/pom.xml
View File

@@ -2,65 +2,45 @@
<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>
<artifactId>http-request-function</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>http-request-function</name>
<description>Spring Native Function for Submitting an HTTP request</description>
<parent>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spring-functions-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../spring-functions-parent</relativePath>
<artifactId>java-functions-function-parent</artifactId>
<version>${revision}</version>
</parent>
<artifactId>http-request-function</artifactId>
<name>http-request-function</name>
<description>Spring Native Function for Submitting an HTTP request</description>
<properties>
<mockwebserver.version>4.6.0</mockwebserver.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>config-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-messaging</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
</exclusions>
<groupId>org.springframework</groupId>
<artifactId>spring-messaging</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

2
function/image-recognition-function/README.adoc
View File

@@ -25,7 +25,7 @@ Add the `image-recognition` dependency to the pom (use the latest version availa
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>image-recognition-function</artifactId>
<version>${spring-cloud-fn.version}</version>
<version>${revision}</version>
</dependency>
----

20
function/image-recognition-function/pom.xml
View File

@@ -2,31 +2,33 @@
<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>
<artifactId>image-recognition-function</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>image-recognition-function</name>
<description>Spring Native Function for Tensorflow Integration</description>
<parent>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spring-functions-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../spring-functions-parent</relativePath>
<artifactId>java-functions-function-parent</artifactId>
<version>${revision}</version>
</parent>
<artifactId>image-recognition-function</artifactId>
<name>image-recognition-function</name>
<description>Spring Native Function for Tensorflow Integration</description>
<properties>
<commons-io.version>1.3.2</commons-io.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>tensorflow-common</artifactId>
<version>${spring-cloud-fn.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>tensorflow-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
@@ -34,5 +36,7 @@
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</project>

2
function/object-detection-function/README.adoc
View File

@@ -28,7 +28,7 @@ Add the `object-detection` dependency to the pom (use the latest version availab
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>object-detection-function</artifactId>
<version>${spring-cloud-fn.version}</version>
<version>${revision}</version>
</dependency>
----

21
function/object-detection-function/pom.xml
View File

@@ -2,30 +2,25 @@
<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>
<artifactId>object-detection-function</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>object-detection-function</name>
<description>Spring Native Function for Tensorflow Integration</description>
<parent>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spring-functions-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../spring-functions-parent</relativePath>
<artifactId>java-functions-function-parent</artifactId>
<version>${revision}</version>
</parent>
<artifactId>object-detection-function</artifactId>
<name>object-detection-function</name>
<description>Spring Native Function for Tensorflow Integration</description>
<dependencies>
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>tensorflow-common</artifactId>
<version>${spring-cloud-fn.version}</version>
<version>${project.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.tensorflow</groupId>-->
<!-- <artifactId>tensorflow-hadoop</artifactId>-->
<!-- <version>1.15.0</version>-->
<!-- </dependency>-->
</dependencies>
<build>

25
function/payload-converter-function/pom.xml
View File

@@ -3,35 +3,24 @@
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>
<artifactId>payload-converter-function</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>payload-converter-function</name>
<description>Utility message conversion functions</description>
<parent>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spring-functions-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../spring-functions-parent</relativePath>
<artifactId>java-functions-function-parent</artifactId>
<version>${revision}</version>
</parent>
<artifactId>payload-converter-function</artifactId>
<name>payload-converter-function</name>
<description>Utility message conversion functions</description>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-messaging</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>

34
function/pom.xml Normal file
View File

@@ -0,0 +1,34 @@
<?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.fn</groupId>
<artifactId>java-functions-parent</artifactId>
<version>${revision}</version>
</parent>
<artifactId>java-functions-function-parent</artifactId>
<name>java-functions-function-parent</name>
<description>Pivotal Java Functions Function Parent</description>
<packaging>pom</packaging>
<modules>
<module>aggregator-function</module>
<module>filter-function</module>
<module>header-enricher-function</module>
<module>http-request-function</module>
<module>spel-function</module>
<module>payload-converter-function</module>
<module>splitter-function</module>
<module>tasklauncher-function</module>
<module>task-launch-request-function</module>
<module>twitter-function</module>
<module>image-recognition-function</module>
<module>object-detection-function</module>
<module>semantic-segmentation-function</module>
</modules>
</project>

4
function/semantic-segmentation-function/README.adoc
View File

@@ -26,13 +26,13 @@ Add the `semantic-segmentation` dependency to your pom (_use the latest version
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>semantic-segmentation-function</artifactId>
<version>${spring-cloud-fn.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>object-detection-function</artifactId>
<version>${spring-cloud-fn.version}</version>
<version>${revision}</version>
</dependency>
----

20
function/semantic-segmentation-function/pom.xml
View File

@@ -2,31 +2,33 @@
<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>
<artifactId>semantic-segmentation-function</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>semantic-segmentation-function</name>
<description>Spring Native Function for Tensorflow semantic-segmentation integration</description>
<parent>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spring-functions-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../spring-functions-parent</relativePath>
<artifactId>java-functions-function-parent</artifactId>
<version>${revision}</version>
</parent>
<artifactId>semantic-segmentation-function</artifactId>
<name>semantic-segmentation-function</name>
<description>Spring Native Function for Tensorflow semantic-segmentation integration</description>
<properties>
<commons-io.version>1.3.2</commons-io.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>tensorflow-common</artifactId>
<version>${spring-cloud-fn.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>tensorflow-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
@@ -34,5 +36,7 @@
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</project>

34
function/spel-function/pom.xml
View File

@@ -2,45 +2,25 @@
<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>
<artifactId>spel-function</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>spel-function</name>
<description>Spring Native Function for applying SpEL expressions</description>
<parent>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spring-functions-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../spring-functions-parent</relativePath>
<artifactId>java-functions-function-parent</artifactId>
<version>${revision}</version>
</parent>
<artifactId>spel-function</artifactId>
<name>spel-function</name>
<description>Spring Native Function for applying SpEL expressions</description>
<dependencies>
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>payload-converter-function</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-integration</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

37
function/splitter-function/pom.xml
View File

@@ -2,49 +2,24 @@
<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>
<artifactId>splitter-function</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>splitter-function</name>
<description>Spring Native Function for Splitter</description>
<parent>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spring-functions-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../spring-functions-parent</relativePath>
<artifactId>java-functions-function-parent</artifactId>
<version>${revision}</version>
</parent>
<artifactId>splitter-function</artifactId>
<name>splitter-function</name>
<description>Spring Native Function for Splitter</description>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-integration</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-file</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

9
function/task-launch-request-function/pom.xml
View File

@@ -2,15 +2,14 @@
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spring-functions-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../spring-functions-parent</relativePath>
<artifactId>java-functions-function-parent</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>task-launch-request-function</artifactId>
<name>task-launch-request-function</name>

31
function/tasklauncher-function/pom.xml
View File

@@ -2,28 +2,23 @@
<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>
<artifactId>tasklauncher-function</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>tasklauncher-function</name>
<description>Spring Native Function for applying filter SpEL expressions</description>
<parent>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spring-functions-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../spring-functions-parent</relativePath>
<artifactId>java-functions-function-parent</artifactId>
<version>${revision}</version>
</parent>
<artifactId>tasklauncher-function</artifactId>
<name>tasklauncher-function</name>
<description>Spring Native Function for applying filter SpEL expressions</description>
<properties>
<spring.cloud.dataflow.version>2.5.1.RELEASE</spring.cloud.dataflow.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-rest-client</artifactId>
@@ -39,17 +34,7 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>

36
function/twitter-function/pom.xml
View File

@@ -2,46 +2,25 @@
<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>
<artifactId>twitter-function</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>twitter-function</name>
<description>twitter functions</description>
<parent>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spring-functions-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../spring-functions-parent</relativePath>
<artifactId>java-functions-function-parent</artifactId>
<version>${revision}</version>
</parent>
<artifactId>twitter-function</artifactId>
<name>twitter-function</name>
<description>twitter functions</description>
<dependencies>
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>twitter-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-integration</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mock-server</groupId>
<artifactId>mockserver-netty</artifactId>
@@ -54,6 +33,7 @@
<version>5.10</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>