Skip to content

Commit

Permalink
Support Bamboo 9.6.0 (#214)
Browse files Browse the repository at this point in the history
  • Loading branch information
@RobiNino
RobiNino authored Apr 8, 2024
1 parent 468f923 commit 09db31e
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Before submitting a pull request, please make sure your code is covered by tests.

## Building the Code
The code is built with Maven and JDK 8.
The code is built with Maven and JDK 11.
To build the plugin, please follow these steps:
1. Clone the code from GitHub.
2. Build and create the Bamboo Artifactory plugin jar by running the following Maven command:
Expand Down
87 changes: 79 additions & 8 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,22 @@
</scm>

<properties>
<!-- Bamboo versions above 9.3.0 require JDK 11 -->
<bamboo.version>9.3.0</bamboo.version>
<bamboo.version>9.6.0</bamboo.version>
<bamboo.data.version>${bamboo.version}</bamboo.data.version>
<!-- This key is used to keep the consistency between the key in atlassian-plugin.xml and the key to generate bundle. -->
<atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
<!-- This plugin key is to be used as a unique ID of the plugin incl.
version and not as a key regarding the Atlassian plugin descriptor -->
<plugin.key>${project.groupId}.${project.artifactId}-${project.version}</plugin.key>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<!--Skip integration tests unless explicitly requested with -DskipITs=false-->
<skipITs>true</skipITs>
<buildinfo.version>2.41.8</buildinfo.version>
<buildinfo.gradle.version>4.33.7</buildinfo.gradle.version>
<buildinfo.version>2.41.14</buildinfo.version>
<buildinfo.gradle.version>4.33.13</buildinfo.gradle.version>
<amps.version>8.11.4</amps.version>
</properties>

<profiles>
Expand Down Expand Up @@ -76,6 +77,12 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
<version>1.7.36</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand All @@ -86,6 +93,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
Expand Down Expand Up @@ -171,12 +179,28 @@
<artifactId>build-info-extractor-gradle</artifactId>
<version>${buildinfo.gradle.version}</version>
<classifier>uber</classifier>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jfrog.buildinfo</groupId>
<artifactId>build-info-extractor-nuget</artifactId>
<version>${buildinfo.version}</version>
<classifier>uber</classifier>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jfrog.buildinfo</groupId>
Expand Down Expand Up @@ -220,6 +244,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -275,7 +303,7 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.1.214</version>
<version>2.2.220</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -327,11 +355,44 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.9.1</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
<version>3.8.7</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.55</version>
</dependency>

<!-- WIRED TEST RUNNER DEPENDENCIES -->
Expand Down Expand Up @@ -418,7 +479,7 @@
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>bamboo-maven-plugin</artifactId>
<version>8.0.2</version>
<version>${amps.version}</version>
<extensions>true</extensions>
<configuration>
<productVersion>${bamboo.version}</productVersion>
Expand All @@ -432,6 +493,7 @@
<systemPropertyVariables>the active branch
<GIT_BRANCH>${git.branch}</GIT_BRANCH>
</systemPropertyVariables>
<extractDependencies>false</extractDependencies>
<products>
<product>
<id>bamboo</id>
Expand Down Expand Up @@ -614,6 +676,15 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
Expand Down

0 comments on commit 09db31e

Please sign in to comment.