Skip to content
This repository has been archived by the owner on Jul 9, 2022. It is now read-only.

Commit

Permalink
Remove duplicate SCS and SI-test dependencies
Browse files Browse the repository at this point in the history
All the starters were individually having SCS and SI test dependencies.
Moving them to the parent

Polishing according PR comments

* Add repo for Gemfire into `.setting.xml`
* Move deps version properties into the `spring-cloud-stream-app-dependencies` module
* Clean up some dependencies in the modules
  • Loading branch information
sobychacko authored and artembilan committed May 10, 2016
1 parent 1fe9b82 commit f1d3831
Show file tree
Hide file tree
Showing 59 changed files with 262 additions and 1,137 deletions.
141 changes: 78 additions & 63 deletions .settings.xml
@@ -1,66 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
<servers>
<server>
<id>repo.spring.io</id>
<username>${env.CI_DEPLOY_USERNAME}</username>
<password>${env.CI_DEPLOY_PASSWORD}</password>
</server>
</servers>
<profiles>
<profile>
<!--
N.B. this profile is only here to support users and IDEs that do not use Maven 3.3.
It isn't needed on the command line if you use the wrapper script (mvnw) or if you use
a native Maven with the right version. Eclipse users should points their Maven tooling to
this settings file, or copy the profile into their ~/.m2/settings.xml.
-->
<id>spring</id>
<activation><activeByDefault>true</activeByDefault></activation>
<repositories>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>http://repo.spring.io/libs-snapshot-local</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>http://repo.spring.io/libs-milestone-local</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>spring-releases</id>
<name>Spring Releases</name>
<url>http://repo.spring.io/release</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>http://repo.spring.io/libs-snapshot-local</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>http://repo.spring.io/libs-milestone-local</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<servers>
<server>
<id>repo.spring.io</id>
<username>${env.CI_DEPLOY_USERNAME}</username>
<password>${env.CI_DEPLOY_PASSWORD}</password>
</server>
</servers>
<profiles>
<profile>
<!--
N.B. this profile is only here to support users and IDEs that do not use Maven 3.3.
It isn't needed on the command line if you use the wrapper script (mvnw) or if you use
a native Maven with the right version. Eclipse users should points their Maven tooling to
this settings file, or copy the profile into their ~/.m2/settings.xml.
-->
<id>spring</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>http://repo.spring.io/libs-snapshot-local</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>http://repo.spring.io/libs-milestone-local</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>spring-releases</id>
<name>Spring Releases</name>
<url>http://repo.spring.io/release</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<!-- Gemstone repository is needed since gemfire libs
are not hosted in mvn central. Note that the libs
are also hosted and browsable at
https://repo.spring.io/gemstone-release-cache -->
<repository>
<id>gemstone-release</id>
<name>GemStone Maven Release Repository</name>
<url>http://dist.gemstone.com/maven/release</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>http://repo.spring.io/libs-snapshot-local</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>http://repo.spring.io/libs-milestone-local</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
</settings>
15 changes: 0 additions & 15 deletions app-starters-common/app-starters-annotation-common/pom.xml
Expand Up @@ -10,19 +10,4 @@
<artifactId>app-starters-annotation-common</artifactId>
<name>app-starters-annotation-common</name>

<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream</artifactId>
<version>${spring-cloud-stream.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-java-dsl</artifactId>
<version>${spring-integration-java-dsl.version}</version>
</dependency>

</dependencies>

</project>
13 changes: 0 additions & 13 deletions app-starters-common/app-starters-file-common/pom.xml
Expand Up @@ -11,24 +11,11 @@
<name>app-starters-file-common</name>

<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream</artifactId>
<version>${spring-cloud-stream.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-java-dsl</artifactId>
<version>1.1.2.RELEASE</version>
</dependency>

<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-file</artifactId>
<optional>true</optional>
</dependency>

</dependencies>

</project>
15 changes: 0 additions & 15 deletions app-starters-common/app-starters-ftp-common/pom.xml
Expand Up @@ -11,30 +11,15 @@
<name>app-starters-ftp-common</name>

<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream</artifactId>
<version>${spring-cloud-stream.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-java-dsl</artifactId>
<version>1.1.2.RELEASE</version>
</dependency>

<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ftp</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>app-starters-file-common</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
</dependency>

</dependencies>

</project>
15 changes: 0 additions & 15 deletions app-starters-common/app-starters-metrics-common/pom.xml
Expand Up @@ -10,19 +10,4 @@
<artifactId>app-starters-metrics-common</artifactId>
<name>app-starters-metrics-common</name>

<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream</artifactId>
<version>${spring-cloud-stream.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-java-dsl</artifactId>
<version>1.1.2.RELEASE</version>
</dependency>

</dependencies>

</project>
13 changes: 0 additions & 13 deletions app-starters-common/app-starters-script-common/pom.xml
Expand Up @@ -11,24 +11,11 @@
<name>app-starters-script-common</name>

<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream</artifactId>
<version>${spring-cloud-stream.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-java-dsl</artifactId>
<version>1.1.2.RELEASE</version>
</dependency>

<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-groovy</artifactId>
<optional>true</optional>
</dependency>

</dependencies>

</project>
15 changes: 0 additions & 15 deletions app-starters-common/app-starters-sftp-common/pom.xml
Expand Up @@ -11,30 +11,15 @@
<name>app-starters-sftp-common</name>

<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream</artifactId>
<version>${spring-cloud-stream.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-java-dsl</artifactId>
<version>1.1.2.RELEASE</version>
</dependency>

<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-sftp</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>app-starters-file-common</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
</dependency>

</dependencies>

</project>
13 changes: 0 additions & 13 deletions app-starters-common/app-starters-tcp-common/pom.xml
Expand Up @@ -11,24 +11,11 @@
<name>app-starters-tcp-common</name>

<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream</artifactId>
<version>${spring-cloud-stream.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-java-dsl</artifactId>
<version>1.1.2.RELEASE</version>
</dependency>

<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ip</artifactId>
<optional>true</optional>
</dependency>

</dependencies>

</project>
15 changes: 0 additions & 15 deletions app-starters-common/app-starters-time-common/pom.xml
Expand Up @@ -10,19 +10,4 @@
<artifactId>app-starters-time-common</artifactId>
<name>app-starters-time-common</name>

<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream</artifactId>
<version>${spring-cloud-stream.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-java-dsl</artifactId>
<version>1.1.2.RELEASE</version>
</dependency>

</dependencies>

</project>
15 changes: 0 additions & 15 deletions app-starters-common/app-starters-trigger-common/pom.xml
Expand Up @@ -11,19 +11,4 @@
<packaging>jar</packaging>
<name>app-starters-trigger-common</name>

<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream</artifactId>
<version>${spring-cloud-stream.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-java-dsl</artifactId>
<version>1.1.2.RELEASE</version>
</dependency>

</dependencies>

</project>
13 changes: 0 additions & 13 deletions app-starters-common/app-starters-twitter-common/pom.xml
Expand Up @@ -11,24 +11,11 @@
<name>app-starters-twitter-common</name>

<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream</artifactId>
<version>${spring-cloud-stream.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-java-dsl</artifactId>
<version>1.1.2.RELEASE</version>
</dependency>

<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-ip</artifactId>
<optional>true</optional>
</dependency>

</dependencies>

</project>
7 changes: 7 additions & 0 deletions app-starters-common/pom.xml
Expand Up @@ -24,4 +24,11 @@
<module>app-starters-twitter-common</module>
</modules>

<dependencies>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-java-dsl</artifactId>
</dependency>
</dependencies>

</project>

0 comments on commit f1d3831

Please sign in to comment.