Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: allure-framework/allure-bamboo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.13.0
Choose a base ref
...
head repository: allure-framework/allure-bamboo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 3,772 additions and 938 deletions.
  1. +2 −2 .github/dependabot.yml
  2. +0 −17 .github/release-drafter.yml
  3. +19 −0 .github/release.yml
  4. +5 −11 .github/workflows/build.yml
  5. +0 −14 .github/workflows/release-draft.yml
  6. +12 −15 .github/workflows/release.yml
  7. +1 −3 .gitignore
  8. +254 −0 .mvn/quality-configs/checkstyle/checkstyle.xml
  9. +143 −0 .mvn/quality-configs/pmd/pmd.xml
  10. +37 −0 .mvn/quality-configs/spotbugs/exclude.xml
  11. +7 −0 .mvn/quality-configs/spotbugs/include.xml
  12. +15 −0 .mvn/quality-configs/spotless/allure.java.license
  13. +198 −10 LICENSE
  14. +25 −4 README.md
  15. +3 −2 appveyor.yml
  16. +70 −0 docker-compose.yml
  17. +284 −70 pom.xml
  18. +255 −146 src/main/java/io/qameta/allure/bamboo/AllureArtifactsManager.java
  19. +200 −66 src/main/java/io/qameta/allure/bamboo/AllureBuildCompleteAction.java
  20. +72 −12 src/main/java/io/qameta/allure/bamboo/AllureBuildConfig.java
  21. +33 −31 src/main/java/io/qameta/allure/bamboo/AllureBuildConfigurator.java
  22. +30 −10 src/main/java/io/qameta/allure/bamboo/AllureBuildResult.java
  23. +27 −7 src/main/java/io/qameta/allure/bamboo/AllureCommandLineSupport.java
  24. +37 −25 src/main/java/io/qameta/allure/bamboo/AllureConstants.java
  25. +43 −44 src/main/java/io/qameta/allure/bamboo/AllureDownloader.java
  26. +97 −6 src/main/java/io/qameta/allure/bamboo/AllureExecutable.java
  27. +35 −24 src/main/java/io/qameta/allure/bamboo/AllureExecutableProvider.java
  28. +18 −1 src/main/java/io/qameta/allure/bamboo/AllureGenerateResult.java
  29. +84 −38 src/main/java/io/qameta/allure/bamboo/AllureGlobalConfig.java
  30. +27 −0 src/main/java/io/qameta/allure/bamboo/AllurePluginException.java
  31. +17 −1 src/main/java/io/qameta/allure/bamboo/AllurePluginInstallTask.java
  32. +0 −43 src/main/java/io/qameta/allure/bamboo/AllureReportConfig.java
  33. +81 −44 src/main/java/io/qameta/allure/bamboo/AllureReportServlet.java
  34. +19 −9 src/main/java/io/qameta/allure/bamboo/AllureReportTask.java
  35. +38 −6 src/main/java/io/qameta/allure/bamboo/AllureSettingsManager.java
  36. +38 −16 src/main/java/io/qameta/allure/bamboo/AllureViewReportCondition.java
  37. +33 −12 src/main/java/io/qameta/allure/bamboo/BambooExecutablesManager.java
  38. +99 −24 src/main/java/io/qameta/allure/bamboo/ConfigureAllureReportAction.java
  39. +17 −0 src/main/java/io/qameta/allure/bamboo/ViewAllureReport.java
  40. +240 −0 src/main/java/io/qameta/allure/bamboo/config/AllurePluginJavaConfig.java
  41. +26 −9 src/main/java/io/qameta/allure/bamboo/info/AbstractAddInfo.java
  42. +24 −3 src/main/java/io/qameta/allure/bamboo/info/AddExecutorInfo.java
  43. +22 −3 src/main/java/io/qameta/allure/bamboo/info/AddTestRunInfo.java
  44. +51 −0 src/main/java/io/qameta/allure/bamboo/info/AllurePlugins.java
  45. +31 −0 src/main/java/io/qameta/allure/bamboo/info/allurewidgets/summary/AbstractSummary.java
  46. +157 −0 src/main/java/io/qameta/allure/bamboo/info/allurewidgets/summary/Statistic.java
  47. +128 −0 src/main/java/io/qameta/allure/bamboo/info/allurewidgets/summary/Summary.java
  48. +164 −0 src/main/java/io/qameta/allure/bamboo/info/allurewidgets/summary/Time.java
  49. +56 −0 src/main/java/io/qameta/allure/bamboo/util/Downloader.java
  50. +18 −1 src/main/java/io/qameta/allure/bamboo/util/ExceptionUtil.java
  51. +48 −0 src/main/java/io/qameta/allure/bamboo/util/FileStringReplacer.java
  52. +93 −0 src/main/java/io/qameta/allure/bamboo/util/ZipUtil.java
  53. +11 −0 src/main/resources/META-INF/spring/plugin-context.xml
  54. +12 −36 src/main/resources/allure-bamboo.properties
  55. +18 −41 src/main/resources/atlassian-plugin.xml
  56. +6 −2 src/main/resources/templates/editAllureBambooConfiguration.ftl
  57. +18 −14 src/main/resources/templates/editAllureReportConfig.ftl
  58. +10 −10 src/main/resources/templates/error.ftl
  59. +10 −8 src/main/resources/templates/viewAllureReport.ftl
  60. +34 −29 src/test/java/io/qameta/allure/bamboo/AllureCommandLineSupportTest.java
  61. +24 −6 src/test/java/io/qameta/allure/bamboo/AllureDownloaderTest.java
  62. +31 −39 src/test/java/io/qameta/allure/bamboo/AllureExecutableProviderTest.java
  63. +40 −15 src/test/java/io/qameta/allure/bamboo/AllureExecutableTest.java
  64. +16 −1 src/test/java/io/qameta/allure/bamboo/AllureReportServletTest.java
  65. +88 −0 src/test/java/io/qameta/allure/bamboo/SecondAllureExecutableProviderTest.java
  66. +19 −4 src/test/java/io/qameta/allure/bamboo/util/ExceptionUtilTest.java
  67. +2 −4 src/test/resources/log4j.properties
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -7,9 +7,9 @@ updates:
labels:
- "type:dependencies"

- package-ecosystem: "gradle"
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "daily"
labels:
- "type:dependencies"
- "type:dependencies"
17 changes: 0 additions & 17 deletions .github/release-drafter.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# release.yml

changelog:
categories:
- title: '🚀 New Features'
labels:
- 'type:new feature'
- title: '🔬 Improvements'
labels:
- 'type:improvement'
- title: '🐞 Bug Fixes'
labels:
- 'type:bug'
- title: '⬆️ Dependency Updates'
labels:
- 'type:dependencies'
- title: '👻 Internal changes'
labels:
- 'type:internal'
16 changes: 5 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -12,17 +12,11 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK
uses: actions/setup-java@v1
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 1.8
- name: Maven Cache
uses: actions/cache@v1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-
restore-keys: |
${{ runner.os }}-maven-
distribution: 'temurin'
java-version: '17'
cache: 'maven'
- name: Maven Build
run: ./mvnw clean package
14 changes: 0 additions & 14 deletions .github/workflows/release-draft.yml

This file was deleted.

27 changes: 12 additions & 15 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -2,29 +2,26 @@ name: Release

on:
release:
types: [published]
types: [ published ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK
uses: actions/setup-java@v1
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 1.8
- run: echo "::set-output name=name::${GITHUB_REF:10}"
id: version
- name: Update Version
run: ./mvnw versions:set -DnewVersion=${{ steps.version.outputs.name }}
- name: Build Package
run: ./mvnw package
- name: Upload Package
uses: actions/upload-release-asset@v1
distribution: 'temurin'
java-version: '17'
cache: 'maven'
- run: echo "VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
- run: ./mvnw versions:set -DnewVersion=${{ env.VERSION }}
- run: ./mvnw package
- uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: ./target/allure-bamboo-${{ steps.version.outputs.name }}.jar
asset_name: allure-bamboo-${{ steps.version.outputs.name }}.jar
asset_path: ./target/allure-bamboo-${{ env.VERSION }}.jar
asset_name: allure-bamboo-${{ env.VERSION }}.jar
asset_content_type: application/octet-stream
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -5,8 +5,6 @@ target/*
.test
classes

amps-standalone-bamboo-7.2.7
amps-standalone-bamboo-8.0.6
amps-standalone-bamboo-8.1.1
amps-*

.DS_Store
254 changes: 254 additions & 0 deletions .mvn/quality-configs/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,254 @@
<?xml version="1.0" ?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
<module name="Checker">
<!-- Properties (http://checkstyle.sourceforge.net/config.html#Properties#Checker) -->
<property name="fileExtensions" value="java, properties, xml"/>

<!-- Filters (http://checkstyle.sourceforge.net/config_filters.html) -->
<module name="SuppressWarningsFilter"/>

<module name="NewlineAtEndOfFile">
<property name="lineSeparator" value="lf"/>
</module>
<!-- disabled in favour of PMD ExcessiveClassLength check, which correctly checks class length not file length -->
<!--<module name="FileLength">-->
<!--<property name="max" value="500"/>-->
<!--</module>-->
<module name="FileTabCharacter"/>
<module name="Translation"/>
<module name="UniqueProperties"/>

<module name="LineLength">
<property name="max" value="120"/>
</module>

<module name="TreeWalker">
<!-- http://checkstyle.sourceforge.net/config_filters.html#SuppressionCommentFilter -->
<module name="SuppressionCommentFilter"/>

<!-- Annotations (http://checkstyle.sourceforge.net/config_annotation.html) -->
<!--<module name="AnnotationLocation"/>-->
<!--<module name="AnnotationOnSameLine">-->
<!--<module name="AnnotationUseStyle"/>-->
<module name="MissingDeprecated"/>
<module name="MissingOverride"/>
<module name="PackageAnnotation"/>
<module name="SuppressWarningsHolder"/>
<module name="SuppressWarnings"/>


<!-- Block Checks (http://checkstyle.sourceforge.net/config_blocks.html) -->
<module name="AvoidNestedBlocks"/>
<module name="EmptyBlock"/>
<module name="EmptyCatchBlock"/>
<module name="LeftCurly"/>
<module name="NeedBraces"/>
<module name="RightCurly"/>


<!-- Class Design (http://checkstyle.sourceforge.net/config_design.html) -->
<!--<module name="DesignForExtension">-->
<module name="FinalClass"/>
<module name="HideUtilityClassConstructor"/>
<module name="InnerTypeLast"/>
<module name="InterfaceIsType"/>
<module name="MutableException"/>
<module name="OneTopLevelClass"/>
<module name="ThrowsCount"/>
<module name="VisibilityModifier">
<property name="protectedAllowed" value="true"/>
</module>


<!-- Coding (http://checkstyle.sourceforge.net/config_coding.html) -->
<module name="ArrayTrailingComma"/>
<!--<module name="AvoidInlineConditionals"/>-->
<module name="CovariantEquals"/>
<!--<module name="DeclarationOrder"/>-->
<module name="DefaultComesLast"/>
<module name="EmptyStatement"/>
<module name="EqualsAvoidNull"/>
<module name="EqualsHashCode"/>
<module name="ExplicitInitialization"/>
<module name="FallThrough"/>
<module name="FinalLocalVariable"/>
<!--<module name="HiddenField"/>-->
<!--<module name="IllegalCatch"/>-->
<module name="IllegalInstantiation"/>
<!--<module name="IllegalThrows"/>-->
<!--<module name="IllegalToken"/>-->
<module name="IllegalTokenText"/>
<!--<module name="IllegalType"/>-->
<module name="InnerAssignment"/>
<!--<module name="MagicNumber"/>-->
<!--<module name="MissingCtor"/>-->
<module name="MissingSwitchDefault"/>
<module name="ModifiedControlVariable"/>
<module name="MultipleStringLiterals"/>
<module name="MultipleVariableDeclarations"/>
<module name="NestedForDepth">
<property name="max" value="2"/>
</module>
<module name="NestedIfDepth">
<property name="max" value="3"/>
</module>
<module name="NestedTryDepth">
<property name="max" value="2"/>
</module>
<module name="NoClone"/>
<module name="NoFinalizer"/>
<module name="OneStatementPerLine"/>
<module name="OverloadMethodsDeclarationOrder"/>
<module name="PackageDeclaration"/>
<module name="ParameterAssignment"/> <!-- more strict version is FinalParameters -->
<!--<module name="RequireThis"/>-->
<!-- <module name="ReturnCount">-->
<!-- <property name="max" value="5"/>-->
<!-- <property name="maxForVoid" value="3"/>-->
<!-- </module>-->
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
<module name="StringLiteralEquality"/>
<!--<module name="SuperClone"/>-->
<!--<module name="SuperFinalize"/>-->
<module name="UnnecessaryParentheses"/>
<module name="VariableDeclarationUsageDistance">
<property name="allowedDistance" value="5"/>
</module>


<!-- Headers (http://checkstyle.sourceforge.net/config_header.html) -->
<!--<module name="Header"/>-->
<!--<module name="RegexpHeader"/>-->


<!-- Imports (http://checkstyle.sourceforge.net/config_imports.html) -->
<module name="AvoidStarImport"/>
<!--<module name="AvoidStaticImport"/>-->
<!--<module name="CustomImportOrder"/>-->
<!-- <module name="IllegalImport">-->
<!-- <property name="illegalPkgs"-->
<!-- value="org.codehaus.jackson,-->
<!-- org.apache.commons.collections,-->
<!-- org.springframework.util,-->
<!-- org.springframework.data.util"-->
<!-- />-->
<!-- </module>-->
<!-- <module name="ImportControl">-->
<!-- <property name="file" value="${config_loc}/import-control.xml"/>-->
<!-- </module>-->
<!--<module name="ImportOrder"/>-->
<module name="RedundantImport"/>
<module name="UnusedImports"/>


<!-- Javadoc Comments (http://checkstyle.sourceforge.net/config_javadoc.html) -->
<!--<module name="AtclauseOrder"/>-->
<!--<module name="JavadocMethod"/>-->
<!--<module name="JavadocPackage"/>-->
<!--<module name="JavadocParagraph"/>-->
<module name="JavadocStyle"/>
<!--<module name="JavadocTagContinuationIndentation"/>-->
<module name="JavadocType"/>
<!--<module name="JavadocVariable"/>-->
<module name="NonEmptyAtclauseDescription"/>
<!--<module name="SingleLineJavadoc"/>-->
<!--<module name="SummaryJavadoc"/>-->
<!--<module name="WriteTag"/>-->


<!-- Metrics (http://checkstyle.sourceforge.net/config_metrics.html) -->
<module name="BooleanExpressionComplexity"/>
<module name="ClassDataAbstractionCoupling"/>
<!--<module name="ClassFanOutComplexity"/>-->
<module name="CyclomaticComplexity"/>
<!-- <module name="JavaNCSS"/>-->
<module name="NPathComplexity"/>


<!-- Miscellaneous (http://checkstyle.sourceforge.net/config_misc.html) -->
<module name="ArrayTypeStyle"/>
<!--<module name="AvoidEscapedUnicodeCharacters"/>-->
<!--<module name="CommentsIndentation"/>-->
<module name="DescendantToken"/>
<!--<module name="FinalParameters"/>--> <!-- DISABLED in favor of less restricted ParameterAssignment -->
<!--<module name="Indentation"/>-->
<module name="OuterTypeFilename"/>
<!--<module name="TodoComment"/>-->
<!--<module name="TrailingComment"/>-->
<!--<module name="UncommentedMain"/>-->
<module name="UpperEll"/>


<!-- Modifiers (http://checkstyle.sourceforge.net/config_modifier.html) -->
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>


<!-- Naming Conventions (http://checkstyle.sourceforge.net/config_naming.html) -->
<module name="AbbreviationAsWordInName"/>
<!--<module name="AbstractClassName"/>-->
<!--<module name="CatchParameterName"/>-->
<module name="ClassTypeParameterName">
<property name="format" value="^[A-Z]*$"/>
</module>
<module name="ConstantName"/>
<module name="InterfaceTypeParameterName">
<property name="format" value="^[A-Z]*$"/>
</module>
<module name="LocalFinalVariableName"/>
<module name="LocalVariableName"/>
<module name="MemberName"/>
<module name="MethodName"/>
<module name="MethodTypeParameterName">
<property name="format" value="^[A-Z]*$"/>
</module>
<module name="PackageName"/>
<module name="ParameterName"/>
<module name="StaticVariableName"/>
<module name="TypeName"/>


<!-- Regexp (http://checkstyle.sourceforge.net/config_regexp.html) -->
<!--<module name="Regexp"/>-->
<!--<module name="RegexpMultiline"/>-->
<!--<module name="RegexpSingleline"/>-->
<!--<module name="RegexpSinglelineJava"/>-->


<!-- Size Violations (http://checkstyle.sourceforge.net/config_sizes.html) -->
<module name="AnonInnerLength"/>
<module name="ExecutableStatementCount"/>
<module name="MethodCount"/>
<module name="MethodLength"/>
<module name="OuterTypeNumber"/>
<module name="ParameterNumber"/>


<!-- Whitespace (http://checkstyle.sourceforge.net/config_whitespace.html) -->
<module name="EmptyForInitializerPad"/>
<module name="EmptyForIteratorPad"/>
<!--<module name="EmptyLineSeparator"/>-->
<module name="GenericWhitespace"/>
<module name="MethodParamPad"/>
<module name="NoLineWrap"/>
<module name="NoWhitespaceAfter"/>
<module name="NoWhitespaceBefore"/>
<module name="OperatorWrap"/>
<module name="ParenPad"/>
<module name="SeparatorWrap">
<property name="tokens" value="COMMA"/>
<property name="option" value="eol"/>
</module>
<module name="SeparatorWrap">
<property name="tokens" value="DOT"/>
<property name="option" value="nl"/>
</module>
<module name="SingleSpaceSeparator"/>
<module name="TypecastParenPad"/>
<module name="WhitespaceAfter"/>
<module name="WhitespaceAround"/>
</module>
</module>
Loading