Merge pull request #1679 from akshaysonvane/nexus-version-change

Updated version to make it compatible with internal Nexus

Author: srinathgit

gradle.properties

@@ -1,2 +1,2 @@
-version=4.0.SNAPSHOT
-publishUrl=file:../marklogic-data-hub/releases
+version=4.0-SNAPSHOT
+publishUrl=file:../marklogic-data-hub/releases

marklogic-data-hub/gradle.properties

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-mlDHFVersion=4.0.SNAPSHOT
+mlDHFVersion=4.0-SNAPSHOT
 mlHost=localhost
 mlAppName=data-hub
 

marklogic-data-hub/src/main/java/com/marklogic/hub/impl/HubConfigImpl.java

@@ -1596,7 +1596,7 @@ public DatabaseClient newModulesDbClient() {
 
         // this lets debug builds work from an IDE
         if (version.equals("${project.version}")) {
-            version = "4.0.SNAPSHOT";
+            version = "4.0-SNAPSHOT";
         }
         return version;
     }

marklogic-data-hub/src/main/resources/scaffolding/build_gradle

@@ -19,7 +19,7 @@ plugins {
 
     // This gradle plugin extends the ml-gradle plugin with
     // commands that make the Data Hub Framework do its magic
-    id 'com.marklogic.ml-data-hub' version '4.0.SNAPSHOT'
+    id 'com.marklogic.ml-data-hub' version '4.0-SNAPSHOT'
 }
 
 repositories {
@@ -30,7 +30,7 @@ repositories {
 dependencies {
     // this allows you to write custom java code that depends
     // on the Data Hub Framework library
-    compile 'com.marklogic:marklogic-data-hub:4.0.SNAPSHOT'
+    compile 'com.marklogic:marklogic-data-hub:4.0-SNAPSHOT'
     compile 'com.marklogic:marklogic-xcc:9.0.7'
 }
 

ml-data-hub-plugin/gradle.properties

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-mlDHFVersion=4.0.SNAPSHOT
+mlDHFVersion=4.0-SNAPSHOT
 mlHost=localhost
 mlAppName=data-hub
 

ml-data-hub-plugin/src/test/groovy/com/marklogic/gradle/task/HubUpdateTaskTest.groovy

@@ -37,8 +37,8 @@ class HubUpdateTaskTest extends BaseTest {
     //if 4.0 project is upgraded, remove the backed up directories
     def setup() {
         //hardcoding to 4.0
-        File hubConfigDir = hubConfig().hubProject.projectDir.resolve("src/main/hub-internal-config-4.0.SNAPSHOT").toFile()
-        File mlConfigDir = hubConfig().hubProject.projectDir.resolve("src/main/ml-config-4.0.SNAPSHOT").toFile()
+        File hubConfigDir = hubConfig().hubProject.projectDir.resolve("src/main/hub-internal-config-4.0-SNAPSHOT").toFile()
+        File mlConfigDir = hubConfig().hubProject.projectDir.resolve("src/main/ml-config-4.0-SNAPSHOT").toFile()
         if (hubConfigDir.exists() && mlConfigDir.exists()) {
             FileUtils.forceDelete(hubConfigDir)
             FileUtils.forceDelete(mlConfigDir)

quick-start/gradle.properties

@@ -13,7 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 # What version of DHF am I intending on targetting? Make sure you use the full SemVer x.x.x
-mlDHFVersion=4.0.SNAPSHOT
+mlDHFVersion=4.0-SNAPSHOT
 
 mlHost=localhost
 mlAppName=data-hub

quick-start/src/main/java/com/marklogic/quickstart/service/EnvironmentConfig.java

@@ -99,10 +99,10 @@ public void checkIfInstalled() {
         this.runningVersion = this.mlSettings.getJarVersion();
         this.DHFVersion = versions.getDHFVersion();
 
-        // Replace "SNAPSHOT" in version with 0 as QS compares versions and fails if version number contains text
-        installedVersion = installedVersion.replace("SNAPSHOT", "0");
-        runningVersion = runningVersion.replace("SNAPSHOT", "0");
-        DHFVersion = DHFVersion.replace("SNAPSHOT", "0");
+        // Replace "-SNAPSHOT" in version with ".0" as QS compares versions and fails if version number contains text
+        installedVersion = installedVersion.replace("-SNAPSHOT", ".0");
+        runningVersion = runningVersion.replace("-SNAPSHOT", ".0");
+        DHFVersion = DHFVersion.replace("-SNAPSHOT", ".0");
     }
 
     private DatabaseClient _stagingClient = null;