CORDA-3934: Upgrade default Quasar version to 0.7.13_r3. (#347)

corda · Aug 4, 2020 · 575a533 · 575a533
1 parent d422381
commit 575a533
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 24 deletions.
diff --git a/changelog.md b/changelog.md
@@ -4,6 +4,8 @@
 
 ### Version 5.0.12
 
+* `quasar-utils`: Upgrade default Quasar version to 0.7.13_r3.
+
 ### Version 5.0.11
 
 * `cordformation`: Map the host to the same ssh port as in the container

diff --git a/quasar-utils/src/main/groovy/net/corda/plugins/quasar/QuasarPlugin.groovy b/quasar-utils/src/main/groovy/net/corda/plugins/quasar/QuasarPlugin.groovy
@@ -22,8 +22,8 @@ class QuasarPlugin implements Plugin<Project> {
 
     private static final String QUASAR = "quasar"
     @PackageScope static final String defaultGroup = "co.paralleluniverse"
-    @PackageScope static final String defaultVersion = "0.7.10"
-    @PackageScope static final String defaultClassifier = "jdk8"
+    @PackageScope static final String defaultVersion = "0.7.13_r3"
+    @PackageScope static final String defaultClassifier = ""
 
     private final ObjectFactory objects
 

diff --git a/quasar-utils/src/test/groovy/net/corda/plugins/quasar/QuasarPluginTest.groovy b/quasar-utils/src/test/groovy/net/corda/plugins/quasar/QuasarPluginTest.groovy
@@ -55,11 +55,11 @@ configs.collectEntries { [(it.name):it] }.forEach { name, files ->
 }
 """, "jar"
         assertThat(output).containsOnlyOnce(
-            "quasar: quasar-core-${QUASAR_VERSION}-${QUASAR_CLASSIFIER}.jar".toString(),
-            "cordaRuntime: quasar-core-${QUASAR_VERSION}-${QUASAR_CLASSIFIER}.jar".toString(),
-            "runtimeClasspath: quasar-core-${QUASAR_VERSION}-${QUASAR_CLASSIFIER}.jar".toString(),
-            "compileOnly: quasar-core-${QUASAR_VERSION}-${QUASAR_CLASSIFIER}.jar".toString(),
-            "compileClasspath: quasar-core-${QUASAR_VERSION}-${QUASAR_CLASSIFIER}.jar".toString()
+            "quasar: quasar-core-${QUASAR_VERSION}.jar".toString(),
+            "cordaRuntime: quasar-core-${QUASAR_VERSION}.jar".toString(),
+            "runtimeClasspath: quasar-core-${QUASAR_VERSION}.jar".toString(),
+            "compileOnly: quasar-core-${QUASAR_VERSION}.jar".toString(),
+            "compileClasspath: quasar-core-${QUASAR_VERSION}.jar".toString()
         )
     }
 
@@ -93,11 +93,11 @@ configs.collectEntries { [(it.name):it] }.forEach { name, files ->
 }
 """, "jar"
         assertThat(output).containsOnlyOnce(
-            "quasar: quasar-core-${quasarVersion}-${QUASAR_CLASSIFIER}.jar".toString(),
-            "cordaRuntime: quasar-core-${quasarVersion}-${QUASAR_CLASSIFIER}.jar".toString(),
-            "runtimeClasspath: quasar-core-${quasarVersion}-${QUASAR_CLASSIFIER}.jar".toString(),
-            "compileOnly: quasar-core-${quasarVersion}-${QUASAR_CLASSIFIER}.jar".toString(),
-            "compileClasspath: quasar-core-${quasarVersion}-${QUASAR_CLASSIFIER}.jar".toString()
+            "quasar: quasar-core-${quasarVersion}.jar".toString(),
+            "cordaRuntime: quasar-core-${quasarVersion}.jar".toString(),
+            "runtimeClasspath: quasar-core-${quasarVersion}.jar".toString(),
+            "compileOnly: quasar-core-${quasarVersion}.jar".toString(),
+            "compileClasspath: quasar-core-${quasarVersion}.jar".toString()
         )
     }
 
@@ -132,18 +132,18 @@ configs.collectEntries { [(it.name):it] }.forEach { name, files ->
 }
 """, "jar"
         assertThat(output).containsOnlyOnce(
-            "quasar: quasar-core-${quasarVersion}-${QUASAR_CLASSIFIER}.jar".toString(),
-            "cordaRuntime: quasar-core-${quasarVersion}-${QUASAR_CLASSIFIER}.jar".toString(),
-            "runtimeClasspath: quasar-core-${quasarVersion}-${QUASAR_CLASSIFIER}.jar".toString(),
-            "compileOnly: quasar-core-${quasarVersion}-${QUASAR_CLASSIFIER}.jar".toString(),
-            "compileClasspath: quasar-core-${quasarVersion}-${QUASAR_CLASSIFIER}.jar".toString()
+            "quasar: quasar-core-${quasarVersion}.jar".toString(),
+            "cordaRuntime: quasar-core-${quasarVersion}.jar".toString(),
+            "runtimeClasspath: quasar-core-${quasarVersion}.jar".toString(),
+            "compileOnly: quasar-core-${quasarVersion}.jar".toString(),
+            "compileClasspath: quasar-core-${quasarVersion}.jar".toString()
         )
     }
 
     @Test
     void checkLocalOverriddenClassifierVersionIsUsed() {
-        def quasarVersion = "0.8.0"
-        def quasarClassifier = ''
+        def quasarVersion = '0.7.12_r3'
+        def quasarClassifier = 'jdk8'
         assertThat(quasarVersion).isNotEqualTo(QUASAR_VERSION)
         assertThat(quasarClassifier).isNotEqualTo(QUASAR_CLASSIFIER)
 
@@ -169,11 +169,11 @@ configs.collectEntries { [(it.name):it] }.forEach { name, files ->
 }
 """, "jar"
         assertThat(output).containsOnlyOnce(
-            "quasar: quasar-core-${quasarVersion}.jar".toString(),
-            "cordaRuntime: quasar-core-${quasarVersion}.jar".toString(),
-            "runtimeClasspath: quasar-core-${quasarVersion}.jar".toString(),
-            "compileOnly: quasar-core-${quasarVersion}.jar".toString(),
-            "compileClasspath: quasar-core-${quasarVersion}.jar".toString()
+            "quasar: quasar-core-${quasarVersion}-${quasarClassifier}.jar".toString(),
+            "cordaRuntime: quasar-core-${quasarVersion}-${quasarClassifier}.jar".toString(),
+            "runtimeClasspath: quasar-core-${quasarVersion}-${quasarClassifier}.jar".toString(),
+            "compileOnly: quasar-core-${quasarVersion}-${quasarClassifier}.jar".toString(),
+            "compileClasspath: quasar-core-${quasarVersion}-${quasarClassifier}.jar".toString()
         )
     }