Skip to content

Alter the new-issue-branch script to handle both calver AND the legacy format. #1102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Alter the new-issue-branch script to handle both calver AND the legacy format. #1102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fbacc8
SDBUILD-1101 - Prepare branch
gregturn May 19, 2020
ad54fe6
#1101 - Adapt new-issue-branch to handle calver and old versioning.
gregturn May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions etc/scripts/new-issue-branch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -x
#
# This script creates a new local issue branch for the given issue id.
# Previous changes are stashed before the issue branch is created and are reapplied after branch creation.
Expand All @@ -24,7 +24,7 @@ OLD_VERSION_TMP=$(mvn -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evalua
OLD_POM_VERSION=${OLD_VERSION_TMP:?"Could not extract current project version from pom.xml"}

# Replaces BUILD in BUILD-SNAPSHOT with the given TICKET_ID
NEW_POM_VERSION=${OLD_POM_VERSION/"BUILD"/$TICKET_ID}
NEW_POM_VERSION=${OLD_POM_VERSION/"-SNAPSHOT"/"-${TICKET_ID}-SNAPSHOT"}
ISSUE_BRANCH="issue/$TICKET_ID"

echo "Creating feature branch $TICKET_ID: $OLD_POM_VERSION -> $NEW_POM_VERSION"
Expand Down
6 changes: 3 additions & 3 deletions parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-build</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.4.0-SDBUILD-1101-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -348,7 +348,7 @@
<dependency>
<groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-build-resources</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.4.0-SDBUILD-1101-SNAPSHOT</version>
<type>zip</type>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -737,7 +737,7 @@
<dependency>
<groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-build-resources</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.4.0-SDBUILD-1101-SNAPSHOT</version>
<type>zip</type>
<optional>true</optional>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-build</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.4.0-SDBUILD-1101-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Spring Data Build</name>
Expand Down
2 changes: 1 addition & 1 deletion resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-build</artifactId>
<version>2.4.0-SNAPSHOT</version>
<version>2.4.0-SDBUILD-1101-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down