Skip to content

Commit 27a099b

Browse files
committed
Merge branch 'hotfix/2.0.1'
2 parents e679c4e + 63b37d3 commit 27a099b

File tree

3 files changed

+31
-7
lines changed

3 files changed

+31
-7
lines changed

.travis.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ addons:
99
jdk:
1010
- oraclejdk8
1111
script:
12-
- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then mvn clean build; fi
13-
- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then mvn --settings .travis/settings.xml clean deploy; fi
12+
- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then mvn clean install; fi
13+
- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then mvn --settings .travis/settings.xml clean install; fi
1414
after_success:
1515
- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then mvn sonar:sonar; fi
1616
cache:
@@ -19,9 +19,23 @@ cache:
1919
- $HOME/.sonar/cache
2020
deploy:
2121
- provider: script
22-
script: .travis/deploy.sh
22+
script: ".travis/deploy.sh"
2323
skip_cleanup: true
24-
true:
25-
repo: ChannelApe/bigcommerce-sdk
24+
on:
2625
tags: true
26+
repo: ChannelApe/bigcommerce-sdk
27+
jdk: oraclejdk8
28+
- provider: script
29+
script: ".travis/deploy.sh"
30+
skip_cleanup: true
31+
on:
32+
branch: master
33+
repo: ChannelApe/bigcommerce-sdk
34+
jdk: oraclejdk8
35+
- provider: script
36+
script: ".travis/deploy.sh"
37+
skip_cleanup: true
38+
on:
39+
branch: develop
40+
repo: ChannelApe/bigcommerce-sdk
2741
jdk: oraclejdk8

.travis/deploy.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,18 @@ then
2424
shred -v ~/.gnupg/*
2525
rm -rf ~/.gnupg
2626
fi
27+
elif [ "$TRAVIS_BRANCH" = "develop" ]
28+
then
29+
echo "on develop branch. Deploying SNAPSHOT to Maven Central"
30+
31+
mvn clean deploy --settings .travis/settings.xml
32+
elif [ "$TRAVIS_BRANCH" = "master" ]
33+
then
34+
echo "on master branch. Deploying SNAPSHOT to Maven Central"
35+
36+
mvn clean deploy --settings .travis/settings.xml
2737
else
28-
echo "not on a tag -> keep snapshot version in pom.xml"
38+
echo "not on a tag, develop, or master branch. Not deploying to Maven Central."
2939
fi
3040

3141
echo "ending deployment script"

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.channelape</groupId>
55
<artifactId>bigcommerce-sdk</artifactId>
6-
<version>2.0.0</version>
6+
<version>2.0.1-SNAPSHOT</version>
77

88
<name>BigCommerce SDK</name>
99
<description>Java SDK for BigCommerce REST APIs</description>

0 commit comments

Comments
 (0)