More restructuring and cleanup

Move stream-applications-build to top level release-train folder

Add build folder to .gitignore
This commit is contained in:
Soby Chacko
2020-10-14 15:01:33 -04:00
parent b5a753d90a
commit 0cdce97e98
39 changed files with 52 additions and 9 deletions

4
.gitignore vendored
View File

@@ -6,7 +6,8 @@ asciidoctor.css
.#*
*#
target/
build/
#release-train/
build
bin/
_site/
.classpath
@@ -25,3 +26,4 @@ dump.rdb
coverage-error.log
.apt_generated
aws.credentials.properties
.flattened-pom.xml

View File

@@ -13,7 +13,6 @@
<module>source</module>
<module>sink</module>
<module>processor</module>
<module>stream-applications-build</module>
</modules>
</project>

View File

@@ -21,7 +21,7 @@
<parent>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-core</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>stream-applications-core</artifactId>
<groupId>org.springframework.cloud.stream.app</groupId>
<version>3.0.0-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../..</relativePath>
</parent>
<properties>

View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>stream-applications-core</artifactId>
<groupId>org.springframework.cloud.stream.app</groupId>
<version>3.0.0-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>stream-applications-core</artifactId>
<groupId>org.springframework.cloud.stream.app</groupId>
<version>3.0.0-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>stream-applications-core</artifactId>
<groupId>org.springframework.cloud.stream.app</groupId>
<version>3.0.0-SNAPSHOT</version>
<version>${revision}</version>
<relativePath>../..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-core</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>${revision}</version>
<name>stream-applications-core</name>
<description>Stream Applications Core Parent</description>
<packaging>pom</packaging>
@@ -17,6 +17,7 @@
</parent>
<properties>
<revision>3.0.0-SNAPSHOT</revision>
<apps.base-image>springcloud/baseimage:1.0.0</apps.base-image>
<java.version>1.8</java.version>
<spring-boot.version>2.3.4.RELEASE</spring-boot.version>
@@ -472,6 +473,31 @@
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.5</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>

View File

@@ -12,5 +12,6 @@
<modules>
<module>functions</module>
<module>applications</module>
<module>release-train</module>
</modules>
</project>

15
release-train/pom.xml Normal file
View File

@@ -0,0 +1,15 @@
<?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>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>release-train</artifactId>
<version>3.0.0-SNAPSHOT</version>
<name>release train</name>
<description>Release train for stream applications</description>
<packaging>pom</packaging>
<modules>
<module>stream-applications-build</module>
</modules>
</project>

View File

@@ -10,7 +10,7 @@
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-core</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../stream-applications-core</relativePath>
<relativePath>../../applications/stream-applications-core/pom.xml</relativePath>
</parent>
<modules>