Skip to content

Commit

Permalink
Mayor Refactor - Compatibility with new Bamboo API and report improve…
Browse files Browse the repository at this point in the history 
…ments (#270)

* > Bamboo v7+ Support
> Historical Fixes
> Allure binary download, unzip, and so on was updated
> All libraries was updated to newer versions
> Removed the error when you add the allure task to any plan (only a log message is shown)

Signed-off-by: Manuel Lara <[email protected]>

* > AllureArtifactsManager: Ensure the path URL, avoiding having two backslashes together when filePath is concatenated
> AllureBuildCompleteAction: Fixing Report URL in the executor.json file.
> AllureCommandLineSupport: Increasing timeout to 5 minutes
> AllureReportServlet: Rollback URL Pattern

Signed-off-by: Manuel Lara <[email protected]>

* > AllureBuildCompleteAction: Adding more historical info (trends and so on).

Signed-off-by: Manuel Lara <[email protected]>

* > Customize the logo of each report from each build from the bamboo UI
> Bug: When you try to uncheck an option from Bamboo UI the option is not saved.
> Download Util class we created to download logo and allure binary
> The deprecated logo was changed due to it being confused. (It is not deprecated, it is just not necessary)
> The task description was changed
> Bug: If you add an allure task to your plan the build fails due to API incompatibility

Signed-off-by: Manuel Lara <[email protected]>

* > Bug-fixed: If a plan execution fails the history is missing for the next execution.

Signed-off-by: Manuel Lara <[email protected]>

* > Plan Titles customization
> Allure removed from the title. (it's not customizable)
> A link was created to download the report for evidence in other systems.
> The logo can have other types not only SVG.
> Fix some dependencies conflicts

Signed-off-by: Manuel Lara <[email protected]>

* > Change Version: 2.0, because the change in this version is major.

Signed-off-by: Manuel Lara <[email protected]>

* Revert "> Change Version: 2.0, because the change in this version is major."

This reverts commit d873df7.

* Revert "Revert "> Change Version: 2.0, because the change in this version is major.""

This reverts commit e143ff0.

* > Change Version: 2.0 to 2.0-SNAPSHOT
> amps.version to 8.0.3-89c970d65

Signed-off-by: Manuel Lara <[email protected]>

* > Fixes

Signed-off-by: Manuel Lara <[email protected]>

* update license

Signed-off-by: Manuel Lara <[email protected]>

* > Fixes

Signed-off-by: Manuel Lara <[email protected]>

---------

Signed-off-by: Manuel Lara <[email protected]>
Co-authored-by: Dmitry Baev <[email protected]>
  • Loading branch information
@lararojasmr @baev
lararojasmr and baev authored Feb 6, 2023
1 parent 508459e commit ca8e2a8
Show file tree
Hide file tree
Showing 33 changed files with 1,011 additions and 154 deletions.
5 changes: 3 additions & 2 deletions appveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ install:
- ps: |
Add-Type -AssemblyName System.IO.Compression.FileSystem
if (!(Test-Path -Path "C:\maven" )) {
(new-object System.Net.WebClient).DownloadFile('http://www.us.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip', 'C:\maven-bin.zip')
(new-object System.Net.WebClient).DownloadFile('https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip', 'C:\maven-bin.zip')
[System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
}
- cmd: SET M2_HOME=C:\maven\apache-maven-3.2.5
- cmd: SET M2_HOME=C:\maven\apache-maven-3.8.1
- cmd: SET ATLAS_MVN=%M2_HOME%\bin\mvn
- cmd: SET PATH=%M2_HOME%\bin;%JAVA_HOME%\bin;%PATH:C:\Ruby193\bin;=%
- cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
- cmd: mvn --version
Expand Down
121 changes: 107 additions & 14 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--suppress VulnerableLibrariesLocal -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>io.qameta.allure</groupId>
<artifactId>allure-bamboo</artifactId>
<version>1.13-SNAPSHOT</version>
<version>2.00-SNAPSHOT</version>
<name>Allure for Bamboo</name>
<description>Allure reports right in deployment plans in Bamboo</description>
<packaging>atlassian-plugin</packaging>
Expand All @@ -15,12 +16,15 @@
</organization>
<properties>
<amps.version>8.0.3-89c970d65</amps.version>
<bamboo.version>6.9.1</bamboo.version>
<bamboo.version>7.1.4</bamboo.version>
<bamboo.data.version>${bamboo.version}</bamboo.data.version>
<plugin.testrunner.version>1.2.3</plugin.testrunner.version>
<atlassian.spring.scanner.version>1.2.13</atlassian.spring.scanner.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

<plugin.testrunner.version>2.0.2</plugin.testrunner.version>
<atlassian.spring.scanner.version>2.1.7</atlassian.spring.scanner.version>
<atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
<slf4j.version>1.7.29</slf4j.version>
<slf4j.version>1.7.36</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<compiler.version>1.8</compiler.version>
</properties>
Expand All @@ -33,16 +37,80 @@
</scm>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>2.14.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.14.0</version>
</dependency>
<dependency>
<groupId>org.buildobjects</groupId>
<artifactId>jproc</artifactId>
<version>2.2.1</version>
<version>2.8.2</version>
</dependency>
<dependency>
<groupId>com.atlassian.bamboo</groupId>
<artifactId>atlassian-bamboo-web</artifactId>
<version>${bamboo.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</exclusion>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
</exclusion>
<exclusion>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
</exclusion>
<exclusion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
<exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.atlassian.templaterenderer</groupId>
Expand All @@ -53,7 +121,7 @@
<dependency>
<groupId>net.lingala.zip4j</groupId>
<artifactId>zip4j</artifactId>
<version>1.3.3</version>
<version>2.11.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -94,13 +162,19 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.2.4</version>
<version>4.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -115,6 +189,16 @@
<artifactId>atlassian-plugins-osgi-testrunner</artifactId>
<version>${plugin.testrunner.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
Expand All @@ -127,16 +211,25 @@
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
<exclusions>
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</exclusion>
<exclusion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
Expand Down
Loading

0 comments on commit ca8e2a8

Please sign in to comment.