Skip to content

Commit

Permalink
GEODE-8016: publish with non-zero-padded build ids instead of SNAPSHO…
Browse files Browse the repository at this point in the history 
…T. (apache#5057)

* 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 <[email protected]>
  • Loading branch information
@robbadler
robbadler authored May 8, 2020
1 parent cf4c0ed commit a4c8b9e
Show file tree
Hide file tree
Showing 46 changed files with 281 additions and 182 deletions.
66 changes: 33 additions & 33 deletions boms/geode-all-bom/src/test/resources/expected-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-all-bom</artifactId>
<version>1.14.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>
Expand Down Expand Up @@ -880,193 +880,193 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-common</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-concurrency-test</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-connectors</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-core</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-cq</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-dunit</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-experimental-driver</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-gfsh</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-http-service</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-junit</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-log4j</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-logging</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-lucene</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-management</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-membership</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-memcached</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-old-client-support</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-protobuf</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-protobuf-messages</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-pulse</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-rebalancer</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-redis</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-serialization</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-tcp-server</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-unsafe</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-wan</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-web</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-web-api</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-web-management</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-lucene-test</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-protobuf-test</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-pulse-test</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions boms/geode-client-bom/src/test/resources/expected-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geode</groupId>
<artifactId>geode-client-bom</artifactId>
<version>1.14.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>
Expand All @@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-core</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.shiro</groupId>
Expand All @@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.geode</groupId>
<artifactId>geode-cq</artifactId>
<version>1.14.0-SNAPSHOT</version>
<version>${version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
3 changes: 1 addition & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,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 {
Expand Down
1 change: 1 addition & 0 deletions ci/pipelines/examples/deploy_pipeline.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit a4c8b9e

Please sign in to comment.