Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update dependencies for 1.0.0.M6

  • Loading branch information...
commit e231b3c93909be3ef9f994f16fbab57740355c66 1 parent d0a0e34
@ghillert ghillert authored
View
12 batch-basic/README.md
@@ -1,9 +1,7 @@
Spring XD Batch Simple Sample
=================================
-The purpose of this sample is to show how to deploy a simple batch process in Spring XD, without having to compile any code or install
-any jars.
-This example batch job will read a csv file, replace the commas with spaces and output the result to another file.
+The purpose of this sample is to show how to deploy a simple batch process in Spring XD, without having to compile any code or install any jars. This example batch job will read a csv file, replace the commas with spaces and output the result to another file.
## Requirements
@@ -38,14 +36,14 @@ You should see a message:
Successfully created and deployed job 'myBatchJob'
-
## Verify the result
-The simple_example batch job reads the contents /tmp/sample.txt and outputs its result to /tmp/sample1out.txt.
-So lets look at the contents /tmp/sample.txt (input) file:
+The simple_example batch job reads the contents `/tmp/sample.txt` and outputs its result to `/tmp/sample1out.txt`.
+
+So lets look at the contents `/tmp/sample.txt` (input) file:
h,e,l,l,o, ,w,o,r,l,d
-The /tmp/sample1out.txt (output) file will look like:
+The `/tmp/sample1out.txt` (output) file will look like:
h e l l o w o r l d
View
8 batch-basic/simple_example.xml
@@ -4,10 +4,10 @@
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.1.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
<!-- Set up our reader and its properties -->
<bean id="itemReader" class="org.springframework.batch.item.file.FlatFileItemReader">
View
2  batch-hashtag-count/README.md
@@ -27,7 +27,7 @@ As a result, you will see the following files and directories created under `tar
| | `-- hashtagcount.xml
```
-the modules/job directory defines the location of the file to import, HDFS directories to use as well as the name node location. You can verify the settings inside hashtagcount.xml. All relevant properties are defined in the util:property element:
+the modules/job directory defines the location of the file to import, HDFS directories to use as well as the name node location. You can verify the settings inside `hashtagcount.xml`. All relevant properties are defined in the `util:property` element:
<util:properties id="myProperties" >
<prop key="tweets.input.path">/xd/tweets/</prop>
View
2  batch-hashtag-count/pom.xml
@@ -27,7 +27,7 @@
<repositories>
<repository>
<id>spring-milestone</id>
- <url>http://repo.springsource.org/libs-milestone</url>
+ <url>http://repo.spring.io/libs-milestone</url>
</repository>
</repositories>
View
6 batch-notifications/pom.xml
@@ -13,9 +13,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring.integration.version>2.2.4.RELEASE</spring.integration.version>
- <spring.version>3.2.4.RELEASE</spring.version>
- <spring.batch.version>2.2.1.RELEASE</spring.batch.version>
+ <spring.integration.version>4.0.0.M4</spring.integration.version>
+ <spring.version>4.0.3.RELEASE</spring.version>
+ <spring.batch.version>3.0.0.M3</spring.batch.version>
</properties>
<repositories>
View
6 batch-simple/README.md
@@ -1,7 +1,7 @@
Spring XD Simple Batch Sample
=============================
-In this *Hello World* example for *Spring XD* you will create a minimal code-based Job. This Job does no processing, only printing out `Hello Spring XD!` as well as any Job parameters that were passed into the Job so as to focus only on the mechanics of the compiliation and copying of artifacts into the Spring XD installation directory.
+In this *Hello World* example for *Spring XD* you will create a minimal code-based Job. This Job does no processing, only printing out `Hello Spring XD!` as well as any Job parameters that were passed into the Job so as to focus only on the mechanics of the compiliation and copying of artifacts into the Spring XD installation directory.
## Requirements
@@ -37,7 +37,6 @@ In the `batch-simple` directory run the shell script copy-files.sh.
$ ./copy-files.sh
-
This will move the build artifacts into the `modules/job` and `lib` directories to the right locations under *$XD_HOME*.
Now your sample is ready to be executed. Start your *Spring XD* admin server (If it was already running, you must restart it):
@@ -114,5 +113,6 @@ You can also experiment with Job parameters:
You can trigger an exception by providing a parameter named `throwError` with a String value of `true`.
## Job Repository
-In this example the state of the Job execution is stored in an HSQLDB database embedded inside the single node server. Please refer to the Spring XD documentation if you would like to store this data in another database.
+
+In this example the state of the Job execution is stored in an HSQLDB database embedded inside the single node server. Please refer to the Spring XD documentation if you would like to store this data in another database.
View
49 batch-simple/pom.xml
@@ -14,10 +14,15 @@
This project is a minimal command line batch sample from Spring Batch.
]]>
</description>
+
+ <prerequisites>
+ <maven>2.2.1</maven>
+ </prerequisites>
+
<properties>
<maven.test.failure.ignore>true</maven.test.failure.ignore>
- <spring.framework.version>3.2.2.RELEASE</spring.framework.version>
- <spring.batch.version>2.2.0.RELEASE</spring.batch.version>
+ <spring.framework.version>4.0.3.RELEASE</spring.framework.version>
+ <spring.batch.version>3.0.0.M3</spring.batch.version>
</properties>
<profiles>
<profile>
@@ -45,7 +50,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -92,7 +97,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
@@ -102,17 +107,17 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.6.8</version>
+ <version>1.7.4</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.6.8</version>
+ <version>1.7.4</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
+ <version>1.2.17</version>
</dependency>
</dependencies>
@@ -122,16 +127,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
+ <compilerArgument>-Xlint:all</compilerArgument>
+ <showWarnings>true</showWarnings>
+ <showDeprecation>true</showDeprecation>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.1</version>
+ <version>1.2.1</version>
<configuration>
<mainClass>org.springframework.batch.core.launch.support.CommandLineJobRunner</mainClass>
<arguments>
@@ -146,6 +155,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<archive>
<index>true</index>
@@ -167,16 +177,11 @@
</configuration>
</plugin>
</plugins>
- </build>
-
- <pluginRepositories>
- <pluginRepository>
- <id>Codehaus</id>
- <url>http://repository.codehaus.org/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
+ </build>
+ <repositories>
+ <repository>
+ <id>spring-milestone</id>
+ <url>http://repo.spring.io/libs-milestone</url>
+ </repository>
+ </repositories>
</project>
View
4 batch-wordcount/README.md
@@ -52,13 +52,13 @@ Please verify particularly the following property:
## Running the Sample
-In the batch-wordcount directory copy the result of the build to the XD installation using the script. Your XD_HOME environment variable needs to be set to the install directory of XD
+In the `batch-wordcount` directory copy the result of the build to the XD installation using the script. Your `XD_HOME` environment variable needs to be set to the install directory of XD
$ ./copy-files.sh
Note that the `nietzsche-chapter-1.txt` file is copied to the /tmp directory.
-The wordcount sample is ready to be executed. For ease of use, start up the single node version of Spring XD that combines the admin and container nodes into one process. If it was already running, you must restart it.
+The wordcount sample is ready to be executed. For ease of use, start up the single node version of Spring XD that combines the admin and container nodes into one process. If it was already running, you must restart it.
xd/bin>$ ./xd-singlenode --hadoopDistro hadoop12
View
2  batch-wordcount/pom.xml
@@ -57,7 +57,7 @@
<repositories>
<repository>
<id>spring-milestone</id>
- <url>http://repo.springsource.org/libs-milestone</url>
+ <url>http://repo.spring.io/libs-milestone</url>
</repository>
</repositories>
View
27 gemfire-analytics/build.gradle
@@ -1,12 +1,3 @@
-/*
- * This build file was auto generated by running the Gradle 'buildSetup' task
- * by 'dturanski' at 'Mon Aug 12 14:26:54 EDT 2013' with Gradle 1.6
- *
- * This generated file contains an out - commented sample java project
- * to get you started. For a quick start with Gradle have a look at the Java Quickstart
- * chapter in the Gradle Userguide available at http://gradle.org/docs/1.6/userguide/tutorial_java_projects.html
- */
-
buildscript {
repositories {
maven { url "http://repo.spring.io/libs-snapshot" }
@@ -15,20 +6,20 @@ buildscript {
mavenLocal()
}
dependencies {
- classpath("org.springframework.boot:spring-boot-gradle-plugin:0.5.0.M3")
+ classpath("org.springframework.boot:spring-boot-gradle-plugin:1.0.1.RELEASE")
}
}
ext {
junitVersion = '4.11'
- springVersion = '4.0.0.RELEASE'
- springIntegrationVersion = '4.0.0.M2'
- slf4jVersion = '1.7.5'
+ springVersion = '4.0.3.RELEASE'
+ springIntegrationVersion = '4.0.0.M4'
+ slf4jVersion = '1.7.6'
log4jVersion = '1.2.17'
springDataGemfireVersion = '1.3.2.RELEASE'
- jacksonVersion = '2.2.2'
- springXdVersion ='1.0.0.M5'
- springBootVersion = '0.5.0.M6'
- springSocialVersion = "1.0.5.RELEASE"
+ jacksonVersion = '2.3.1'
+ springXdVersion ='1.0.0.M6'
+ springBootVersion = '1.0.1.RELEASE'
+ springSocialVersion = "1.1.0.M4"
}
allprojects {
@@ -106,5 +97,5 @@ project ('hashtag-analyzer') {
}
task wrapper(type: Wrapper) {
- gradleVersion = '1.7'
+ gradleVersion = '1.11'
}
Please sign in to comment.
Something went wrong with that request. Please try again.