Skip to content

Commit

Permalink
upgraded to XD 1.1.1.RELEASE and extracted shared config (versions)
Browse files Browse the repository at this point in the history
  • Loading branch information
David Turanski committed Mar 26, 2015
1 parent 8316c5e commit b949ef8
Show file tree
Hide file tree
Showing 36 changed files with 283 additions and 680 deletions.
41 changes: 8 additions & 33 deletions batch-hashtag-count/build.gradle
Original file line number Diff line number Diff line change
@@ -1,45 +1,20 @@

/*
NOTE: This configuration is convenient for maintaining shared configuration across multiple projects in the samples repo.
If copying this example, it may be simpler to declare the
required configuration inline.
*/
buildscript {
repositories {
maven { url "http://repo.spring.io/plugins-snapshot" }
maven { url "http://repo.spring.io/snapshot" }
jcenter()
}
dependencies {
classpath("org.springframework.xd:spring-xd-module-plugin:1.1.0.RC1")
}
}

ext {
springXdVersion = '1.1.0.RC1'
hadoopVersion = '2.6.0'
apply from: '../sample-modules-parent/buildscript.gradle',
to: buildscript
}

apply plugin: 'java'
apply plugin: 'eclipse'
apply plugin: 'idea'
apply from: '../sample-modules-parent/build.gradle'
apply plugin: 'spring-xd-module'

task wrapper(type: Wrapper) {
gradleVersion = '1.12'
}

group = 'org.springframework.xd.samples'
version = '1.0.0.BUILD-SNAPSHOT'

description = "Hadoop Batch Hashtag Count example"

sourceCompatibility = 1.6
targetCompatibility = 1.6

repositories {
maven { url "http://repo.spring.io/libs-release" }
mavenCentral()
jcenter()
maven { url "http://repo.spring.io/snapshot" }
maven { url "http://repo.spring.io/milestone" }
}

dependencies {
provided "org.apache.hadoop:hadoop-common:${hadoopVersion}"
provided "org.apache.hadoop:hadoop-mapreduce-client-jobclient:${hadoopVersion}"
Expand Down
23 changes: 4 additions & 19 deletions batch-hashtag-count/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,12 @@
</prerequisites>

<parent>
<groupId>org.springframework.xd</groupId>
<artifactId>spring-xd-module-parent</artifactId>
<version>1.1.0.RELEASE</version>
<groupId>org.springframework.xd.samples</groupId>
<artifactId>sample-modules-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath>../sample-modules-parent</relativePath>
</parent>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hadoop.version>2.6.0</hadoop.version>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Expand All @@ -36,16 +32,5 @@
<scope>provided</scope>
</dependency>
</dependencies>

<repositories>
<repository>
<id>spring-release</id>
<url>http://repo.spring.io/release</url>
</repository>
<repository>
<id>jcenter</id>
<url>http://jcenter.bintray.com</url>
</repository>
</repositories>
</project>

23 changes: 4 additions & 19 deletions batch-hive/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,10 @@
</prerequisites>

<parent>
<groupId>org.springframework.xd</groupId>
<artifactId>spring-xd-module-parent</artifactId>
<version>1.1.0.RELEASE</version>
<groupId>org.springframework.xd.samples</groupId>
<artifactId>sample-modules-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath>../sample-modules-parent</relativePath>
</parent>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hadoop.version>2.6.0</hadoop.version>
</properties>

<repositories>
<repository>
<id>spring-release</id>
<url>http://repo.spring.io/release</url>
</repository>
<repository>
<id>jcenter</id>
<url>http://jcenter.bintray.com</url>
</repository>
</repositories>
</project>

33 changes: 8 additions & 25 deletions batch-notifications/build.gradle
Original file line number Diff line number Diff line change
@@ -1,32 +1,15 @@

/*
NOTE: This configuration is convenient for maintaining shared configuration across multiple projects in the samples repo.
If copying this example, it may be simpler to declare the
required configuration inline.
*/
buildscript {
repositories {
maven { url "http://repo.spring.io/plugins-snapshot" }
maven { url "http://repo.spring.io/snapshot" }
maven { url "http://repo.spring.io/release" }
jcenter()
}
dependencies {
classpath("org.springframework.xd:spring-xd-module-plugin:1.1.0.RELEASE")
}
}

ext {
springXdVersion = '1.1.0.RELEASE'
apply from: '../sample-modules-parent/buildscript.gradle',
to: buildscript
}

apply plugin: 'java'
apply plugin: 'eclipse'
apply plugin: 'idea'
apply from: '../sample-modules-parent/build.gradle'
apply plugin: 'spring-xd-module'

task wrapper(type: Wrapper) {
gradleVersion = '1.12'
}

group = 'org.springframework.xd.samples'
version = '1.0.0.BUILD-SNAPSHOT'

description = "Payments Import with Notifications example"

sourceCompatibility = 1.6
Expand Down
22 changes: 4 additions & 18 deletions batch-notifications/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,10 @@
</prerequisites>

<parent>
<groupId>org.springframework.xd</groupId>
<artifactId>spring-xd-module-parent</artifactId>
<version>1.1.0.RELEASE</version>
<groupId>org.springframework.xd.samples</groupId>
<artifactId>sample-modules-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath>../sample-modules-parent</relativePath>
</parent>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<repositories>
<repository>
<id>spring-release</id>
<url>http://repo.spring.io/release</url>
</repository>
<repository>
<id>jcenter</id>
<url>http://jcenter.bintray.com</url>
</repository>
</repositories>
</project>

23 changes: 4 additions & 19 deletions batch-pig/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,10 @@
</prerequisites>

<parent>
<groupId>org.springframework.xd</groupId>
<artifactId>spring-xd-module-parent</artifactId>
<version>1.1.0.RELEASE</version>
<groupId>org.springframework.xd.samples</groupId>
<artifactId>sample-modules-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath>../sample-modules-parent</relativePath>
</parent>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hadoop.version>2.6.0</hadoop.version>
</properties>

<repositories>
<repository>
<id>spring-release</id>
<url>http://repo.spring.io/release</url>
</repository>
<repository>
<id>jcenter</id>
<url>http://jcenter.bintray.com</url>
</repository>
</repositories>
</project>

41 changes: 8 additions & 33 deletions batch-simple/build.gradle
Original file line number Diff line number Diff line change
@@ -1,41 +1,16 @@

/*
NOTE: This configuration is convenient for maintaining shared configuration across multiple projects in the samples repo.
If copying this example, it may be simpler to declare the
required configuration inline.
*/
buildscript {
repositories {
maven { url "http://repo.spring.io/plugins-snapshot" }
maven { url "http://repo.spring.io/snapshot" }
maven { url "http://repo.spring.io/release" }
jcenter()
}
dependencies {
classpath("org.springframework.xd:spring-xd-module-plugin:1.1.0.RELEASE")
}
}

ext {
springXdVersion = '1.1.0.RELEASE'
apply from: '../sample-modules-parent/buildscript.gradle',
to: buildscript
}

apply plugin: 'java'
apply plugin: 'eclipse'
apply plugin: 'idea'
apply from: '../sample-modules-parent/build.gradle'
apply plugin: 'spring-xd-module'

task wrapper(type: Wrapper) {
gradleVersion = '1.12'
}

group = 'org.springframework.xd.samples'
version = '1.0.0.BUILD-SNAPSHOT'

description = "Batch Simple Example"

sourceCompatibility = 1.6
targetCompatibility = 1.6

repositories {
maven { url "http://repo.spring.io/release" }
mavenCentral()
jcenter()
maven { url "http://repo.spring.io/snapshot" }
maven { url "http://repo.spring.io/milestone" }
}
22 changes: 4 additions & 18 deletions batch-simple/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,9 @@
</prerequisites>

<parent>
<groupId>org.springframework.xd</groupId>
<artifactId>spring-xd-module-parent</artifactId>
<version>1.1.0.RELEASE</version>
<groupId>org.springframework.xd.samples</groupId>
<artifactId>sample-modules-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath>../sample-modules-parent</relativePath>
</parent>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<repositories>
<repository>
<id>spring-release</id>
<url>http://repo.spring.io/release</url>
</repository>
<repository>
<id>jcenter</id>
<url>http://jcenter.bintray.com</url>
</repository>
</repositories>
</project>
23 changes: 4 additions & 19 deletions batch-wordcount/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,12 @@
</prerequisites>

<parent>
<groupId>io.spring.platform</groupId>
<artifactId>platform-bom</artifactId>
<version>1.1.1.RELEASE</version>
<relativePath/>
<groupId>org.springframework.xd.samples</groupId>
<artifactId>sample-modules-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath>../sample-modules-parent</relativePath>
</parent>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<repositories>
<repository>
<id>spring-milestone</id>
<url>http://repo.spring.io/milestone</url>
</repository>
<repository>
<id>spring-release</id>
<url>http://repo.spring.io/release</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
Expand Down
41 changes: 8 additions & 33 deletions groovy-script-sink/build.gradle
Original file line number Diff line number Diff line change
@@ -1,46 +1,21 @@

/*
NOTE: This configuration is convenient for maintaining shared configuration across multiple projects in the samples repo.
If copying this example, it may be simpler to declare the
required configuration inline.
*/
buildscript {
repositories {
maven { url "http://repo.spring.io/plugins-snapshot" }
maven { url "http://repo.spring.io/snapshot" }
maven { url "http://repo.spring.io/release" }
jcenter()
}
dependencies {
classpath("org.springframework.xd:spring-xd-module-plugin:1.1.0.RELEASE")
}
apply from: '../sample-modules-parent/buildscript.gradle',
to: buildscript
}

ext {
springXdVersion = '1.1.0.RELEASE'
springIntegrationVersion = '4.1.2.RELEASE'
}

apply plugin: 'java'
apply plugin: 'eclipse'
apply plugin: 'idea'
apply from: '../sample-modules-parent/build.gradle'
apply plugin: 'spring-xd-module'

task wrapper(type: Wrapper) {
gradleVersion = '1.12'
}

group = 'com.acme'
version = '1.0.0.BUILD-SNAPSHOT'

description = "Spring XD custom Groovy sink"

sourceCompatibility = 1.7
targetCompatibility = 1.7

repositories {
maven { url "http://repo.spring.io/release" }
mavenCentral()
jcenter()
maven { url "http://repo.spring.io/snapshot" }
maven { url "http://repo.spring.io/milestone" }
}

dependencies {
compile "org.springframework.xd:spring-xd-extension-script:$springXdVersion"
}
Loading

0 comments on commit b949ef8

Please sign in to comment.