Update dependencies (fix ncdf) (via #104)

Author: Artem Eroshenko

allure-teamcity-agent/build.gradle

@@ -17,7 +17,8 @@ agentPlugin {
 dependencies {
     compile project(':allure-teamcity-common')
 
-    compile 'net.sf.json-lib:json-lib:2.4:jdk15'
+    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'

allure-teamcity-agent/src/main/java/io/qameta/allure/teamcity/AllureBuildServiceAdapter.java

@@ -11,7 +11,7 @@
 import jetbrains.buildServer.agent.runner.SimpleProgramCommandLine;
 import jetbrains.buildServer.runner.JavaRunnerConstants;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;

allure-teamcity-agent/src/main/java/io/qameta/allure/teamcity/callables/AbstractAddInfo.java

@@ -1,6 +1,6 @@
 package io.qameta.allure.teamcity.callables;
 
-import net.sf.json.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -17,9 +17,8 @@ public Path invoke(Path outputDirectory) throws IOException {
         Files.createDirectories(outputDirectory);
         Path testRun = outputDirectory.resolve(getFileName());
         try (Writer writer = Files.newBufferedWriter(testRun, StandardCharsets.UTF_8)) {
-            JSONObject.fromObject(getData())
-                    .write(writer)
-                    .flush();
+            final ObjectMapper mapper = new ObjectMapper();
+            mapper.writeValue(writer, getData());
         }
         return testRun;
     }

allure-teamcity-common/build.gradle

@@ -1,3 +1,4 @@
+apply plugin: "java-library"
 apply plugin: "com.github.rodm.teamcity-common"
 
 teamcity {

allure-teamcity-server/build.gradle

@@ -25,16 +25,18 @@ serverPlugin {
     version = null //teamcity plugin file name should be without version suffix
 }
 
-configurations.archives.artifacts.removeAll { it.archiveTask.is jar }
+//configurations.archives.artifacts.removeAll { it.archiveTask.is jar }
 
 dependencies {
     def teamcityFullDir = "$teamcityDir/TeamCity-2017.1.5"
     agent project(path: ':allure-teamcity-agent', configuration: 'plugin')
 
     compile project(':allure-teamcity-common')
 
-    provided 'javax.servlet:jstl:1.1.2'
+    compile 'commons-io:commons-io:2.7'
     compile 'org.apache.commons:commons-lang3:3.4'
+
+    provided 'javax.servlet:jstl:1.1.2'
     provided "org.jetbrains.teamcity.internal:server:$teamcityVersion"
     provided files("${teamcityFullDir}/webapps/ROOT/WEB-INF/lib/server-tools.jar")
     provided files("${teamcityFullDir}/webapps/ROOT/WEB-INF/lib/common-tools.jar")

build.gradle

@@ -31,9 +31,10 @@ configure(rootProject) {
     task build() {
     }
 
-    task wrapper(type: Wrapper) {
-        gradleVersion = '4.0.1'
-    }
+}
+
+tasks.withType(Wrapper.class) {
+    gradleVersion = '6.4'
 }
 
 allprojects {

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Wed Jul 19 14:59:39 MSK 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-bin.zip