fix it build and deps update

allure-framework · Jul 24, 2024 · 1b1dda6 · 1b1dda6
1 parent 5b1d58c
commit 1b1dda6
Show file tree

Hide file tree

Showing 40 changed files with 175 additions and 307 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: [ '8.0.x', '11.0.x', '17.0.x' ]
+        java-version: [ '8.0.x', '11.0.x', '17.0.x', '21.0.x' ]
     steps:
       - uses: actions/[email protected]
       - name: Set up JDK ${{ matrix.java-version }}

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 
 [![Build](https://github.com/allure-framework/allure-maven/actions/workflows/build.yml/badge.svg)](https://github.com/allure-framework/allure-maven/actions/workflows/build.yml) [![release-badge][]][release]
 
-This plugin generates Allure report by [existing XML files](https://github.com/allure-framework/allure-core/wiki#gathering-information-about-tests) during Maven build process.
+This plugin generates Allure report by [existing XML](https://github.com/allure-framework/allure-core/wiki#gathering-information-about-tests) or [JSON files](https://github.com/allure-framework/allure2) during Maven build process.
 
 ## Getting Started
 

diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <compiler.version>1.8</compiler.version>
 
-        <maven.version>3.8.6</maven.version>
+        <maven.version>3.9.8</maven.version>
         <maven-plugin.version>3.7.0</maven-plugin.version>
 
         <pmd.version>6.41.0</pmd.version>
@@ -119,7 +119,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>${compiler.version}</source>
                     <target>${compiler.version}</target>
@@ -128,7 +128,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.4.2</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -140,7 +140,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -153,7 +153,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.8.0</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -171,7 +171,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.3</version>
+                <version>3.1.1</version>
                 <configuration>
                     <tagNameFormat>@{project.version}</tagNameFormat>
                 </configuration>
@@ -208,7 +208,7 @@
                 <configuration>
                     <configLocation>${project.basedir}/maven/quality-configs/checkstyle/checkstyle.xml</configLocation>
                     <suppressionsLocation>${project.basedir}/maven/quality-configs/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
-                    <encoding>UTF-8</encoding>
+                    <inputEncoding>UTF-8</inputEncoding>
                     <consoleOutput>true</consoleOutput>
                     <failsOnError>true</failsOnError>
                     <linkXRef>false</linkXRef>
@@ -274,17 +274,17 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.32</version>
+            <version>2.0.13</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.13</version>
+            <version>4.5.14</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.14.0</version>
+            <version>2.17.2</version>
         </dependency>
 
         <!--Maven Plugin API-->
@@ -339,13 +339,19 @@
         <dependency>
             <groupId>net.lingala.zip4j</groupId>
             <artifactId>zip4j</artifactId>
-            <version>1.3.3</version>
+            <version>2.11.5</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-exec</artifactId>
-            <version>1.3</version>
+            <version>1.4.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.12.0</version>
         </dependency>
 
         <dependency>
@@ -357,7 +363,7 @@
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-jxr-plugin</artifactId>
-            <version>3.3.0</version>
+            <version>3.4.0</version>
         </dependency>
 
         <dependency>
@@ -391,7 +397,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <version>3.2.4</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -415,7 +421,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-invoker-plugin</artifactId>
-                        <version>3.3.0</version>
+                        <version>3.7.0</version>
                         <configuration>
                             <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
                             <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>

diff --git a/src/it/aggregate-multi-module-exclude-report/pom.xml b/src/it/aggregate-multi-module-exclude-report/pom.xml
@@ -14,10 +14,6 @@
         <module>second</module>
     </modules>
 
-    <properties>
-        <allure.version>1.4.16</allure.version>
-    </properties>
-
     <reporting>
         <excludeDefaults>true</excludeDefaults>
         <plugins>
@@ -39,7 +35,7 @@
                     </reportSet>
                 </reportSets>
                 <configuration>
-                    <reportVersion>2.13.9</reportVersion>
+                    <reportVersion>2.30.0</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/aggregate-multi-module/pom.xml b/src/it/aggregate-multi-module/pom.xml
@@ -14,10 +14,6 @@
         <module>second</module>
     </modules>
 
-    <properties>
-        <allure.version>1.4.16</allure.version>
-    </properties>
-
     <reporting>
         <excludeDefaults>true</excludeDefaults>
         <plugins>
@@ -28,14 +24,14 @@
                 <reportSets>
                     <reportSet>
                         <id>aggregate</id>
-                        <inherited>false</inherited>
+                        <inherited>true</inherited>
                         <reports>
                             <report>aggregate</report>
                         </reports>
                     </reportSet>
                 </reportSets>
                 <configuration>
-                    <reportVersion>2.13.9</reportVersion>
+                    <reportVersion>2.30.0</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/aggregate-sample/pom.xml b/src/it/aggregate-sample/pom.xml
@@ -8,10 +8,6 @@
     <version>1.0-SNAPSHOT</version>
     <name>Allure Report Test</name>
 
-    <properties>
-        <allure.version>1.4.16</allure.version>
-    </properties>
-
     <reporting>
         <excludeDefaults>true</excludeDefaults>
         <plugins>
@@ -27,7 +23,7 @@
                     </reportSet>
                 </reportSets>
                 <configuration>
-                    <reportVersion>2.13.9</reportVersion>
+                    <reportVersion>2.30.0</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/bulk-sample/pom.xml → src/it/allure-2-results/pom.xml b/src/it/bulk-sample/pom.xml → src/it/allure-2-results/pom.xml
@@ -8,30 +8,16 @@
     <version>1.0-SNAPSHOT</version>
     <name>Allure Report Test</name>
 
-    <properties>
-        <allure.version>1.4.16</allure.version>
-    </properties>
-
     <reporting>
         <excludeDefaults>true</excludeDefaults>
         <plugins>
             <plugin>
                 <groupId>@project.groupId@</groupId>
                 <artifactId>@project.artifactId@</artifactId>
                 <version>@project.version@</version>
-                <reportSets>
-                    <reportSet>
-                        <id>bulk</id>
-                        <inherited>false</inherited>
-                        <reports>
-                            <report>bulk</report>
-                        </reports>
-                        <configuration>
-                            <inputDirectories>first/,second/</inputDirectories>
-                            <reportVersion>2.13.9</reportVersion>
-                        </configuration>
-                    </reportSet>
-                </reportSets>
+                <configuration>
+                    <reportVersion>2.30.0</reportVersion>
+                </configuration>
             </plugin>
         </plugins>
     </reporting>

diff --git a/src/it/allure-2-results/target/allure-results/sample-testsuite.json b/src/it/allure-2-results/target/allure-results/sample-testsuite.json
@@ -0,0 +1,39 @@
+{
+  "name": "other.PassingTest",
+  "title": "Passing test",
+  "start": 1412949538848,
+  "stop": 1412949560045,
+  "version": "1.4.4-SNAPSHOT",
+  "testCases": [
+    {
+      "name": "testPassed",
+      "start": 1412949529363,
+      "stop": 1412949549730,
+      "status": "PASSED",
+      "labels": [
+        {
+          "name": "issue",
+          "value": "JIRA-15"
+        },
+        {
+          "name": "testId",
+          "value": "TMS-1"
+        },
+        {
+          "name": "story",
+          "value": "OtherStory"
+        }
+      ]
+    }
+  ],
+  "labels": [
+    {
+      "name": "story",
+      "value": "SuccessStory"
+    },
+    {
+      "name": "story",
+      "value": "OtherStory"
+    }
+  ]
+}
diff --git a/src/it/allure-2-results/verify.groovy b/src/it/allure-2-results/verify.groovy
@@ -0,0 +1,6 @@
+import java.nio.file.Paths
+
+import static io.qameta.allure.maven.TestHelper.checkReportDirectory
+
+def outputDirectory = Paths.get(basedir.absolutePath, 'target', 'site', 'allure-maven-plugin')
+checkReportDirectory(outputDirectory, 1)
diff --git a/src/it/categories-file-support-test-classpath/pom.xml b/src/it/categories-file-support-test-classpath/pom.xml
@@ -8,9 +8,6 @@
     <version>1.0-SNAPSHOT</version>
     <name>Allure Report Test</name>
 
-    <properties>
-        <allure.version>1.4.19</allure.version>
-    </properties>
 
     <reporting>
         <excludeDefaults>true</excludeDefaults>
@@ -20,8 +17,7 @@
                 <artifactId>@project.artifactId@</artifactId>
                 <version>@project.version@</version>
                 <configuration>
-                    <propertiesFilePath>allure.properties</propertiesFilePath>
-                    <reportVersion>2.13.9</reportVersion>
+                    <reportVersion>2.30.0</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/custom-url-report/pom.xml b/src/it/custom-url-report/pom.xml
@@ -8,30 +8,6 @@
     <version>1.0-SNAPSHOT</version>
     <name>Allure Report Test</name>
 
-    <properties>
-        <allure.version>1.4.19</allure.version>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>@project.groupId@</groupId>
-                <artifactId>@project.artifactId@</artifactId>
-                <version>@project.version@</version>
-                <executions>
-                    <execution>
-                        <phase>site</phase>
-                        <goals><goal>report</goal></goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <reportVersion>2.15.0</reportVersion>
-                    <allureDownloadUrl>https://github.com/allure-framework/allure2/releases/download/2.15.0/allure-2.15.0.zip</allureDownloadUrl>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <reporting>
         <excludeDefaults>true</excludeDefaults>
         <plugins>
@@ -40,7 +16,8 @@
                 <artifactId>@project.artifactId@</artifactId>
                 <version>@project.version@</version>
                 <configuration>
-                    <reportVersion>2.13.9</reportVersion>
+                    <reportVersion>2.30.0</reportVersion>
+                    <allureDownloadUrl>https://github.com/allure-framework/allure2/releases/download/2.30.0/allure-2.30.0.zip</allureDownloadUrl>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/feature-plugins-support/pom.xml b/src/it/feature-plugins-support/pom.xml
@@ -9,10 +9,6 @@
     <version>1.0-SNAPSHOT</version>
     <name>Allure Report Test</name>
 
-    <properties>
-        <allure.version>1.4.19</allure.version>
-    </properties>
-
     <reporting>
         <plugins>
             <plugin>
@@ -27,7 +23,7 @@
                             <version>${allure.version}</version>
                         </plugin>
                     </plugins>
-                    <reportVersion>2.13.9</reportVersion>
+                    <reportVersion>2.30.0</reportVersion>
                 </configuration>
             </plugin>
             <plugin>