2.3.0 Working on looser groovy 3 version requirements (#20)

* pom.xml
 * Bumped to 2.3.0
 * Switched to using groovy-all as provided
 * Added explicit depenency on groovy-json
 * Switched to using loose groovy versioning [3.0,4.0)
 * Cleaned up no longer used profiles

* Updated github action to only build one jar

Author: farthinder

.github/workflows/publish-maven-package.yml

@@ -41,17 +41,9 @@ jobs:
           
           mkdir -p repository/com/eficode/devstack
           
-          mvn help:effective-pom -P groovy-3,groovy-3.0.14 -Doutput=effective-pom.xml
+          mvn help:effective-pom -P groovy-3 -Doutput=effective-pom.xml
           mvn install -f effective-pom.xml -DcreateChecksum=true 
           
-          mvn help:effective-pom -P groovy-3,groovy-3.0.13 -Doutput=effective-pom.xml
-          mvn install -f effective-pom.xml -DcreateChecksum=true 
-          
-          mvn help:effective-pom -P groovy-3,groovy-3.0.12 -Doutput=effective-pom.xml
-          mvn install -f effective-pom.xml -DcreateChecksum=true 
-
-          mvn help:effective-pom -P groovy-3,groovy-3.0.11 -Doutput=effective-pom.xml
-          mvn install -f effective-pom.xml -DcreateChecksum=true
 
       - name: Copying JAR files
         run: |

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.eficode</groupId>
     <artifactId>devstack</artifactId>
-    <version>2.2.4-SNAPSHOT-groovy-${groovy.version}</version>
+    <version>2.3.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>DevStack</name>
@@ -23,12 +23,17 @@
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <version>${groovy.version}</version>
+            <scope>provided</scope>
             <type>pom</type>
         </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-yaml</artifactId>
-            <!--version>3.0.11</version-->
+            <version>${groovy.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-json</artifactId>
             <version>${groovy.version}</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-ant -->
@@ -271,32 +276,14 @@
                 <maven.compiler.source>11</maven.compiler.source>
                 <maven.compiler.target>11</maven.compiler.target>
                 <groovy.major.version>3.0</groovy.major.version>
-                <groovy.version>3.0.14</groovy.version>
-                <spock-core.version>2.2-groovy-3.0</spock-core.version>
+                <groovy.version>[3.0,4.0)</groovy.version>
+                <spock-core.version>2.4-M1-groovy-${groovy.major.version}</spock-core.version>
                 <jiraShortcuts.version>2.0.3-SNAPSHOT-groovy-3.0</jiraShortcuts.version>
                 <bitbucketinstancemanager.version>0.0.3-SNAPSHOT-groovy-3.0</bitbucketinstancemanager.version>
             </properties>
         </profile>
 
 
-        <profile>
-            <id>groovy-3.0.14</id>
-            <properties>
-                <groovy.version>3.0.13</groovy.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>groovy-3.0.12</id>
-            <properties>
-                <groovy.version>3.0.12</groovy.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>groovy-3.0.11</id>
-            <properties>
-                <groovy.version>3.0.11</groovy.version>
-            </properties>
-        </profile>
 
     </profiles>
 

src/test/groovy/com/eficode/devstack/deployment/impl/BitbucketH2DeploymentTest.groovy

@@ -19,8 +19,9 @@ class BitbucketH2DeploymentTest extends DevStackSpec{
     def setupSpec() {
 
 
-        dockerRemoteHost = "https://docker.domain.se:2376"
-        dockerCertPath = "~/.docker/"
+        //dockerRemoteHost = "https://docker.domain.se:2376"
+        //dockerCertPath = "~/.docker/"
+
 
 
         log = LoggerFactory.getLogger(BitbucketH2DeploymentTest.class)

src/test/groovy/com/eficode/devstack/deployment/impl/HarborDeploymentTest.groovy

@@ -10,8 +10,8 @@ import org.slf4j.LoggerFactory
 class HarborDeploymentTest extends DevStackSpec {
     def setupSpec() {
 
-        dockerRemoteHost = "https://docker.domain.se:2376"
-        dockerCertPath = "~/.docker/"
+        //dockerRemoteHost = "https://docker.domain.se:2376"
+        //dockerCertPath = "~/.docker/"
 
 
         log = LoggerFactory.getLogger(HarborDeploymentTest.class)
@@ -87,7 +87,7 @@ class HarborDeploymentTest extends DevStackSpec {
         where:
         dockerHost       | certPath       | harborBaseUrl             | harborVersion | harborBaseDir
         ""               | ""             | "http://localhost"        | "v2.6.0"      | "/tmp"
-        //dockerRemoteHost | dockerCertPath | "http://harbor.domain.se" | "v2.6.0"      | "/tmp"
+        dockerRemoteHost | dockerCertPath | "http://harbor.domain.se" | "v2.6.0"      | "/tmp"
 
     }
 }

src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy

@@ -15,8 +15,8 @@ class JsmH2DeploymentTest extends DevStackSpec {
 
     def setupSpec() {
 
-        dockerRemoteHost = "https://docker.domain.se:2376"
-        dockerCertPath = "~/.docker/"
+        //dockerRemoteHost = "https://docker.domain.se:2376"
+        //dockerCertPath = "~/.docker/"
 
 
         log = LoggerFactory.getLogger(JsmH2DeploymentTest.class)