download new versions from maven central (via #67)

allure-framework · Dec 19, 2018 · e294821 · e294821
1 parent cf22510
commit e294821
Show file tree

Hide file tree

Showing 32 changed files with 221 additions and 43 deletions.
diff --git a/src/it/aggregate-multi-module-exclude-report/pom.xml b/src/it/aggregate-multi-module-exclude-report/pom.xml
@@ -39,7 +39,7 @@
                     </reportSet>
                 </reportSets>
                 <configuration>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/aggregate-multi-module/pom.xml b/src/it/aggregate-multi-module/pom.xml
@@ -35,7 +35,7 @@
                     </reportSet>
                 </reportSets>
                 <configuration>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/aggregate-sample/pom.xml b/src/it/aggregate-sample/pom.xml
@@ -27,7 +27,7 @@
                     </reportSet>
                 </reportSets>
                 <configuration>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/bulk-sample/pom.xml b/src/it/bulk-sample/pom.xml
@@ -28,7 +28,7 @@
                         </reports>
                         <configuration>
                             <inputDirectories>first/,second/</inputDirectories>
-                            <reportVersion>2.0.1</reportVersion>
+                            <reportVersion>2.8.1</reportVersion>
                         </configuration>
                     </reportSet>
                 </reportSets>

diff --git a/src/it/categories-file-support-test-classpath/pom.xml b/src/it/categories-file-support-test-classpath/pom.xml
@@ -21,7 +21,7 @@
                 <version>@project.version@</version>
                 <configuration>
                     <propertiesFilePath>allure.properties</propertiesFilePath>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/categories-file-support-test-classpath/verify.groovy b/src/it/categories-file-support-test-classpath/verify.groovy
@@ -14,5 +14,4 @@ def cateforiesPath = dataDirectory.resolve("categories.json")
 def jsonSlurper = new JsonSlurper()
 def categories = jsonSlurper.parseText(cateforiesPath.text)
 
-assert categories.statistic
-assert categories.statistic.failed == 1
+assert categories.children.size == 1
diff --git a/src/it/custom-url-report/pom.xml b/src/it/custom-url-report/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>io.qameta.allure-maven.it</groupId>
+    <artifactId>allure-maven-it</artifactId>
+    <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.8.0</reportVersion>
+                    <allureDownloadUrl>https://dl.bintray.com/qama/maven/io/qameta/allure/allure-commandline/2.8.0/allure-commandline-2.8.0.zip</allureDownloadUrl>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <reporting>
+        <excludeDefaults>true</excludeDefaults>
+        <plugins>
+            <plugin>
+                <groupId>@project.groupId@</groupId>
+                <artifactId>@project.artifactId@</artifactId>
+                <version>@project.version@</version>
+                <configuration>
+                    <reportVersion>2.8.1</reportVersion>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+
+</project>
diff --git a/src/it/custom-url-report/target/allure-results/sample-testsuite.xml b/src/it/custom-url-report/target/allure-results/sample-testsuite.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:test-suite xmlns:ns2="urn:model.allure.qatools.yandex.ru" start="1412949538848" stop="1412949560045"
+                version="1.4.4-SNAPSHOT">
+    <name>my.company.Sample</name>
+    <test-cases>
+        <test-case start="1412949539363" stop="1412949539730" status="passed">
+            <name>sampleTestCase</name>
+        </test-case>
+    </test-cases>
+</ns2:test-suite>
diff --git a/src/it/custom-url-report/verify.groovy b/src/it/custom-url-report/verify.groovy
@@ -0,0 +1,7 @@
+import java.nio.file.Paths
+
+import static io.qameta.allure.maven.TestHelper.checkReportDirectory
+
+def base = Paths.get(basedir.absolutePath, 'target', 'site')
+
+checkReportDirectory(base.resolve('allure-maven-plugin'), 1)
diff --git a/src/it/feature-plugins-support/pom.xml b/src/it/feature-plugins-support/pom.xml
@@ -27,7 +27,7 @@
                             <version>${allure.version}</version>
                         </plugin>
                     </plugins>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/src/it/feature-should-fail-if-empty-report/pom.xml b/src/it/feature-should-fail-if-empty-report/pom.xml
@@ -20,7 +20,7 @@
                 <artifactId>@project.artifactId@</artifactId>
                 <version>@project.version@</version>
                 <configuration>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/src/it/feature-without-version-property/pom.xml b/src/it/feature-without-version-property/pom.xml
@@ -16,7 +16,7 @@
                 <artifactId>@project.artifactId@</artifactId>
                 <version>@project.version@</version>
                 <configuration>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/src/it/old-report-version-plugin/pom.xml b/src/it/old-report-version-plugin/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>io.qameta.allure-maven.it</groupId>
+    <artifactId>allure-maven-it</artifactId>
+    <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>
+                    <reportDirectory>${project.build.directory}/site/allure</reportDirectory>
+                    <reportVersion>2.7.0</reportVersion>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <reporting>
+        <excludeDefaults>true</excludeDefaults>
+        <plugins>
+            <plugin>
+                <groupId>@project.groupId@</groupId>
+                <artifactId>@project.artifactId@</artifactId>
+                <version>@project.version@</version>
+                <configuration>
+                    <reportVersion>2.8.1</reportVersion>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+
+</project>
diff --git a/src/it/old-report-version-plugin/target/allure-results/sample-testsuite.xml b/src/it/old-report-version-plugin/target/allure-results/sample-testsuite.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:test-suite xmlns:ns2="urn:model.allure.qatools.yandex.ru" start="1412949538848" stop="1412949560045"
+                version="1.4.4-SNAPSHOT">
+    <name>my.company.Sample</name>
+    <test-cases>
+        <test-case start="1412949539363" stop="1412949539730" status="passed">
+            <name>sampleTestCase</name>
+        </test-case>
+    </test-cases>
+</ns2:test-suite>
diff --git a/src/it/old-report-version-plugin/verify.groovy b/src/it/old-report-version-plugin/verify.groovy
@@ -0,0 +1,8 @@
+import java.nio.file.Paths
+
+import static io.qameta.allure.maven.TestHelper.checkReportDirectory
+
+def base = Paths.get(basedir.absolutePath, 'target', 'site')
+
+checkReportDirectory(base.resolve('allure'), 1)
+checkReportDirectory(base.resolve('allure-maven-plugin'), 1)
diff --git a/src/it/properties-file-support-compile-classpath/pom.xml b/src/it/properties-file-support-compile-classpath/pom.xml
@@ -20,7 +20,7 @@
                 <artifactId>@project.artifactId@</artifactId>
                 <version>@project.version@</version>
                 <configuration>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                     <propertiesFilePath>allure.properties</propertiesFilePath>
                 </configuration>
             </plugin>

diff --git a/src/it/properties-file-support-configuration/pom.xml b/src/it/properties-file-support-configuration/pom.xml
@@ -23,7 +23,7 @@
                     <properties>
                         <allure.issues.tracker.pattern>http://example.com/%s</allure.issues.tracker.pattern>
                     </properties>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/properties-file-support-default-location/pom.xml b/src/it/properties-file-support-default-location/pom.xml
@@ -20,7 +20,7 @@
                 <artifactId>@project.artifactId@</artifactId>
                 <version>@project.version@</version>
                 <configuration>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/properties-file-support-placeholder/pom.xml b/src/it/properties-file-support-placeholder/pom.xml
@@ -22,7 +22,7 @@
                 <version>@project.version@</version>
                 <configuration>
                     <propertiesFilePath>allure.properties</propertiesFilePath>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/properties-file-support-test-classpath/pom.xml b/src/it/properties-file-support-test-classpath/pom.xml
@@ -21,7 +21,7 @@
                 <version>@project.version@</version>
                 <configuration>
                     <propertiesFilePath>allure.properties</propertiesFilePath>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/properties-file-support/pom.xml b/src/it/properties-file-support/pom.xml
@@ -21,7 +21,7 @@
                 <version>@project.version@</version>
                 <configuration>
                     <propertiesFilePath>allure.properties</propertiesFilePath>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/report-as-build-plugin/pom.xml b/src/it/report-as-build-plugin/pom.xml
@@ -26,7 +26,7 @@
                 </executions>
                 <configuration>
                     <reportDirectory>${project.build.directory}/site/allure</reportDirectory>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
         </plugins>
@@ -40,7 +40,7 @@
                 <artifactId>@project.artifactId@</artifactId>
                 <version>@project.version@</version>
                 <configuration>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/report-change-report-directory/pom.xml b/src/it/report-change-report-directory/pom.xml
@@ -21,7 +21,7 @@
                 <version>@project.version@</version>
                 <configuration>
                     <reportDirectory>${project.build.directory}/allure</reportDirectory>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/report-change-results-directory/pom.xml b/src/it/report-change-results-directory/pom.xml
@@ -21,7 +21,7 @@
                 <version>@project.version@</version>
                 <configuration>
                     <resultsDirectory>my-results</resultsDirectory>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/report-multi-module/pom.xml b/src/it/report-multi-module/pom.xml
@@ -26,7 +26,7 @@
                 <artifactId>@project.artifactId@</artifactId>
                 <version>@project.version@</version>
                 <configuration>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/it/report-with-bundled-version/pom.xml b/src/it/report-with-bundled-version/pom.xml
@@ -26,7 +26,7 @@
                 </executions>
                 <configuration>
                     <reportDirectory>${project.build.directory}/site/allure</reportDirectory>
-                    <reportVersion>2.0.1</reportVersion>
+                    <reportVersion>2.8.1</reportVersion>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/main/java/io/qameta/allure/maven/AllureCommandline.java b/src/main/java/io/qameta/allure/maven/AllureCommandline.java
@@ -21,7 +21,7 @@
 
 public class AllureCommandline {
 
-    public static final String ALLURE_DEFAULT_VERSION = "2.7.0";
+    public static final String ALLURE_DEFAULT_VERSION = "2.8.1";
 
     private static final int DEFAULT_TIMEOUT = 3600;
 
@@ -130,7 +130,7 @@ public void download(String allureDownloadUrl, Proxy mavenProxy) throws IOExcept
             url = new URL(allureUrl);
         } else {
             allureZip = Files.createTempFile("allure", ALLURE_DEFAULT_VERSION);
-            allureUrl = String.format("/allure-%s.zip", ALLURE_DEFAULT_VERSION);
+            allureUrl = String.format("/allure-commandline-%s.zip", ALLURE_DEFAULT_VERSION);
             url = AllureCommandline.class.getResource(allureUrl);
         }
 

diff --git a/src/main/java/io/qameta/allure/maven/AllureGenerateMojo.java b/src/main/java/io/qameta/allure/maven/AllureGenerateMojo.java
@@ -25,6 +25,7 @@
 import java.util.*;
 
 import static io.qameta.allure.maven.AllureCommandline.ALLURE_DEFAULT_VERSION;
+import static io.qameta.allure.maven.DownloadUtils.getAllureDownloadUrl;
 import static java.lang.String.format;
 
 /**
@@ -97,8 +98,7 @@ public abstract class AllureGenerateMojo extends AllureBaseMojo {
     @Parameter(property = "allure.install.directory", defaultValue = "${project.basedir}/.allure")
     private String installDirectory;
 
-    @Parameter(property = "allure.download.url",
-            defaultValue = "https://dl.bintray.com/qameta/generic/io/qameta/allure/allure/%s/allure-%s.zip")
+    @Parameter(property = "allure.download.url")
     private String allureDownloadUrl;
 
     @Parameter(property = "session", defaultValue = "${session}", readonly = true)
@@ -198,14 +198,15 @@ private void loadProperties(List<Path> inputDirectories) throws IOException, Dep
 
     private void installAllure() throws MavenReportException{
         try {
-            getLog().info(String.format("Allure installation directory %s", getInstallDirectory()));
-            getLog().info(String.format("Try to finding out allure %s", reportVersion != null ? reportVersion : ALLURE_DEFAULT_VERSION));
+            final String version = reportVersion != null ? reportVersion : ALLURE_DEFAULT_VERSION;
+            getLog().info(String.format("Allure installation directory %s", installDirectory));
+            getLog().info(String.format("Try to finding out allure %s", version));
 
-            AllureCommandline commandline
-                    = new AllureCommandline(Paths.get(getInstallDirectory()), reportVersion);
+            AllureCommandline commandline = new AllureCommandline(Paths.get(installDirectory), reportVersion);
             if (commandline.allureNotExists()) {
+                final String url = getAllureDownloadUrl(version, allureDownloadUrl);
                 getLog().info("Downloading allure commandline...");
-                commandline.download(allureDownloadUrl, ProxyUtils.getProxy(session, decrypter));
+                commandline.download(url, ProxyUtils.getProxy(session, decrypter));
                 getLog().info("Downloading allure commandline complete");
             }
         } catch (Exception e) {