Skip to content

Commit 349642f

Browse files
farthinderfarthinder
authored
1.1.0 release (#5)
* Working on BitbucketContainer. Basic deployment now works * Added customEnvVar to JsmContainer, consider adding it to interface instead * Added runOnFirstStartup to containers Started added network related methods to Container.groovy, testing in progress * Started adding networking to Containers interface * Minor bugfixes * Updated to use the new JiraInstanceManager and bitbucketinstancemanager Added Deployment for Bitbucket H2 * JsmAndBitbucketH2Deployment.groovy Now deploys JSM and Bitbucket in parallel Perhaps create a new interface superDeployment * Container.groovy * Most of the static methods and fields have been removed in interface and sub-classes * Added createContainer() with cmd and run parameters * Renamed inspect() method to inspectContainer() to not interfere with native groovy method * stopAndRemoveContainer() now kills container after timeout * A lot of work on networking for containers AlpineContainer.groovy * Now has createSleepyContainer() * Container.groovy * getIP is now getIPs to support multiple IPs and to resolve the IP in a more dependable fashion * Networking is now done is so is testing of it * Added networking to Deployments * Working on Groovy 2 and 3 versions of the library. Working on a standard class for spock testing Implemented changes due to updates to underlying docker client library * Configured more of the tests to us DevStackSpec * Working on git actions * Workflow fixes * Minor tweaks * Cleanup * Bumped version to 1.1.0
1 parent 946605c commit 349642f

26 files changed

Lines changed: 1912 additions & 413 deletions

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

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,28 @@ jobs:
2424
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
2525
settings-path: ${{ github.workspace }} # location for the settings.xml file
2626

27-
- name: Compile Groovy code and generate sources
28-
run: mvn gplus:compile generate-sources package
29-
30-
3127
#Manually first (once) set up an orphaned branch:
3228
# git switch --orphan packages
3329
# git commit --allow-empty -m "Initial commit on packages branch"
3430
# git push origin packages:packages
3531

3632
- name: Install Package to packages branch
3733
run: |
38-
MAINJAR=$(ls -1 target/*.jar | grep -v sources\.jar)
39-
SOURCEJAR=$(ls -1 target/*.jar | grep sources\.jar | grep -v test)
40-
VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
41-
echo Main JAR: $MAINJAR
42-
echo Source JAR: $SOURCEJAR
43-
echo Version: $VERSION
44-
mkdir -p repository
45-
echo Installing JAR in repository directory
46-
mvn install:install-file -DpomFile=pom.xml -DlocalRepositoryPath=repository/ -Dfile="$MAINJAR" -Dsources="$SOURCEJAR" -DgeneratePom=true -DcreateChecksum=true
34+
mkdir localm2
35+
mkdir -p repository/com/eficode/devstack
36+
37+
echo Installing parent pom file
38+
mvn install:install-file -Dpackaing=pom -Dfile=pom.xml -DpomFile=pom.xml -Dmaven.repo.local=localm2/ -DcreateChecksum=true
39+
40+
echo Compiling, Packaging and Installing Groovy 2.5 version of library to local m2 directory
41+
mvn install -f pom-2.5.xml -Dmaven.repo.local=localm2/ -DcreateChecksum=true
42+
43+
echo Compiling, Packaging and Installing Groovy 3.0 version of library to local m2 directory
44+
mvn install -f pom-3.0.xml -Dmaven.repo.local=localm2/ -DcreateChecksum=true
45+
46+
echo Copying the new JAR files to repository which will be added to git branch "packages"
47+
rsync -avh --checksum localm2/com/eficode/devstack repository/com/eficode/devstack
48+
4749
4850
git config user.name github-actions
4951
git config user.email github-actions@github.com

‎.idea/compiler.xml‎

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

‎.idea/jarRepositories.xml‎

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

‎.idea/misc.xml‎

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

‎pom-2.5.xml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<name>DevStack for Groovy 2.5</name>
8+
<artifactId>devstack</artifactId>
9+
<version>1.1.0-SNAPSHOT-groovy-2.5</version>
10+
<packaging>jar</packaging>
11+
12+
13+
<parent>
14+
<groupId>com.eficode</groupId>
15+
<artifactId>devstack</artifactId>
16+
<version>1.1.0-SNAPSHOT</version>
17+
<relativePath>pom.xml</relativePath>
18+
</parent>
19+
20+
21+
<dependencies>
22+
<dependency>
23+
<groupId>org.codehaus.groovy</groupId>
24+
<artifactId>groovy</artifactId>
25+
<version>2.5.18</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>org.spockframework</groupId>
29+
<artifactId>spock-core</artifactId>
30+
<version>2.2-groovy-2.5</version>
31+
<scope>test</scope>
32+
</dependency>
33+
34+
35+
36+
<dependency>
37+
<groupId>com.eficode.atlassian</groupId>
38+
<artifactId>bitbucketinstancemanager</artifactId>
39+
<version>0.0.3-SNAPSHOT-groovy-2.5</version>
40+
<classifier>standalone</classifier>
41+
</dependency>
42+
43+
44+
</dependencies>
45+
46+
47+
<properties>
48+
<maven.compiler.source>11</maven.compiler.source>
49+
<maven.compiler.target>11</maven.compiler.target>
50+
</properties>
51+
52+
</project>

‎pom-3.0.xml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<name>DevStack for Groovy 3</name>
8+
<artifactId>devstack</artifactId>
9+
<version>1.1.0-SNAPSHOT-groovy-3.0</version>
10+
<packaging>jar</packaging>
11+
12+
13+
<parent>
14+
<groupId>com.eficode</groupId>
15+
<artifactId>devstack</artifactId>
16+
<version>1.1.0-SNAPSHOT</version>
17+
<relativePath>pom.xml</relativePath>
18+
</parent>
19+
20+
21+
<dependencies>
22+
<dependency>
23+
<groupId>org.codehaus.groovy</groupId>
24+
<artifactId>groovy</artifactId>
25+
<version>3.0.11</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>org.spockframework</groupId>
29+
<artifactId>spock-core</artifactId>
30+
<version>2.2-groovy-3.0</version>
31+
<scope>test</scope>
32+
</dependency>
33+
34+
35+
36+
<dependency>
37+
<groupId>com.eficode.atlassian</groupId>
38+
<artifactId>bitbucketinstancemanager</artifactId>
39+
<version>0.0.3-SNAPSHOT-groovy-2.5</version>
40+
<classifier>standalone</classifier>
41+
</dependency>
42+
43+
44+
</dependencies>
45+
46+
47+
<properties>
48+
<maven.compiler.source>11</maven.compiler.source>
49+
<maven.compiler.target>11</maven.compiler.target>
50+
</properties>
51+
52+
</project>

0 commit comments

Comments
 (0)