Updated version to 1.7.1-SNAPSHOT. Converted nrgxnat.artifactoryonline.com...

Updated version to 1.7.1-SNAPSHOT. Converted nrgxnat.artifactoryonline.com URLs to nrgxnat.jfrog.io.

build.gradle

@@ -9,8 +9,8 @@ import org.gradle.internal.jvm.Jvm
  * Released under the Simplified BSD.
  */
 
-def vXnat = '1.7.0'
-def vXnatPipeline = vXnat
+def vXnat = '1.7.1-SNAPSHOT'
+def vXnatStable = '1.7.0'
 def vXImgView = '1.0.0-SNAPSHOT'
 def vSpring = '4.2.7.RELEASE'
 def vSpringSecurity = '4.0.4.RELEASE'
@@ -41,11 +41,11 @@ buildscript {
             url "https://plugins.gradle.org/m2/"
         }
         maven {
-            url 'https://nrgxnat.artifactoryonline.com/nrgxnat/libs-release'
+            url 'https://nrgxnat.jfrog.io/nrgxnat/libs-release'
             name 'XNAT Release Repository'
         }
         maven {
-            url 'https://nrgxnat.artifactoryonline.com/nrgxnat/libs-snapshot'
+            url 'https://nrgxnat.jfrog.io/nrgxnat/libs-snapshot'
             name 'XNAT Snapshot Repository'
         }
     }
@@ -77,15 +77,15 @@ repositories {
         name 'dcm4che Maven Repository'
     }
     maven {
-        url 'https://nrgxnat.artifactoryonline.com/nrgxnat/libs-release'
+        url 'https://nrgxnat.jfrog.io/nrgxnat/libs-release'
         name 'XNAT Release Repository'
     }
     maven {
-        url 'https://nrgxnat.artifactoryonline.com/nrgxnat/libs-snapshot'
+        url 'https://nrgxnat.jfrog.io/nrgxnat/libs-snapshot'
         name 'XNAT Snapshot Repository'
     }
     maven {
-        url 'https://nrgxnat.artifactoryonline.com/nrgxnat/ext-release'
+        url 'https://nrgxnat.jfrog.io/nrgxnat/ext-release'
         name 'XNAT External Release Repository'
     }
 }
@@ -257,9 +257,9 @@ publishing {
                 password propertyWithDefault('repoPassword', 'password')
             }
             if (project.version.endsWith('-SNAPSHOT')) {
-                url "https://nrgxnat.artifactoryonline.com/nrgxnat/libs-snapshot-local"
+                url "https://nrgxnat.jfrog.io/nrgxnat/libs-snapshot-local"
             } else {
-                url "https://nrgxnat.artifactoryonline.com/nrgxnat/libs-release-local"
+                url "https://nrgxnat.jfrog.io/nrgxnat/libs-release-local"
             }
         }
     }
@@ -323,10 +323,10 @@ dependencies {
     compile("org.nrg.xnat:xnat-data-models:${vXnat}") {
         transitive = false
     }
-    compile "org.nrg.xdat:core:1.7.1-SNAPSHOT"
+    compile "org.nrg.xdat:core:${vXnat}"
     compile "org.nrg:framework:${vXnat}"
     compile "org.nrg:transaction:${vXnat}"
-    compile "org.nrg:prefs:1.7.1-SNAPSHOT"
+    compile "org.nrg:prefs:${vXnat}"
     compile "org.nrg:config:${vXnat}"
     compile "org.nrg:automation:${vXnat}"
     compile "org.nrg:dicomtools:${vXnat}"
@@ -334,27 +334,27 @@ dependencies {
     compile "org.nrg:mail:${vXnat}"
     compile "org.nrg:notify:${vXnat}"
 
-    compile "org.nrg:dicom-xnat-mx:${vXnat}"
-    compile "org.nrg:dicom-xnat-sop:${vXnat}"
-    compile "org.nrg:dicom-xnat-util:${vXnat}"
-    compile "org.nrg:ecat4xnat:${vXnat}"
+    compile "org.nrg:dicom-xnat-mx:${vXnatStable}"
+    compile "org.nrg:dicom-xnat-sop:${vXnatStable}"
+    compile "org.nrg:dicom-xnat-util:${vXnatStable}"
+    compile "org.nrg:ecat4xnat:${vXnatStable}"
     compile "org.nrg:DicomDB:4.1.0"
     compile "org.nrg:ExtAttr:4.1.0"
     compile "org.nrg:DicomEdit:6.0"
-    compile "org.nrg:DicomImageUtils:${vXnat}"
+    compile "org.nrg:DicomImageUtils:${vXnatStable}"
     compile "org.nrg:DicomUtils:1.3.1"
-    compile "org.nrg:PrearcImporter:${vXnat}"
-    compile "org.nrg:SessionBuilders:${vXnat}"
+    compile "org.nrg:PrearcImporter:${vXnatStable}"
+    compile "org.nrg:SessionBuilders:${vXnatStable}"
 
     compile "org.nrg:pipelineBase:1.0"
     compile "org.nrg:pipelineBuild:1.0"
     compile "org.nrg:pipelineWorkflow:1.0"
     compile "org.nrg:pipelineXNAT:1.0"
-    compile "org.nrg.xnat.pipeline:client:${vXnatPipeline}"
-    compile "org.nrg.xnat.pipeline:xnat_pipeline:${vXnatPipeline}"
-    compile "org.nrg.xnat.pipeline:xnat_tools:${vXnatPipeline}"
+    compile "org.nrg.xnat.pipeline:client:${vXnatStable}"
+    compile "org.nrg.xnat.pipeline:xnat_pipeline:${vXnatStable}"
+    compile "org.nrg.xnat.pipeline:xnat_tools:${vXnatStable}"
 
-    compile("org.nrg.xnat:plexiviewer:${vXnat}") {
+    compile("org.nrg.xnat:plexiviewer:${vXnatStable}") {
         transitive = false
     }
 

src/test/java/org/nrg/xapi/model/users/TestUserSerialization.java

@@ -64,7 +64,7 @@ public class TestUserSerialization {
         assertTrue(securedMap.has("email"));
         assertFalse(securedMap.has("password"));
         assertFalse(securedMap.has("salt"));
-        assertTrue(securedMap.has("admin"));
+        assertFalse(securedMap.has("admin"));
         assertTrue(securedMap.has("enabled"));
         assertFalse(securedMap.has("verified"));
 
@@ -85,7 +85,7 @@ public class TestUserSerialization {
         assertTrue(StringUtils.isNotBlank(securedOutput.getEmail()));
         assertTrue(StringUtils.isBlank(securedOutput.getPassword()));
         assertTrue(StringUtils.isBlank(securedOutput.getSalt()));
-        assertFalse(securedOutput.isAdmin());
+        assertNull(securedOutput.isAdmin());
         assertTrue(securedOutput.isEnabled());
         assertNull(securedOutput.isVerified());