Skip to content

Commit 56fea74

Browse files
authored
Adding jenkins and Harbor, rework of Container interface (#8)
* Major rework of Container.groovy in order to move many of the implementing classes methods in to the trait. Added Jenkins Started reworking poms, integrating groovy 3 in to parent, needs more work * Added JenkinsContainer.groovy * Added DoodContainerTest, intended to run Harbor * HarborManagerContainer.groovy, HarborDeployment.groovy, HarborDeploymentTest.groovy * Most of the work is done, logging and cleanup needed * Finished work on HarborManagerContainer.groovy, HarborDeployment.groovy, HarborDeploymentTest.groovy * Tweaking of build * Build tweaks * Build tweaks
1 parent 91e0550 commit 56fea74

27 files changed

Lines changed: 878 additions & 417 deletions

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,21 @@ jobs:
3636
restore-keys: |
3737
${{ runner.os }}-maven-
3838
39-
- name: Installing parent pom file
39+
- name: Installing Groovy 3 version
4040
run: |
4141
4242
4343
mkdir -p repository/com/eficode/devstack
44+
echo Compiling, Packaging and Installing Groovy 3.0 version of library to local m2 directory
45+
mvn install -f pom.xml -DcreateChecksum=true
4446
45-
echo Installing parent pom file
46-
mvn install:install-file -Dpackaing=pom -Dfile=pom.xml -DpomFile=pom.xml -DcreateChecksum=true
47+
4748
4849
- name: Installing Groovy 2.5 Version
4950
run: |
5051
5152
echo Compiling, Packaging and Installing Groovy 2.5 version of library to local m2 directory
52-
mvn install -f pom-2.5.xml -DcreateChecksum=true
53-
54-
- name: Installing Groovy 3 Version
55-
run: |
56-
57-
echo Compiling, Packaging and Installing Groovy 3.0 version of library to local m2 directory
58-
mvn install -f pom-3.0.xml -DcreateChecksum=true
59-
53+
mvn install -f pom.xml -DcreateChecksum=true -Dgroovy.major.version=2.5 -Dgroovy.version=2.5.18 -Dspock-core.version=2.2-groovy-2.5 -DjiraShortcuts.version=2.0-SNAPSHOT-groovy-2.5 -Dbitbucketinstancemanager.version=0.0.3-SNAPSHOT-groovy-2.5
6054
6155
- name: Copying JAR files
6256
run: |

.idea/jarRepositories.xml

Lines changed: 3 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pom-2.5.xml

Lines changed: 0 additions & 59 deletions
This file was deleted.

pom-3.0.xml

Lines changed: 0 additions & 57 deletions
This file was deleted.

pom.xml

Lines changed: 39 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66

77
<groupId>com.eficode</groupId>
88
<artifactId>devstack</artifactId>
9-
<version>1.2.1-SNAPSHOT</version>
9+
<version>2.0.0-SNAPSHOT-groovy-${groovy.major.version}</version>
10+
<packaging>jar</packaging>
1011

1112
<name>DevStack - Parent pom</name>
1213

1314
<description>A series of scripts for setting up common developer application suites</description>
14-
<packaging>pom</packaging>
15+
1516

1617

1718
<dependencies>
@@ -20,11 +21,39 @@
2021

2122
<dependency>
2223
<groupId>org.codehaus.groovy</groupId>
23-
<artifactId>groovy</artifactId>
24+
<artifactId>groovy-all</artifactId>
25+
<version>${groovy.version}</version>
26+
<type>pom</type>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.codehaus.groovy</groupId>
30+
<artifactId>groovy-yaml</artifactId>
2431
<version>3.0.11</version>
25-
<scope>compile</scope>
32+
<!--version>${groovy.version}</version-->
33+
</dependency>
34+
<dependency>
35+
<groupId>org.spockframework</groupId>
36+
<artifactId>spock-core</artifactId>
37+
<version>${spock-core.version}</version>
38+
<scope>test</scope>
39+
</dependency>
40+
41+
<dependency>
42+
<groupId>com.eficode.atlassian</groupId>
43+
<artifactId>JiraShortcuts</artifactId>
44+
<version>${jiraShortcuts.version}</version>
2645
</dependency>
2746

47+
48+
<dependency>
49+
<groupId>com.eficode.atlassian</groupId>
50+
<artifactId>bitbucketinstancemanager</artifactId>
51+
<version>${bitbucketinstancemanager.version}</version>
52+
<classifier>standalone</classifier>
53+
</dependency>
54+
55+
56+
2857
<dependency>
2958
<groupId>org.slf4j</groupId>
3059
<artifactId>slf4j-api</artifactId>
@@ -191,7 +220,7 @@
191220
<dependency>
192221
<groupId>org.codehaus.groovy</groupId>
193222
<artifactId>groovy</artifactId>
194-
<version>3.0.11</version>
223+
<version>${groovy.version}</version>
195224
<scope>runtime</scope>
196225
</dependency>
197226
</dependencies>
@@ -231,6 +260,11 @@
231260
<properties>
232261
<maven.compiler.source>11</maven.compiler.source>
233262
<maven.compiler.target>11</maven.compiler.target>
263+
<groovy.major.version>3.0</groovy.major.version>
264+
<groovy.version>3.0.11</groovy.version>
265+
<spock-core.version>2.2-groovy-3.0</spock-core.version>
266+
<jiraShortcuts.version>2.0-SNAPSHOT-groovy-3.0</jiraShortcuts.version>
267+
<bitbucketinstancemanager.version>0.0.3-SNAPSHOT-groovy-3.0</bitbucketinstancemanager.version>
234268
</properties>
235269

236270
</project>

0 commit comments

Comments
 (0)