Skip to content

Commit

Permalink
Revert to snapshots
Browse files Browse the repository at this point in the history
  • Loading branch information
dsyer committed Jun 18, 2018
1 parent ac3ea7d commit 068b9ef
Show file tree
Hide file tree
Showing 43 changed files with 58 additions and 58 deletions.
2 changes: 1 addition & 1 deletion docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-parent</artifactId>
<version>1.0.0.RELEASE</version>
<version>1.0.1.BUILD-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<name>Spring Cloud Function Docs</name>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/adapters/aws-intro.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Build the sample under `spring-cloud-function-samples/function-sample-aws` and u
Using the AWS command line tools it looks like this:

----
aws lambda create-function --function-name Uppercase --role arn:aws:iam::[USERID]:role/service-role/[ROLE] --zip-file fileb://function-sample-aws/target/function-sample-aws-1.0.0.RELEASE-aws.jar --handler org.springframework.cloud.function.adapter.aws.SpringBootStreamHandler --description "Spring Cloud Function Adapter Example" --runtime java8 --region us-east-1 --timeout 30 --memory-size 1024 --publish
aws lambda create-function --function-name Uppercase --role arn:aws:iam::[USERID]:role/service-role/[ROLE] --zip-file fileb://function-sample-aws/target/function-sample-aws-1.0.1.BUILD-SNAPSHOT-aws.jar --handler org.springframework.cloud.function.adapter.aws.SpringBootStreamHandler --description "Spring Cloud Function Adapter Example" --runtime java8 --region us-east-1 --timeout 30 --memory-size 1024 --publish
----

The input type for the function in the AWS sample is a Foo with a single property called "value". So you would need this to test it:
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/adapters/azure-intro.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The Azure tooling needs to find some JSON configuration files to tell it how to

```
{
"scriptFile" : "../function-sample-azure-1.0.0.RELEASE-azure.jar",
"scriptFile" : "../function-sample-azure-1.0.1.BUILD-SNAPSHOT-azure.jar",
"entryPoint" : "example.FooHandler.execute",
"bindings" : [ {
"type" : "httpTrigger",
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/adapters/openwhisk-quick-start.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies.function: com.example:pof:0.0.1-SNAPSHOT
Copy the openwhisk runner JAR to the working directory (same directory as the properties file):

```
cp spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/target/spring-cloud-function-adapter-openwhisk-1.0.0.RELEASE.jar runner.jar
cp spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/target/spring-cloud-function-adapter-openwhisk-1.0.1.BUILD-SNAPSHOT.jar runner.jar
```

Generate a m2 repo from the `--thin.dryrun` of the runner JAR with the above properties file:
Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/asciidoc/ghpages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ function copy_docs_for_current_version() {
file=${f#docs/target/generated-docs/*}
if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
# Not ignored...
# We want users to access 1.0.0.RELEASE/ instead of 1.0.0.RELEASE/spring-cloud.sleuth.html
# We want users to access 1.0.1.BUILD-SNAPSHOT/ instead of 1.0.0.RELEASE/spring-cloud.sleuth.html
if [[ "${file}" == "${MAIN_ADOC_VALUE}.html" ]] ; then
# We don't want to copy the spring-cloud-sleuth.html
# we want it to be converted to index.html
Expand Down Expand Up @@ -197,7 +197,7 @@ function copy_docs_for_branch() {
local destination=$2
if ! git ls-files -i -o --exclude-standard --directory | grep -q ^${file}$; then
# Not ignored...
# We want users to access 1.0.0.RELEASE/ instead of 1.0.0.RELEASE/spring-cloud.sleuth.html
# We want users to access 1.0.1.BUILD-SNAPSHOT/ instead of 1.0.0.RELEASE/spring-cloud.sleuth.html
if [[ ("${file}" == "${MAIN_ADOC_VALUE}.html") || ("${file}" == "${REPO_NAME}.html") ]] ; then
# We don't want to copy the spring-cloud-sleuth.html
# we want it to be converted to index.html
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<artifactId>spring-cloud-function-parent</artifactId>
<name>Spring Cloud Function Parent</name>
<version>1.0.0.RELEASE</version>
<version>1.0.1.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion scripts/function-registry.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

java -jar ../spring-cloud-function-compiler/target/spring-cloud-function-compiler-1.0.0.RELEASE.jar
java -jar ../spring-cloud-function-compiler/target/spring-cloud-function-compiler-1.0.1.BUILD-SNAPSHOT.jar
2 changes: 1 addition & 1 deletion scripts/stream.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ while getopts ":i:s:f:c:o:p:d:" opt; do
esac
done

java -jar ../spring-cloud-function-samples/function-sample-compiler/target/function-sample-compiler-1.0.0.RELEASE.jar\
java -jar ../spring-cloud-function-samples/function-sample-compiler/target/function-sample-compiler-1.0.1.BUILD-SNAPSHOT.jar\
--management.security.enabled=false\
--server.port=$PORT\
--spring.cloud.function.stream.endpoint=$FUNC\
Expand Down
2 changes: 1 addition & 1 deletion scripts/task.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ while getopts ":s:f:c:" opt; do
esac
done

java -noverify -XX:TieredStopAtLevel=1 -Xss256K -Xms16M -Xmx256M -XX:MaxMetaspaceSize=128M -jar ../spring-cloud-function-task/target/spring-cloud-function-task-1.0.0.RELEASE.jar\
java -noverify -XX:TieredStopAtLevel=1 -Xss256K -Xms16M -Xmx256M -XX:MaxMetaspaceSize=128M -jar ../spring-cloud-function-task/target/spring-cloud-function-task-1.0.1.BUILD-SNAPSHOT.jar\
--lambda.supplier=$SUPP --lambda.function=$FUNC --lambda.consumer=$CONS
2 changes: 1 addition & 1 deletion scripts/web.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ while getopts ":s:f:c:p:" opt; do
esac
done

java -jar ../spring-cloud-function-samples/function-sample-compiler/target/function-sample-compiler-1.0.0.RELEASE.jar\
java -jar ../spring-cloud-function-samples/function-sample-compiler/target/function-sample-compiler-1.0.1.BUILD-SNAPSHOT.jar\
--spring.cloud.function.import.$FUNC.type=$TYPE\
--spring.cloud.function.import.$FUNC.location=file:///tmp/function-registry/$TYPE's'/$FUNC.fun\
--management.security.enabled=false\
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-function-adapters/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-parent</artifactId>
<version>1.0.0.RELEASE</version>
<version>1.0.1.BUILD-SNAPSHOT</version>
</parent>

<name>spring-cloud-function-adapter-parent</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Build the sample under `spring-cloud-function-samples/function-sample-aws` and u
Using the AWS command line tools it looks like this:

----
aws lambda create-function --function-name Uppercase --role arn:aws:iam::[USERID]:role/service-role/[ROLE] --zip-file fileb://function-sample-aws/target/function-sample-aws-1.0.0.RELEASE-aws.jar --handler org.springframework.cloud.function.adapter.aws.SpringBootStreamHandler --description "Spring Cloud Function Adapter Example" --runtime java8 --region us-east-1 --timeout 30 --memory-size 1024 --publish
aws lambda create-function --function-name Uppercase --role arn:aws:iam::[USERID]:role/service-role/[ROLE] --zip-file fileb://function-sample-aws/target/function-sample-aws-1.0.1.BUILD-SNAPSHOT-aws.jar --handler org.springframework.cloud.function.adapter.aws.SpringBootStreamHandler --description "Spring Cloud Function Adapter Example" --runtime java8 --region us-east-1 --timeout 30 --memory-size 1024 --publish
----

The input type for the function in the AWS sample is a Foo with a single property called "value". So you would need this to test it:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-adapter-parent</artifactId>
<version>1.0.0.RELEASE</version>
<version>1.0.1.BUILD-SNAPSHOT</version>
</parent>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ The Azure tooling needs to find some JSON configuration files to tell it how to

```
{
"scriptFile" : "../function-sample-azure-1.0.0.RELEASE-azure.jar",
"scriptFile" : "../function-sample-azure-1.0.1.BUILD-SNAPSHOT-azure.jar",
"entryPoint" : "example.FooHandler.execute",
"bindings" : [ {
"type" : "httpTrigger",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-adapter-parent</artifactId>
<version>1.0.0.RELEASE</version>
<version>1.0.1.BUILD-SNAPSHOT</version>
</parent>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies.function: com.example:pof:0.0.1-SNAPSHOT
Copy the openwhisk runner JAR to the working directory (same directory as the properties file):

```
cp spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/target/spring-cloud-function-adapter-openwhisk-1.0.0.RELEASE.jar runner.jar
cp spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/target/spring-cloud-function-adapter-openwhisk-1.0.1.BUILD-SNAPSHOT.jar runner.jar
```

Generate a m2 repo from the `--thin.dryrun` of the runner JAR with the above properties file:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-adapter-parent</artifactId>
<version>1.0.0.RELEASE</version>
<version>1.0.1.BUILD-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-function-compiler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-parent</artifactId>
<version>1.0.0.RELEASE</version>
<version>1.0.1.BUILD-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-function-context/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-parent</artifactId>
<version>1.0.0.RELEASE</version>
<version>1.0.1.BUILD-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-function-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-parent</artifactId>
<version>1.0.0.RELEASE</version>
<version>1.0.1.BUILD-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-function-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<relativePath/>
</parent>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>1.0.0.RELEASE</version>
<version>1.0.1.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Cloud Function Dependencies</name>
<description>Spring Cloud Function Dependencies</description>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-function-deployer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-parent</artifactId>
<version>1.0.0.RELEASE</version>
<version>1.0.1.BUILD-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-function-deployer/src/it/support/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<properties>
<java.version>1.8</java.version>
<spring-cloud-function.version>1.0.0.RELEASE</spring-cloud-function.version>
<spring-cloud-function.version>1.0.1.BUILD-SNAPSHOT</spring-cloud-function.version>
<wrapper.version>1.0.10.RELEASE</wrapper.version>
<reactor.version>3.2.0.M1</reactor.version>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply plugin: 'spring-boot'
apply plugin: 'org.springframework.boot.experimental.thin-launcher'

group = 'io.spring.sample'
version = '1.0.0.RELEASE'
version = '1.0.1.BUILD-SNAPSHOT'
sourceCompatibility = 1.8
targetCompatibility = 1.8

Expand All @@ -38,7 +38,7 @@ repositories {
}

ext {
springCloudFunctionVersion = "1.0.0.RELEASE"
springCloudFunctionVersion = "1.0.1.BUILD-SNAPSHOT"
awsLambdaEventsVersion = "1.2.1"
awsLambdaCoreVersion = "1.1.0"
}
Expand Down
6 changes: 3 additions & 3 deletions spring-cloud-function-samples/function-sample-aws/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>io.spring.sample</groupId>
<artifactId>function-sample-aws</artifactId>
<version>1.0.0.RELEASE</version>
<version>1.0.1.BUILD-SNAPSHOT</version>
<packaging>jar</packaging>

<name>function-sample-aws</name>
Expand All @@ -25,8 +25,8 @@
<wrapper.version>1.0.10.RELEASE</wrapper.version>
<aws-lambda-events.version>2.0.2</aws-lambda-events.version>
<reactor.version>3.1.2.RELEASE</reactor.version>
<spring-cloud-function.version>1.0.0.RELEASE</spring-cloud-function.version>
<spring-cloud-stream-servlet.version>1.0.0.RELEASE</spring-cloud-stream-servlet.version>
<spring-cloud-function.version>1.0.1.BUILD-SNAPSHOT</spring-cloud-function.version>
<spring-cloud-stream-servlet.version>1.0.1.BUILD-SNAPSHOT</spring-cloud-stream-servlet.version>
<start-class>example.Config</start-class>
</properties>

Expand Down
4 changes: 2 additions & 2 deletions spring-cloud-function-samples/function-sample-azure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>io.spring.sample</groupId>
<artifactId>function-sample-azure</artifactId>
<version>1.0.0.RELEASE</version>
<version>1.0.1.BUILD-SNAPSHOT</version>
<packaging>jar</packaging>

<name>function-sample-azure</name>
Expand Down Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>1.0.0.RELEASE</version>
<version>1.0.1.BUILD-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"scriptFile": "../function-sample-azure-1.0.0.RELEASE-azure.jar",
"scriptFile": "../function-sample-azure-1.0.1.BUILD-SNAPSHOT-azure.jar",
"entryPoint": "example.FooHandler.execute",
"bindings": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ apply plugin: 'spring-boot'
apply plugin: 'org.springframework.boot.experimental.thin-launcher'

group = 'io.spring.sample'
version = '1.0.0.RELEASE'
version = '1.0.1.BUILD-SNAPSHOT'
sourceCompatibility = 1.8
targetCompatibility = 1.8

Expand All @@ -34,7 +34,7 @@ repositories {
}

ext {
springCloudFunctionVersion = "1.0.0.RELEASE"
springCloudFunctionVersion = "1.0.1.BUILD-SNAPSHOT"
}
ext['reactor.version'] = "3.1.7.RELEASE"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>io.spring.sample</groupId>
<artifactId>function-sample-compiler</artifactId>
<version>1.0.0.RELEASE</version>
<version>1.0.1.BUILD-SNAPSHOT</version>
<packaging>jar</packaging>
<name>spring-cloud-function-sample-compiler</name>
<description>Spring Cloud Function Lambda Compiling Support</description>
Expand All @@ -19,7 +19,7 @@

<properties>
<java.version>1.8</java.version>
<spring-cloud-function.version>1.0.0.RELEASE</spring-cloud-function.version>
<spring-cloud-function.version>1.0.1.BUILD-SNAPSHOT</spring-cloud-function.version>
<spring-cloud-stream.version>Elmhurst.RELEASE</spring-cloud-stream.version>
<reactor.version>3.1.2.RELEASE</reactor.version>
<wrapper.version>1.0.10.RELEASE</wrapper.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ apply plugin: 'spring-boot'
apply plugin: 'org.springframework.boot.experimental.thin-launcher'

group = 'io.spring.sample'
version = '1.0.0.RELEASE'
version = '1.0.1.BUILD-SNAPSHOT'
sourceCompatibility = 1.8
targetCompatibility = 1.8

Expand All @@ -34,7 +34,7 @@ repositories {
}

ext {
springCloudFunctionVersion = "1.0.0.RELEASE"
springCloudFunctionVersion = "1.0.1.BUILD-SNAPSHOT"
}
ext['reactor.version'] = "3.1.7.RELEASE"

Expand Down
6 changes: 3 additions & 3 deletions spring-cloud-function-samples/function-sample-pof/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>io.spring.sample</groupId>
<artifactId>function-sample-pof</artifactId>
<version>1.0.0.RELEASE</version>
<version>1.0.1.BUILD-SNAPSHOT</version>
<packaging>jar</packaging>
<name>function-sample-pof</name>
<description>Spring Cloud Function Web Support</description>
Expand All @@ -21,8 +21,8 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<reactor.version>3.1.2.RELEASE</reactor.version>
<spring-cloud-function.version>1.0.0.RELEASE</spring-cloud-function.version>
<spring-cloud-stream-servlet.version>1.0.0.RELEASE</spring-cloud-stream-servlet.version>
<spring-cloud-function.version>1.0.1.BUILD-SNAPSHOT</spring-cloud-function.version>
<spring-cloud-stream-servlet.version>1.0.1.BUILD-SNAPSHOT</spring-cloud-stream-servlet.version>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ apply plugin: 'spring-boot'
apply plugin: 'org.springframework.boot.experimental.thin-launcher'

group = 'io.spring.sample'
version = '1.0.0.RELEASE'
version = '1.0.1.BUILD-SNAPSHOT'
sourceCompatibility = 1.8
targetCompatibility = 1.8

Expand All @@ -34,7 +34,7 @@ repositories {
}

ext {
springCloudFunctionVersion = "1.0.0.RELEASE"
springCloudFunctionVersion = "1.0.1.BUILD-SNAPSHOT"
}
ext['reactor.version'] = "3.1.7.RELEASE"

Expand Down
4 changes: 2 additions & 2 deletions spring-cloud-function-samples/function-sample-pojo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>io.spring.sample</groupId>
<artifactId>function-sample-pojo</artifactId>
<version>1.0.0.RELEASE</version>
<version>1.0.1.BUILD-SNAPSHOT</version>
<packaging>jar</packaging>
<name>function-sample-pojo</name>
<description>Spring Cloud Function Web Support</description>
Expand All @@ -19,7 +19,7 @@

<properties>
<java.version>1.8</java.version>
<spring-cloud-function.version>1.0.0.RELEASE</spring-cloud-function.version>
<spring-cloud-function.version>1.0.1.BUILD-SNAPSHOT</spring-cloud-function.version>
<wrapper.version>1.0.11.RELEASE</wrapper.version>
</properties>

Expand Down
Loading

0 comments on commit 068b9ef

Please sign in to comment.