From 67a0595ce4d11386a5a4186d5e269f4c7bb951a3 Mon Sep 17 00:00:00 2001 From: jonathan Date: Tue, 25 Oct 2016 16:24:01 -0700 Subject: [PATCH 1/4] fix Java8 dependency, now compiles under Java7 --- .../java/org/piwik/java/tracking/CustomVariableList.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/piwik/java/tracking/CustomVariableList.java b/src/main/java/org/piwik/java/tracking/CustomVariableList.java index 87a7e619..260e3663 100644 --- a/src/main/java/org/piwik/java/tracking/CustomVariableList.java +++ b/src/main/java/org/piwik/java/tracking/CustomVariableList.java @@ -6,20 +6,19 @@ */ package org.piwik.java.tracking; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; import javax.json.Json; import javax.json.JsonArrayBuilder; import javax.json.JsonObjectBuilder; +import java.util.Iterator; +import java.util.Map.Entry; +import java.util.concurrent.ConcurrentHashMap; /** * * @author brettcsorba */ class CustomVariableList{ - private final Map map = new HashMap<>(); + private final ConcurrentHashMap map = new ConcurrentHashMap<>(); void add(CustomVariable cv){ boolean found = false; From f4fbe51bce67cda6d5109a2e1195b5ba109c6d18 Mon Sep 17 00:00:00 2001 From: jonathan Date: Wed, 26 Oct 2016 11:26:05 -0700 Subject: [PATCH 2/4] ignore intellij project files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1221a76d..d5ed9d39 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ info # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +*.iml From b62733601910ec1f97f0c113443abf97fe318004 Mon Sep 17 00:00:00 2001 From: jonathan Date: Wed, 26 Oct 2016 11:27:38 -0700 Subject: [PATCH 3/4] add comment to gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index d5ed9d39..6d04dcba 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,6 @@ info # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* + +# IntelliJ project files *.iml From a77c4c3972e7a6e2f214393db51b308f1f6dc6ad Mon Sep 17 00:00:00 2001 From: jonathan Date: Mon, 14 Nov 2016 18:34:52 -0800 Subject: [PATCH 4/4] disable jar signing for now --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index ec4a1136..bc5d0420 100644 --- a/pom.xml +++ b/pom.xml @@ -113,6 +113,7 @@ + org.sonatype.plugins nexus-staging-maven-plugin