You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2020/05/11 16:56:44 UTC
[geode] branch support/1.13 updated: GEODE-8016: publish with
non-zero-padded build ids instead of SNAPSHOT. (#5089)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 3e8453f GEODE-8016: publish with non-zero-padded build ids instead of SNAPSHOT. (#5089)
3e8453f is described below
commit 3e8453f58aabea0fb1da7c436a64a254c66d5a40
Author: Owen Nichols <34...@users.noreply.github.com>
AuthorDate: Mon May 11 09:55:57 2020 -0700
GEODE-8016: publish with non-zero-padded build ids instead of SNAPSHOT. (#5089)
* Artifacts take the form `1.13.0-build.123` instead of `1.13.0-SNAPSHOT`.
* checkPom task has been modified to use a slug instead of an always
changing version.
* Gradle clients will use the greedy "1.13.0-build+" notation
* Maven clients will use semver v1.0 "[1.13.0-build,1.14.0)" notation.
Signed-off-by: Sean Goller <sg...@pivotal.io>
(cherry picked from commit a4c8b9ed8bbea584f798164fa5308d236e9b6048)
(cherry picked from commit 39c522e340196cb30d55d81d93c63028938cd782)
---
.../src/test/resources/expected-pom.xml | 68 ++++----
.../src/test/resources/expected-pom.xml | 6 +-
build.gradle | 3 +-
ci/pipelines/examples/deploy_pipeline.sh | 1 +
ci/pipelines/examples/jinja.template.yml | 180 ++++++++++++---------
ci/pipelines/geode-build/jinja.template.yml | 7 +-
ci/pipelines/images/jinja.template.yml | 27 ++++
ci/pipelines/meta/jinja.template.yml | 1 +
ci/pipelines/meta/meta.properties | 2 +-
ci/scripts/execute_build_examples.sh | 8 +-
ci/scripts/execute_publish.sh | 4 +-
ci/scripts/shared_utilities.sh | 8 +-
.../geode/AssemblyContentsIntegrationTest.java | 2 +-
.../geode/GeodeDependencyJarIntegrationTest.java | 2 +-
geode-assembly/src/test/resources/expected-pom.xml | 2 +-
.../src/test/resources/expected-pom.xml | 2 +-
geode-common/src/test/resources/expected-pom.xml | 4 +-
.../src/test/resources/expected-pom.xml | 4 +-
.../src/test/resources/expected-pom.xml | 4 +-
geode-core/src/test/resources/expected-pom.xml | 4 +-
geode-cq/src/test/resources/expected-pom.xml | 4 +-
geode-dunit/src/test/resources/expected-pom.xml | 4 +-
.../src/test/resources/expected-pom.xml | 4 +-
geode-gfsh/src/test/resources/expected-pom.xml | 4 +-
.../src/test/resources/expected-pom.xml | 4 +-
geode-junit/src/test/resources/expected-pom.xml | 4 +-
geode-log4j/src/test/resources/expected-pom.xml | 4 +-
geode-logging/src/test/resources/expected-pom.xml | 4 +-
geode-lucene/src/test/resources/expected-pom.xml | 4 +-
.../src/test/resources/expected-pom.xml | 4 +-
.../src/test/resources/expected-pom.xml | 4 +-
.../src/test/resources/expected-pom.xml | 4 +-
.../src/test/resources/expected-pom.xml | 4 +-
.../src/test/resources/expected-pom.xml | 4 +-
geode-protobuf/src/test/resources/expected-pom.xml | 4 +-
geode-pulse/src/test/resources/expected-pom.xml | 2 +-
.../src/test/resources/expected-pom.xml | 4 +-
geode-redis/src/test/resources/expected-pom.xml | 4 +-
.../src/test/resources/expected-pom.xml | 4 +-
.../src/test/resources/expected-pom.xml | 4 +-
geode-unsafe/src/test/resources/expected-pom.xml | 4 +-
geode-wan/src/test/resources/expected-pom.xml | 4 +-
geode-web-api/src/test/resources/expected-pom.xml | 2 +-
.../src/test/resources/expected-pom.xml | 2 +-
geode-web/src/test/resources/expected-pom.xml | 2 +-
gradle.properties | 6 +-
gradle/check-pom.gradle | 30 ++++
47 files changed, 283 insertions(+), 184 deletions(-)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index 37fc015..e1273ca 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<packaging>pom</packaging>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
@@ -880,199 +880,199 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-common</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-common-services</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-concurrency-test</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-connectors</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-core</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-cq</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-dunit</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-experimental-driver</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-gfsh</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-http-service</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-junit</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-log4j</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-logging</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-lucene</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-management</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-membership</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-memcached</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-old-client-support</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-protobuf</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-protobuf-messages</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-pulse</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-rebalancer</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-redis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-serialization</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-tcp-server</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-unsafe</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-wan</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-web</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-web-api</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-web-management</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-lucene-test</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-protobuf-test</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-pulse-test</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/boms/geode-client-bom/src/test/resources/expected-pom.xml b/boms/geode-client-bom/src/test/resources/expected-pom.xml
index f356342..2fa63c2 100644
--- a/boms/geode-client-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-client-bom/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-client-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<packaging>pom</packaging>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-core</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.shiro</groupId>
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-cq</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/build.gradle b/build.gradle
index 8b66008..7cb19ae 100755
--- a/build.gradle
+++ b/build.gradle
@@ -44,9 +44,8 @@ wrapper {
allprojects {
ext.isReleaseVersion = true
- if(version.contains("SNAPSHOT")) {
+ if(version.contains("build")) {
ext.isReleaseVersion = false
- version = (version as String).replaceFirst(/SNAPSHOT.*/, 'SNAPSHOT')
}
repositories {
diff --git a/ci/pipelines/examples/deploy_pipeline.sh b/ci/pipelines/examples/deploy_pipeline.sh
index ea88fab..261912b 100755
--- a/ci/pipelines/examples/deploy_pipeline.sh
+++ b/ci/pipelines/examples/deploy_pipeline.sh
@@ -80,5 +80,6 @@ upstream-fork: ${UPSTREAM_FORK}
pipeline-prefix: "${PIPELINE_PREFIX}"
public-pipelines: ${PUBLIC_PIPELINES}
gcp-project: ${GCP_PROJECT}
+maven-snapshot-bucket: ${MAVEN_SNAPSHOT_BUCKET}
artifact-bucket: ${ARTIFACT_BUCKET}
YML
diff --git a/ci/pipelines/examples/jinja.template.yml b/ci/pipelines/examples/jinja.template.yml
index 0e2509c..eb4ec1a 100644
--- a/ci/pipelines/examples/jinja.template.yml
+++ b/ci/pipelines/examples/jinja.template.yml
@@ -40,26 +40,45 @@ resource_types:
source:
repository: smgoller/gci-resource
- name: maven-resource
- type: docker-image
+ type: registry-image
source:
repository: nulldriver/maven-resource
tag: latest
- name: concourse-metadata-resource
- type: docker-image
+ type: registry-image
source:
password: ((!docker-password))
repository: gcr.io/((gcp-project))/((pipeline-prefix))concourse-metadata-resource
tag: latest
username: ((!docker-username))
+- name: gcs-resource
+ type: registry-image
+ source:
+ repository: frodenas/gcs-resource
+- name: json-gcs-resource
+ type: docker-image
+ source:
+ username: ((docker-username))
+ password: ((docker-password))
+ repository: gcr.io/((gcp-project))/((pipeline-prefix))gcs-resource-with-json-content
+ tag: latest
resources:
+- name: geode-passing-tokens
+ type: json-gcs-resource
+ source:
+ bucket: ((artifact-bucket))
+ json_key: ((concourse-gcp-key))
+ versioned_file: semvers/((pipeline-prefix))((geode-build-branch))/passing-build-tokens.json
- name: geode-examples
+ icon: github-circle
type: git
source:
uri: https://github.com/{{repository.fork}}/geode-examples.git
branch: {{ repository.branch }}
depth: 10
- name: geode-ci
+ icon: github-circle
type: git
source:
depth: 1
@@ -74,7 +93,8 @@ resources:
type: time
source: {interval: 24h}
- name: alpine-tools-image
- type: docker-image
+ icon: docker
+ type: registry-image
source:
username: ((docker-username))
password: ((docker-password))
@@ -93,78 +113,94 @@ jobs:
public: true
serial: true
plan:
- - aggregate:
- - get: geode-ci
+ - in_parallel:
- get: alpine-tools-image
+ - get: geode-ci
- get: linux-builder-image-family
- - aggregate:
+ - get: geode-passing-tokens
+ trigger: true
- get: geode-examples
trigger: true
- get: 24h
trigger: true
- - do:
- - put: concourse-metadata-resource
- {{ init_retry()|indent(6) }}
- - task: create_instance
- image: alpine-tools-image
- config:
- platform: linux
- params:
- {{ common_instance_params(examples_test) | indent(12) }}
- GEODE_BRANCH: {{repository.branch}}
- GEODE_FORK: {{repository.fork}}
- IMAGE_FAMILY_NAME: ((pipeline-prefix))linux-geode-builder
- run:
- path: geode-ci/ci/scripts/create_instance.sh
- inputs:
- - name: concourse-metadata-resource
- - name: geode-ci
- - name: attempts-log
- path: old
- outputs:
- - name: instance-data
- - name: attempts-log
- path: new
- timeout: 15m
- attempts: 2
- - task: rsync_code_up
- image: alpine-tools-image
- config:
- platform: linux
- run:
- path: geode-ci/ci/scripts/rsync_code_up.sh
- inputs:
- - name: geode-ci
- - name: geode-examples
- path: geode
- - name: instance-data
- timeout: 5m
- - task: build
- image: alpine-tools-image
- config:
- platform: linux
- params:
- JAVA_BUILD_VERSION: {{ java_build_version.version }}
- GRADLE_TASK: {{ examples_test.GRADLE_TASK }}
- {{ common_test_params(examples_test) | indent(12) }}
- run:
- path: geode-ci/ci/scripts/execute_build_examples.sh
- inputs:
- - name: geode-ci
- - name: geode-examples
- path: geode
- - name: instance-data
- outputs:
- - name: results
- ensure:
- do:
- - task: delete_instance
- image: alpine-tools-image
- config:
- platform: linux
- run:
- path: geode-ci/ci/scripts/delete_instance.sh
- inputs:
- - name: geode-ci
- - name: instance-data
- timeout: 1h
+ - put: concourse-metadata-resource
+ {{ init_retry()|indent(2) }}
+ - task: create_instance
+ image: alpine-tools-image
+ config:
+ platform: linux
+ params:
+ {{ common_instance_params(examples_test) | indent(8) }}
+ GEODE_BRANCH: {{repository.branch}}
+ GEODE_FORK: {{repository.fork}}
+ IMAGE_FAMILY_NAME: ((pipeline-prefix))linux-geode-builder
+ run:
+ path: geode-ci/ci/scripts/create_instance.sh
+ inputs:
+ - name: concourse-metadata-resource
+ - name: geode-ci
+ - name: attempts-log
+ path: old
+ outputs:
+ - name: instance-data
+ - name: attempts-log
+ path: new
+ timeout: 15m
+ attempts: 2
+ - task: rsync_examples_code_up
+ image: alpine-tools-image
+ config:
+ platform: linux
+ run:
+ path: geode-ci/ci/scripts/rsync_code_up.sh
+ inputs:
+ - name: geode-ci
+ - name: geode-examples
+ path: geode
+ - name: instance-data
+ timeout: 5m
+ - task: move_examples_aside
+ image: alpine-tools-image
+ config:
+ platform: linux
+ inputs:
+ - name: instance-data
+ run:
+ path: sh
+ args:
+ - -ecx
+ - |
+ SSHKEY_FILE="instance-data/sshkey"
+ SSH_OPTIONS="-i ${SSHKEY_FILE} -o ConnectionAttempts=60 -o StrictHostKeyChecking=no"
+ INSTANCE_IP_ADDRESS="$(cat instance-data/instance-ip-address)"
+ ssh ${SSH_OPTIONS} geode@${INSTANCE_IP_ADDRESS} "set -x ; mv geode geode-examples"
+ - task: build
+ image: alpine-tools-image
+ config:
+ platform: linux
+ params:
+ MAVEN_SNAPSHOT_BUCKET: ((maven-snapshot-bucket))
+ JAVA_BUILD_VERSION: {{ java_build_version.version }}
+ GRADLE_TASK: {{ examples_test.GRADLE_TASK }}
+ {{ common_test_params(examples_test) | indent(8) }}
+ run:
+ path: geode-ci/ci/scripts/execute_build_examples.sh
+ inputs:
+ - name: geode-ci
+ - name: geode-examples
+ - name: geode-passing-tokens
+ - name: instance-data
+ outputs:
+ - name: results
+ ensure:
+ do:
+ - task: delete_instance
+ image: alpine-tools-image
+ config:
+ platform: linux
+ run:
+ path: geode-ci/ci/scripts/delete_instance.sh
+ inputs:
+ - name: geode-ci
+ - name: instance-data
+ timeout: 1h
diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index 1d88496..0a10a59 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -433,13 +433,16 @@ jobs:
set -e
# Check that the incoming GEODE_SHA is a descendent of the currently stored value.
# Keeps us from winding back the repository in the case of an out-of-order pipeline pass
- if [ -z "${CURRENT_PASSING_SHA}" ] || (cd geode; git merge-base --is-ancestor ${CURRENT_PASSING_SHA} ${GEODE_SHA}); then
- cat > geode-passing-tokens/passing-build-tokens.json <<JSON
+ if [ -n "${CURRENT_PASSING_SHA}" ]; then
+ cd geode
+ if git merge-base --is-ancestor ${CURRENT_PASSING_SHA} ${GEODE_SHA}; then
+ cat > ../geode-passing-tokens/passing-build-tokens.json <<JSON
{
"ref": "${GEODE_SHA}",
"semver": "${GEODE_SEMVER}"
}
JSON
+ fi
fi
- aggregate:
- put: geode-passing-tokens
diff --git a/ci/pipelines/images/jinja.template.yml b/ci/pipelines/images/jinja.template.yml
index fe8b50c..3e1da88 100644
--- a/ci/pipelines/images/jinja.template.yml
+++ b/ci/pipelines/images/jinja.template.yml
@@ -185,6 +185,22 @@ resources:
version:
ref: 1abb4b2a162e78099dab0b30144fec1e6c9b696d
+- name: gcs-resource-with-json-content
+ icon: github-circle
+ type: git
+ check_every: 168h
+ source:
+ branch: master
+ uri: https://github.com/steve-sienk/gcs-resource.git
+
+- name: gcs-resource-with-json-content-image
+ icon: docker
+ type: docker-image
+ source:
+ username: ((docker-username))
+ password: ((docker-password))
+ repository: gcr.io/((gcp-project))/((pipeline-prefix))gcs-resource-with-json-content
+
jobs:
- name: build-github-pr-resource-image
public: ((public-pipelines))
@@ -352,3 +368,14 @@ jobs:
params:
build: gce-instances-resource-dockerfile/ci/resource-types/gce-instances-resource
tag_as_latest: true
+
+- name: build-json-gcs-resource-image
+ serial: true
+ public: false
+ plan:
+ - get: gcs-resource-with-json-content
+ trigger: true
+ - put: gcs-resource-with-json-content-image
+ params:
+ build: gcs-resource-with-json-content
+ tag_as_latest: true
diff --git a/ci/pipelines/meta/jinja.template.yml b/ci/pipelines/meta/jinja.template.yml
index 792254f..83eccc4 100644
--- a/ci/pipelines/meta/jinja.template.yml
+++ b/ci/pipelines/meta/jinja.template.yml
@@ -218,6 +218,7 @@ jobs:
SANITIZED_GEODE_FORK: ((sanitized-geode-fork))
GCP_PROJECT: ((gcp-project))
PUBLIC_PIPELINES: ((public-pipelines))
+ MAVEN_SNAPSHOT_BUCKET: ((maven-snapshot-bucket))
SEMVER_PRERELEASE_TOKEN: ((semver-prerelease-token))
run:
path: geode-examples-pipeline/ci/pipelines/examples/deploy_pipeline.sh
diff --git a/ci/pipelines/meta/meta.properties b/ci/pipelines/meta/meta.properties
index deec6bf..cee250a 100644
--- a/ci/pipelines/meta/meta.properties
+++ b/ci/pipelines/meta/meta.properties
@@ -25,4 +25,4 @@ PUBLIC=true
REPOSITORY_PUBLIC=true
GRADLE_GLOBAL_ARGS=""
MAVEN_SNAPSHOT_BUCKET=gcs://maven.apachegeode-ci.info/snapshots/
-SEMVER_PRERELEASE_TOKEN=SNAPSHOT
+SEMVER_PRERELEASE_TOKEN=build
diff --git a/ci/scripts/execute_build_examples.sh b/ci/scripts/execute_build_examples.sh
index f7827ef..87a56a3 100755
--- a/ci/scripts/execute_build_examples.sh
+++ b/ci/scripts/execute_build_examples.sh
@@ -17,7 +17,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-set -e
+set -ex
BASE_DIR=$(pwd)
@@ -44,11 +44,15 @@ SSH_OPTIONS="-i ${SSHKEY_FILE} -o ConnectionAttempts=60 -o StrictHostKeyChecking
INSTANCE_IP_ADDRESS="$(cat instance-data/instance-ip-address)"
+GEODE_VERSION=$(jq -r .semver geode-passing-tokens/*.json)
+
SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64"
GRADLE_COMMAND="./gradlew \
${DEFAULT_GRADLE_TASK_OPTIONS} \
+ -PgeodeRepositoryUrl=${MAVEN_SNAPSHOT_BUCKET} \
+ -PgeodeVersion=${GEODE_VERSION} \
clean runAll"
echo "${GRADLE_COMMAND}"
-ssh ${SSH_OPTIONS} geode@${INSTANCE_IP_ADDRESS} "mkdir -p tmp && cd geode && ${SET_JAVA_HOME} && ${GRADLE_COMMAND}"
+ssh ${SSH_OPTIONS} geode@${INSTANCE_IP_ADDRESS} "set -x && mkdir -p tmp && cd geode-examples && ${SET_JAVA_HOME} && ${GRADLE_COMMAND}"
diff --git a/ci/scripts/execute_publish.sh b/ci/scripts/execute_publish.sh
index 7f10774..32b4333 100755
--- a/ci/scripts/execute_publish.sh
+++ b/ci/scripts/execute_publish.sh
@@ -47,8 +47,8 @@ if [ -e "${GEODE_PULL_REQUEST_ID_FILE}" ]; then
else
CONCOURSE_VERSION=$(cat ${GEODE_BUILD_VERSION_FILE})
echo "Concourse VERSION is ${CONCOURSE_VERSION}"
- # Rebuild version, zero-padded
- FULL_PRODUCT_VERSION=$(get-full-version ${CONCOURSE_VERSION})
+ FULL_PRODUCT_VERSION=${CONCOURSE_VERSION}
+ BUILD_ID=$(get-geode-build-id ${CONCOURSE_VERSION})
fi
DEFAULT_GRADLE_TASK_OPTIONS="--parallel --console=plain --no-daemon"
diff --git a/ci/scripts/shared_utilities.sh b/ci/scripts/shared_utilities.sh
index d5cec55..60eda7a 100644
--- a/ci/scripts/shared_utilities.sh
+++ b/ci/scripts/shared_utilities.sh
@@ -31,10 +31,10 @@ find-here-test-reports() {
}
## Parsing functions for the Concourse Semver resource.
-## These functions expect one input in the form of the resource file, e.g., "1.9.0-SNAPSHOT.325"
+## These functions expect one input in the form of the resource file, e.g., "1.14.0-build.325"
get-geode-version() {
local CONCOURSE_VERSION=$1
- # Prune all after '-', yielding e.g., "1.9.0"
+ # Prune all after '-', yielding e.g., "1.14.0"
local GEODE_PRODUCT_VERSION=${CONCOURSE_VERSION%%-*}
(>&2 echo "Geode product VERSION is ${GEODE_PRODUCT_VERSION}")
echo ${GEODE_PRODUCT_VERSION}
@@ -42,9 +42,9 @@ get-geode-version() {
get-geode-version-qualifier-slug() {
local CONCOURSE_VERSION=$1
- # Prune all before '-', yielding e.g., "SNAPSHOT.325"
+ # Prune all before '-', yielding e.g., "build.325"
local CONCOURSE_BUILD_SLUG=${CONCOURSE_VERSION##*-}
- # Prune all before '.', yielding e.g., "SNAPSHOT"
+ # Prune all before '.', yielding e.g., "build"
local QUALIFIER_SLUG=${CONCOURSE_BUILD_SLUG%%.*}
echo ${QUALIFIER_SLUG}
}
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/AssemblyContentsIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/AssemblyContentsIntegrationTest.java
index 7803c01..bd24589 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/AssemblyContentsIntegrationTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/AssemblyContentsIntegrationTest.java
@@ -80,7 +80,7 @@ public class AssemblyContentsIntegrationTest {
"Please set the GEODE_HOME environment variable to the product installation directory.")
.isDirectory();
- String versionRegex = "\\d+\\.\\d+\\.\\d+(-SNAPSHOT)?";
+ String versionRegex = "\\d+\\.\\d+\\.\\d+(-build\\.\\d+)?";
return FileUtils.listFiles(geodeHomeDirectory, null, true).stream()
.map(file -> geodeHomePath.relativize(Paths.get(file.getPath())).toString().replace('\\',
'/'))
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/GeodeDependencyJarIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/GeodeDependencyJarIntegrationTest.java
index c0d7bf1..c9af521 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/GeodeDependencyJarIntegrationTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/GeodeDependencyJarIntegrationTest.java
@@ -86,7 +86,7 @@ public class GeodeDependencyJarIntegrationTest {
return Arrays.stream(classpath.split(" "))
.map(entry -> entry.contains("geode")
- ? entry.replaceFirst("\\d+\\.\\d+\\.\\d+(-SNAPSHOT)?", "0.0.0") : entry)
+ ? entry.replaceFirst("\\d+\\.\\d+\\.\\d+(-build\\.\\d+)?", "0.0.0") : entry)
.collect(Collectors.toList());
}
}
diff --git a/geode-assembly/src/test/resources/expected-pom.xml b/geode-assembly/src/test/resources/expected-pom.xml
index feed0fe..ea904d5 100644
--- a/geode-assembly/src/test/resources/expected-pom.xml
+++ b/geode-assembly/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>apache-geode</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<packaging>tgz</packaging>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
diff --git a/geode-common-services/src/test/resources/expected-pom.xml b/geode-common-services/src/test/resources/expected-pom.xml
index dc8fab9..f68da55 100644
--- a/geode-common-services/src/test/resources/expected-pom.xml
+++ b/geode-common-services/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-common-services</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
diff --git a/geode-common/src/test/resources/expected-pom.xml b/geode-common/src/test/resources/expected-pom.xml
index c85c8b8..2f323ad 100644
--- a/geode-common/src/test/resources/expected-pom.xml
+++ b/geode-common/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-common</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-concurrency-test/src/test/resources/expected-pom.xml b/geode-concurrency-test/src/test/resources/expected-pom.xml
index 3a3d2bf..ac266b4 100644
--- a/geode-concurrency-test/src/test/resources/expected-pom.xml
+++ b/geode-concurrency-test/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-concurrency-test</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-connectors/src/test/resources/expected-pom.xml b/geode-connectors/src/test/resources/expected-pom.xml
index 18f7760..b76b329 100644
--- a/geode-connectors/src/test/resources/expected-pom.xml
+++ b/geode-connectors/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-connectors</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-core/src/test/resources/expected-pom.xml b/geode-core/src/test/resources/expected-pom.xml
index 0fa57d6..47ae85a 100644
--- a/geode-core/src/test/resources/expected-pom.xml
+++ b/geode-core/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-core</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-cq/src/test/resources/expected-pom.xml b/geode-cq/src/test/resources/expected-pom.xml
index 3a0f951..c94b826 100644
--- a/geode-cq/src/test/resources/expected-pom.xml
+++ b/geode-cq/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-cq</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-dunit/src/test/resources/expected-pom.xml b/geode-dunit/src/test/resources/expected-pom.xml
index 9eedd59..c0d7b6e 100644
--- a/geode-dunit/src/test/resources/expected-pom.xml
+++ b/geode-dunit/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-dunit</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-experimental-driver/src/test/resources/expected-pom.xml b/geode-experimental-driver/src/test/resources/expected-pom.xml
index ba265a1..8951061 100644
--- a/geode-experimental-driver/src/test/resources/expected-pom.xml
+++ b/geode-experimental-driver/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-experimental-driver</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-gfsh/src/test/resources/expected-pom.xml b/geode-gfsh/src/test/resources/expected-pom.xml
index 9e3fa2c..5bdb326 100644
--- a/geode-gfsh/src/test/resources/expected-pom.xml
+++ b/geode-gfsh/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-gfsh</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-http-service/src/test/resources/expected-pom.xml b/geode-http-service/src/test/resources/expected-pom.xml
index 062ecd6..2768c89 100644
--- a/geode-http-service/src/test/resources/expected-pom.xml
+++ b/geode-http-service/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-http-service</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-junit/src/test/resources/expected-pom.xml b/geode-junit/src/test/resources/expected-pom.xml
index cab2d00..ba1b766 100644
--- a/geode-junit/src/test/resources/expected-pom.xml
+++ b/geode-junit/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-junit</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-log4j/src/test/resources/expected-pom.xml b/geode-log4j/src/test/resources/expected-pom.xml
index 3a5b8c0..874caa6 100644
--- a/geode-log4j/src/test/resources/expected-pom.xml
+++ b/geode-log4j/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-log4j</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-logging/src/test/resources/expected-pom.xml b/geode-logging/src/test/resources/expected-pom.xml
index aa76586..cb933ff 100644
--- a/geode-logging/src/test/resources/expected-pom.xml
+++ b/geode-logging/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-logging</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-lucene/src/test/resources/expected-pom.xml b/geode-lucene/src/test/resources/expected-pom.xml
index 2c5eb11..2c8d5af 100644
--- a/geode-lucene/src/test/resources/expected-pom.xml
+++ b/geode-lucene/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-lucene</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-management/src/test/resources/expected-pom.xml b/geode-management/src/test/resources/expected-pom.xml
index 5b80f0d..b655d1d 100644
--- a/geode-management/src/test/resources/expected-pom.xml
+++ b/geode-management/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-management</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-membership/src/test/resources/expected-pom.xml b/geode-membership/src/test/resources/expected-pom.xml
index b455438..95d05f1 100644
--- a/geode-membership/src/test/resources/expected-pom.xml
+++ b/geode-membership/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-membership</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-memcached/src/test/resources/expected-pom.xml b/geode-memcached/src/test/resources/expected-pom.xml
index 8a16a41..391dbd6 100644
--- a/geode-memcached/src/test/resources/expected-pom.xml
+++ b/geode-memcached/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-memcached</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-old-client-support/src/test/resources/expected-pom.xml b/geode-old-client-support/src/test/resources/expected-pom.xml
index d71c12c..b904aa3 100644
--- a/geode-old-client-support/src/test/resources/expected-pom.xml
+++ b/geode-old-client-support/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-old-client-support</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-protobuf-messages/src/test/resources/expected-pom.xml b/geode-protobuf-messages/src/test/resources/expected-pom.xml
index 8ace0ca..cf32168 100644
--- a/geode-protobuf-messages/src/test/resources/expected-pom.xml
+++ b/geode-protobuf-messages/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-protobuf-messages</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-protobuf/src/test/resources/expected-pom.xml b/geode-protobuf/src/test/resources/expected-pom.xml
index cd7ce6d..637b69b 100644
--- a/geode-protobuf/src/test/resources/expected-pom.xml
+++ b/geode-protobuf/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-protobuf</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-pulse/src/test/resources/expected-pom.xml b/geode-pulse/src/test/resources/expected-pom.xml
index 8269f84..6e5fe6b 100644
--- a/geode-pulse/src/test/resources/expected-pom.xml
+++ b/geode-pulse/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-pulse</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<packaging>war</packaging>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
diff --git a/geode-rebalancer/src/test/resources/expected-pom.xml b/geode-rebalancer/src/test/resources/expected-pom.xml
index ede1427..5f9ff4b 100644
--- a/geode-rebalancer/src/test/resources/expected-pom.xml
+++ b/geode-rebalancer/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-rebalancer</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-redis/src/test/resources/expected-pom.xml b/geode-redis/src/test/resources/expected-pom.xml
index 23ae730..b3f8d0b 100644
--- a/geode-redis/src/test/resources/expected-pom.xml
+++ b/geode-redis/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-redis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-serialization/src/test/resources/expected-pom.xml b/geode-serialization/src/test/resources/expected-pom.xml
index 7d2c7bf..3da2a5a 100644
--- a/geode-serialization/src/test/resources/expected-pom.xml
+++ b/geode-serialization/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-serialization</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-tcp-server/src/test/resources/expected-pom.xml b/geode-tcp-server/src/test/resources/expected-pom.xml
index 19de33a..7017631 100644
--- a/geode-tcp-server/src/test/resources/expected-pom.xml
+++ b/geode-tcp-server/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-tcp-server</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-unsafe/src/test/resources/expected-pom.xml b/geode-unsafe/src/test/resources/expected-pom.xml
index 2abd2df..a5533e9 100644
--- a/geode-unsafe/src/test/resources/expected-pom.xml
+++ b/geode-unsafe/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-unsafe</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-wan/src/test/resources/expected-pom.xml b/geode-wan/src/test/resources/expected-pom.xml
index 3620e7c..72f3fa1 100644
--- a/geode-wan/src/test/resources/expected-pom.xml
+++ b/geode-wan/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-wan</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
<url>http://geode.apache.org</url>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/geode-web-api/src/test/resources/expected-pom.xml b/geode-web-api/src/test/resources/expected-pom.xml
index 098d60d..1ada3a0 100644
--- a/geode-web-api/src/test/resources/expected-pom.xml
+++ b/geode-web-api/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-web-api</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<packaging>war</packaging>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
diff --git a/geode-web-management/src/test/resources/expected-pom.xml b/geode-web-management/src/test/resources/expected-pom.xml
index 3722330..2e96e5a 100644
--- a/geode-web-management/src/test/resources/expected-pom.xml
+++ b/geode-web-management/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-web-management</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<packaging>war</packaging>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
diff --git a/geode-web/src/test/resources/expected-pom.xml b/geode-web/src/test/resources/expected-pom.xml
index f55828d..a22e2de 100644
--- a/geode-web/src/test/resources/expected-pom.xml
+++ b/geode-web/src/test/resources/expected-pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-web</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>${version}</version>
<packaging>war</packaging>
<name>Apache Geode</name>
<description>Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing</description>
diff --git a/gradle.properties b/gradle.properties
index e54e8c3..076c9ad 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,13 +22,11 @@
# The releaseQualifier uses the following conventions:
# .M? - milestone release
# -beta.? - beta release
-# <blank> - release
-# The releaseType uses the following conventions:
-# -SNAPSHOT - development version
+# -build.? - development version
# <blank> - release
#
# The full version string consists of 'versionNumber + releaseQualifier + releaseType'
-version = 1.13.0-SNAPSHOT
+version = 1.13.0-build.0
# Default Maven targets
mavenSnapshotUrl = gcs://maven.apachegeode-ci.info/snapshots
diff --git a/gradle/check-pom.gradle b/gradle/check-pom.gradle
index 87ba4e1..7cfe73e 100644
--- a/gradle/check-pom.gradle
+++ b/gradle/check-pom.gradle
@@ -142,10 +142,40 @@ task updateExpectedPom(dependsOn: generatePomFileForMavenPublication, type: Copy
def expectedPomDir = expectedPomFile.parent
def actualPomFile = generatePomFileForMavenPublication.outputs.files.first()
+ inputs.files {
+ [actualPomFile,
+ expectedPomFile]
+ }
+ outputs.files {
+ expectedPomFile
+ }
if (tasks.getByName("generatePomFileForMavenPublication").enabled) {
from actualPomFile
into expectedPomDir
rename '.*.xml', "expected-pom.xml"
}
+
+ doLast {
+ def checkGroupIdAndSetVersion = { elem ->
+ if (elem.groupId.text().contains("org.apache.geode")) {
+ elem.get("version")*.setValue('${version}')
+ }
+ }
+
+ def doc = groovy.xml.DOMBuilder.parse(new FileReader(expectedPomFile.toString()), false, true, true)
+ org.w3c.dom.Element pomRoot = doc.documentElement
+ use(groovy.xml.dom.DOMCategory) {
+ checkGroupIdAndSetVersion(pomRoot)
+ pomRoot.dependencyManagement.dependencies.dependency.each { org.w3c.dom.Element dep ->
+ checkGroupIdAndSetVersion(dep)
+ }
+ }
+ expectedPomFile.toFile().withWriter { writer ->
+ groovy.xml.XmlUtil.serialize(pomRoot).eachLine { line ->
+ line = line.replaceFirst(/></, ">\n<")
+ writer.writeLine(line)
+ }
+ }
+ }
}
checkPom.mustRunAfter(updateExpectedPom)