Skip to content

2.3.0 Working on looser groovy 3 version requirements #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
farthinder merged 2 commits into from
Apr 6, 2023
Merged

2.3.0 Working on looser groovy 3 version requirements #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49f32c4
pom.xml
farthinder Apr 6, 2023
db8489f
Updated github action to only build one jar
farthinder Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions .github/workflows/publish-maven-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
31 changes: 9 additions & 22 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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 -->
Expand Down Expand Up @@ -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>

Expand Down
5 changes: 3 additions & 2 deletions src/test/groovy/com/eficode/devstack/deployment/impl/BitbucketH2DeploymentTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions src/test/groovy/com/eficode/devstack/deployment/impl/HarborDeploymentTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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"

}
}
4 changes: 2 additions & 2 deletions src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down