Update applicationinsights from 1.0.9 -> 2.0.1 (#3806)

* Update applicationinsights from 1.0.9 -> 2.0.1 * Fix wrong dependency to StringUtils Co-authored-by: @Siedlerchr
JabRef · Mar 5, 2018 · 6a2e03f · 6a2e03f
1 parent f7d9678
commit 6a2e03f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 27 deletions.
diff --git a/build.gradle b/build.gradle
@@ -151,8 +151,8 @@ dependencies {
 
     compile 'com.github.tomtung:latex2unicode_2.12:0.2.2'
 
-    compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '1.0.9'
-    compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '1.0.9'
+    compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.0.1'
+    compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.0.1'
 
     testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.1.0'
@@ -190,26 +190,6 @@ dependencyUpdates.resolutionStrategy = {
                 selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9")
             }
         }
-        withModule("com.microsoft.azure:applicationinsights-core") { ComponentSelection selection ->
-            if (selection.candidate.version.equals("1.0.10")) {
-                selection.reject("Version 1.0.10 is broken... waiting for 1.0.11")
-            }
-        }
-        withModule("com.microsoft.azure:applicationinsights-logging-log4j2") { ComponentSelection selection ->
-            if (selection.candidate.version.equals("1.0.10")) {
-                selection.reject("Version 1.0.10 is broken... waiting for 1.0.11")
-            }
-        }
-        withModule("com.microsoft.azure:applicationinsights-core") { ComponentSelection selection ->
-            if (selection.candidate.version.equals("2.0.0-BETA")) {
-                selection.reject("Version 2.0.0-BETA is broken... waiting for a working version... see #3561")
-            }
-        }
-        withModule("com.microsoft.azure:applicationinsights-logging-log4j2") { ComponentSelection selection ->
-            if (selection.candidate.version.equals("2.0.0-BETA")) {
-                selection.reject("Version 2.0.0-BETA is broken... waiting for a working version... see #3561")
-            }
-        }
         withModule("de.jensd:fontawesomefx-materialdesignfont") { ComponentSelection selection ->
             if (selection.candidate.version ==~ /2.*/) {
                 selection.reject("Cannot be upgraded to version 2")

diff --git a/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java b/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
@@ -17,7 +17,6 @@
 import org.jabref.model.entry.Month;
 import org.jabref.model.strings.StringUtil;
 
-import com.microsoft.applicationinsights.agent.internal.common.StringUtils;
 import org.apache.xmpbox.DateConverter;
 import org.apache.xmpbox.schema.DublinCoreSchema;
 
@@ -108,7 +107,7 @@ private void extractAbstract() {
      */
     private void extractDOI() {
         String identifier = dcSchema.getIdentifier();
-        if (!StringUtils.isNullOrEmpty(identifier)) {
+        if (!StringUtil.isNullOrEmpty(identifier)) {
             bibEntry.setField(FieldName.DOI, identifier);
         }
     }
@@ -157,7 +156,7 @@ private void extractBibTexFields() {
      */
     private void extractRights() {
         String rights = dcSchema.getRights();
-        if (!StringUtils.isNullOrEmpty(rights)) {
+        if (!StringUtil.isNullOrEmpty(rights)) {
             bibEntry.setField("rights", rights);
         }
     }
@@ -170,7 +169,7 @@ private void extractRights() {
      */
     private void extractSource() {
         String source = dcSchema.getSource();
-        if (!StringUtils.isNullOrEmpty(source)) {
+        if (!StringUtil.isNullOrEmpty(source)) {
             bibEntry.setField("source", source);
         }
     }
@@ -210,7 +209,7 @@ private void extractType() {
         List<String> types = dcSchema.getTypes();
         if ((types != null) && !types.isEmpty()) {
             String type = types.get(0);
-            if (!StringUtils.isNullOrEmpty(type)) {
+            if (!StringUtil.isNullOrEmpty(type)) {
                 bibEntry.setType(type);
             }
         }