Release files update

.github/release-drafter.yml

@@ -2,11 +2,20 @@ name-template: '$NEXT_MINOR_VERSION'
 tag-template: '$NEXT_MINOR_VERSION'
 categories:
   - title: '🚀 New Features'
-    label: 'type:new feature'
+    labels:
+      - 'type:new feature'
   - title: '🔬 Improvements'
-    label: 'type:enhancement'
+    labels:
+      - 'type:improvement'
   - title: '🐞 Bug Fixes'
-    label: 'type:bug'
+    labels:
+      - 'type:bug'
+  - title: '⬆️ Dependency Updates'
+    labels:
+      - 'type:dependencies'
+  - title: '👻 Internal changes'
+    labels:
+      - 'type:internal'
 
 change-template: '* $TITLE (via #$NUMBER) - @$AUTHOR'
 template: |

.github/workflows/release-draft.yml

@@ -3,7 +3,7 @@ name: Release Draft
 on:
   push:
     branches:
-    - master
+      - 'master'
 
 jobs:
   update_draft_release:

.github/workflows/release-publish.yml

@@ -15,12 +15,7 @@ jobs:
           java-version: 1.8
       - name: "Gradle Build"
         run: ./gradlew installTeamcity2017 build -Pversion=${GITHUB_REF:10}
-      - name: "Upload binaries"
-        uses: actions/upload-release-asset@v1.0.1
+      - name: "Gradle Publish to Jetbrains"
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: allure-teamcity-server/build/distributions/allure-teamcity.zip
-          asset_name: allure-teamcity.zip
-          asset_content_type: application/octet-stream
+          JETBRAINS_TOKEN: ${{ secrets.JETBRAINS_TOKEN }}
+        run: ./gradlew :allure-ee-teamcity-server:publishPlugin -Pversion=${GITHUB_REF:10}

allure-teamcity-agent/build.gradle

@@ -2,9 +2,11 @@ apply plugin: "com.github.rodm.teamcity-agent"
 
 teamcity {
     version = teamcityVersion
-    descriptor {
-        pluginDeployment {
-            useSeparateClassloader = true
+    agent {
+        descriptor {
+            pluginDeployment {
+                useSeparateClassloader = true
+            }
         }
     }
 }
@@ -17,14 +19,15 @@ agentPlugin {
 dependencies {
     compile project(':allure-teamcity-common')
 
-    compile 'commons-io:commons-io:2.7'
-    compile 'org.apache.commons:commons-lang3:3.4'
-    compile 'commons-logging:commons-logging:1.1.3'
-    compile 'commons-httpclient:commons-httpclient:3.1'
-    compile 'org.apache.commons:commons-compress:1.16.1'
+    compile 'commons-httpclient:commons-httpclient'
+    compile 'commons-logging:commons-logging'
 
-    provided 'com.intellij:openapi:7.0.3'
-    provided "org.jetbrains.teamcity:agent-api:${teamcityVersion}"
-    provided "org.jetbrains.teamcity.internal:agent:${teamcityVersion}"
+    compile 'org.apache.commons:commons-compress'
+    compile 'org.apache.commons:commons-io'
+    compile 'org.apache.commons:commons-lang3'
+
+    provided 'com.intellij:openapi'
+    provided "org.jetbrains.teamcity:agent-api"
+    provided "org.jetbrains.teamcity.internal:agent"
 
 }

allure-teamcity-common/build.gradle

@@ -6,5 +6,5 @@ teamcity {
 }
 
 dependencies {
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.7.2'
+    compile 'com.fasterxml.jackson.core:jackson-databind'
 }

allure-teamcity-common/src/main/java/io/qameta/allure/teamcity/AllureConstants.java

@@ -53,8 +53,8 @@ public final class AllureConstants {
      */
     static final String ALLURE_ARTIFACT_SUMMARY_LOCATION = ALLURE_ARTIFACT_META_LOCATION + "summary.json";
 
-    private static final String ALLURE_COMMANDLINE_MAVEN_URL = "http://central.maven.org/" +
-            "maven2/io/qameta/allure/allure-commandline/";
+    private static final String ALLURE_COMMANDLINE_MAVEN_URL = "https://repo.maven.apache.org/maven2/"
+            + "io/qameta/allure/allure-commandline/";
 
     static final String ALLURE_COMMANDLINE_MAVEN_METADATA_URL = ALLURE_COMMANDLINE_MAVEN_URL + "maven-metadata.xml";
     static final String ALLURE_COMMANDLINE_MAVEN_FILENAME = "allure-commandline-%1$s.zip";

allure-teamcity-server/build.gradle

@@ -1,12 +1,25 @@
 apply plugin: "com.github.rodm.teamcity-server"
-
-apply from: "${gradleScriptDir}/bintray.gradle"
+apply plugin: "com.github.rodm.teamcity-environments"
 
 teamcity {
     version = teamcityVersion
     server {
-        descriptor = project.file('teamcity-plugin.xml')
-        tokens = [Version: project.version]
+        descriptor {
+            name = project.parent.name
+            displayName = 'Allure for TeamCity'
+            version = project.version
+
+            description = 'Plugin adds support for generate Allure report based on tests results'
+
+            vendorName = 'qameta'
+            vendorUrl = 'https://qameta.io'
+            email = 'team@qameta.io'
+
+            useSeparateClassloader = true
+        }
+        publish {
+            token = System.getenv("JETBRAINS_TOKEN")
+        }
     }
 
     environments {
@@ -28,16 +41,17 @@ serverPlugin {
 //configurations.archives.artifacts.removeAll { it.archiveTask.is jar }
 
 dependencies {
-    def teamcityFullDir = "$teamcityDir/TeamCity-2017.1.5"
-    agent project(path: ':allure-teamcity-agent', configuration: 'plugin')
 
+    agent project(path: ':allure-teamcity-agent', configuration: 'plugin')
     compile project(':allure-teamcity-common')
 
-    compile 'commons-io:commons-io:2.7'
-    compile 'org.apache.commons:commons-lang3:3.4'
+    compile 'org.apache.commons:commons-io'
+    compile 'org.apache.commons:commons-lang3'
 
-    provided 'javax.servlet:jstl:1.1.2'
-    provided "org.jetbrains.teamcity.internal:server:$teamcityVersion"
+    provided 'javax.servlet:jstl'
+    provided 'org.jetbrains.teamcity.internal:server'
+
+    def teamcityFullDir = "$teamcityDir/TeamCity-2017.1.5"
     provided files("${teamcityFullDir}/webapps/ROOT/WEB-INF/lib/server-tools.jar")
     provided files("${teamcityFullDir}/webapps/ROOT/WEB-INF/lib/common-tools.jar")
 }

build.gradle

@@ -1,60 +1,91 @@
 buildscript {
     repositories {
-        maven {
-            url 'https://plugins.gradle.org/m2/'
-        }
+        maven { url 'https://plugins.gradle.org/m2/' }
     }
     dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-        classpath 'com.github.rodm:gradle-teamcity-plugin:1.0'
-        classpath 'net.researchgate:gradle-release:2.6.0'
+        classpath 'io.spring.gradle:dependency-management-plugin:1.0.4.RELEASE'
+        classpath 'com.github.rodm:gradle-teamcity-plugin:1.2.2'
+        classpath 'net.researchgate:gradle-release:2.7.0'
     }
 }
 
 ext {
     teamcityVersion = '2017.1'
-    gradleScriptDir = "${rootProject.projectDir}/gradle"
     teamcityDir = "${rootProject.projectDir}/.teamcity"
     serverOpts = "-DTC.res.disableAll=true " +
             "-Dteamcity.development.mode=true " +
             "-Dteamcity.development.shadowCopyClasses=true " +
             "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=50055"
+
+    gradleScriptDir = "${rootProject.projectDir}/gradle"
 }
 
-apply from: "${gradleScriptDir}/bintray.gradle"
-apply from: "${gradleScriptDir}/release.gradle"
+group = 'io.qameta.allure'
+version = version
+description = 'Allure for TeamCity'
 
 configure(rootProject) {
 
-    description = "Allure for TeamCity"
+    apply from: "${gradleScriptDir}/release.gradle"
 
     task build() {
     }
 
+    afterReleaseBuild.dependsOn(":allure-ee-teamcity-server:publishPlugin")
 }
 
 tasks.withType(Wrapper.class) {
     gradleVersion = '6.4'
 }
 
-allprojects {
-    group = 'io.qameta.allure'
-    version = version
-}
-
-subprojects {
-    apply plugin: "java"
+configure(subprojects) {
+    apply plugin: 'java'
+    apply plugin: 'io.spring.dependency-management'
 
-    repositories {
-        jcenter()
-        mavenCentral()
-        maven { url = "https://download.jetbrains.com/teamcity-repository" }
+    compileJava {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+        options.encoding = 'UTF-8'
     }
 
-    compileJava {
+    compileTestJava {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
         options.encoding = 'UTF-8'
+        options.compilerArgs += '-parameters'
     }
 
+    dependencyManagement {
+        dependencies {
+
+            dependency 'javax.servlet:jstl:1.1.2'
+            dependency 'org.zeroturnaround:zt-zip:1.12'
+
+            dependency 'org.apache.commons:commons-compress:1.16.1'
+            dependency 'org.apache.commons:commons-lang3:3.4'
+            dependency 'org.apache.commons:commons-io:1.3.2'
+            dependency 'org.apache.maven:maven-artifact:3.6.3'
+            dependency 'commons-logging:commons-logging:1.1.3'
+            dependency 'commons-httpclient:commons-httpclient:3.1'
+
+            dependency 'com.intellij:openapi:7.0.3'
+            dependency "org.jetbrains.teamcity:agent-api:$teamcityVersion"
+            dependency "org.jetbrains.teamcity.internal:agent:$teamcityVersion"
+            dependency "org.jetbrains.teamcity.internal:server:$teamcityVersion"
+
+            dependency 'com.fasterxml.jackson.core:jackson-databind:2.7.2'
+        }
+    }
+
+    repositories {
+        mavenLocal()
+        jcenter()
+        maven { url 'https://download.jetbrains.com/teamcity-repository' }
+    }
+}
+
+configurations.all {
+    resolutionStrategy {
+        force 'xml-apis:xml-apis:1.4.01'
+    }
 }

gradle/release.gradle

@@ -3,5 +3,3 @@ apply plugin: 'net.researchgate.release'
 release {
     tagTemplate = '${version}'
 }
-
-afterReleaseBuild.dependsOn bintrayUpload