Merge branch 'develop'

broadinstitute · Jun 30, 2017 · 6e4d62b · 6e4d62b
2 parents 8612c1e + 903b3c0
commit 6e4d62b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -10,7 +10,7 @@ crossScalaVersions := Seq("2.11.8", "2.12.1")
 
 lazy val versionSettings = Seq(
   // Upcoming release, or current if we're on the master branch
-  git.baseVersion := "0.24",
+  git.baseVersion := "0.25",
 
   // Shorten the git commit hash
   git.gitHeadCommit := git.gitHeadCommit.value map { _.take(7) },

diff --git a/src/bin/publish_release.sh b/src/bin/publish_release.sh
@@ -9,6 +9,6 @@ sbt \
     "set version := \"${TRAVIS_TAG}\"" \
     'set isSnapshot := false' \
     'set resolvers += Resolver.url("bintray-sbt-plugin-releases", url("http://dl.bintray.com/content/sbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns)' \
-    'set publishTo := Option("artifactory-publish" at "https://artifactory.broadinstitute.org/artifactory/libs-release-local;build.timestamp=" + new java.util.Date().getTime)' \
-    "set credentials += Credentials(\"Artifactory Realm\", \"artifactory.broadinstitute.org\", \"${ARTIFACTORY_USERNAME}\", \"${ARTIFACTORY_PASSWORD}\")" \
+    'set publishTo := Option("artifactory-publish" at "https://broadinstitute.jfrog.io/broadinstitute/libs-release-local;build.timestamp=" + new java.util.Date().getTime)' \
+    "set credentials += Credentials(\"Artifactory Realm\", \"broadinstitute.jfrog.io\", \"${ARTIFACTORY_USERNAME}\", \"${ARTIFACTORY_PASSWORD}\")" \
     "+ publish" 2>&1 | sed 's/.*set credentials.*/REDACTED LOG LINE/'
diff --git a/src/bin/publish_snapshot.sh b/src/bin/publish_snapshot.sh
@@ -11,7 +11,7 @@ if [ "$TRAVIS_BRANCH" == "develop" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; t
         'set test in Test := {}' \
         'set isSnapshot := false' \
         'set resolvers += Resolver.url("bintray-sbt-plugin-releases", url("http://dl.bintray.com/content/sbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns)' \
-        'set publishTo := Option("artifactory-publish" at "https://artifactory.broadinstitute.org/artifactory/libs-release-local;build.timestamp=" + new java.util.Date().getTime)' \
-        "set credentials += Credentials(\"Artifactory Realm\", \"artifactory.broadinstitute.org\", \"${ARTIFACTORY_USERNAME}\", \"${ARTIFACTORY_PASSWORD}\")" \
+        'set publishTo := Option("artifactory-publish" at "https://broadinstitute.jfrog.io/broadinstitute/libs-release-local;build.timestamp=" + new java.util.Date().getTime)' \
+        "set credentials += Credentials(\"Artifactory Realm\", \"broadinstitute.jfrog.io\", \"${ARTIFACTORY_USERNAME}\", \"${ARTIFACTORY_PASSWORD}\")" \
         "+ publish" 2>&1 | sed 's/.*set credentials.*/REDACTED LOG LINE/'
 fi