Minor fixes to build configuration

ElucidataInc · Apr 15, 2024 · d462009 · d462009
1 parent a37d320
commit d462009
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [11, 21]
+        java_version: [8, 11]
 
     steps:
       - name: Environment

diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,4 @@
+github_organization=ElucidataInc
+github_username=saif-el
+github_access_token=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
+github_commit_email[email protected]
diff --git a/plugins/nf-polly/build.gradle b/plugins/nf-polly/build.gradle
@@ -68,15 +68,16 @@ dependencies {
     implementation 'org.apache.logging.log4j:log4j-slf4j2-impl'
     implementation 'org.apache.logging.log4j:log4j-1.2-api'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.0'
+
     // test configuration
-    testImplementation "org.apache.groovy:groovy:4.0.18"
-    testImplementation "org.apache.groovy:groovy-nio:4.0.18"
+    testImplementation "org.codehaus.groovy:groovy:3.0.17"
+    testImplementation "org.codehaus.groovy:groovy-nio:3.0.17"
     testImplementation "io.nextflow:nextflow:$nextflowVersion"
-    testImplementation ("org.apache.groovy:groovy-test:4.0.18") { exclude group: 'org.apache.groovy' }
+    testImplementation ("org.codehaus.groovy:groovy-test:3.0.17") { exclude group: 'org.codehaus.groovy' }
     testImplementation ("cglib:cglib-nodep:3.3.0")
     testImplementation ("org.objenesis:objenesis:3.1")
-    testImplementation ("org.spockframework:spock-core:2.3-groovy-4.0") { exclude group: 'org.apache.groovy'; exclude group: 'net.bytebuddy' }
-    testImplementation ('org.spockframework:spock-junit4:2.3-groovy-4.0') { exclude group: 'org.apache.groovy'; exclude group: 'net.bytebuddy' }
+    testImplementation ("org.spockframework:spock-core:2.2-groovy-3.0") { exclude group: 'org.codehaus.groovy'; exclude group: 'net.bytebuddy' }
+    testImplementation ('org.spockframework:spock-junit4:2.2-groovy-3.0') { exclude group: 'org.codehaus.groovy'; exclude group: 'net.bytebuddy' }
     testImplementation ('com.google.jimfs:jimfs:1.1')
 
     testImplementation(testFixtures("io.nextflow:nextflow:$nextflowVersion"))

diff --git a/plugins/nf-polly/src/main/nextflow/polly/PollyConfig.groovy b/plugins/nf-polly/src/main/nextflow/polly/PollyConfig.groovy
@@ -16,7 +16,7 @@ class PollyConfig {
 
     PollyConfig(Map map) {
         def config = map ?: Collections.emptyMap()
-        metricsStreamName = config.metricsStreamName ?: 'pravaah-dev-user-defined-metrics-events-v1'
+        metricsStreamName = config.metricsStreamName ?: 'pravaah-dev-user-defined-metrics-events-stream-v1'
     }
 
     String getMetricsStreamName() { metricsStreamName }

diff --git a/plugins/nf-polly/src/main/nextflow/polly/PollyExtension.groovy b/plugins/nf-polly/src/main/nextflow/polly/PollyExtension.groovy
@@ -79,9 +79,11 @@ class PollyExtension extends PluginExtensionPoint {
                     .build() as PutRecordRequest
             PutRecordResponse response = client.putRecord(putRequest)
             logger.info(
-                    "Submitted record %s to stream shard %s",
-                    response.sequenceNumber(),
-                    response.shardId()
+                    String.format(
+                            "Submitted record %s to stream shard %s",
+                            response.sequenceNumber(),
+                            response.shardId()
+                    )
             )
         } catch (Exception e) {
             logger.error("Failed to produce: " + e.getMessage())

diff --git a/plugins/nf-polly/src/test/nextflow/polly/PollyDslTest.groovy b/plugins/nf-polly/src/test/nextflow/polly/PollyDslTest.groovy
@@ -35,7 +35,6 @@ class PollyDslTest extends Dsl2Spec {
             protected PluginDescriptorFinder createPluginDescriptorFinder() {
                 return new TestPluginDescriptorFinder() {
 
-                    @Override
                     protected Manifest readManifestFromDirectory(Path pluginPath) {
                         if (!Files.isDirectory(pluginPath))
                             return null