Merge branch 'develop' into feature/improveTestQuality

intuit · Nov 3, 2016 · e63c5ea · e63c5ea
2 parents 7c40d45 + 6e37eef
commit e63c5ea
Show file tree

Hide file tree

Showing 121 changed files with 2,788 additions and 2,113 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 *~
 target
 *.log
+*.log.zip
 *.idea
 *.iml
 *.ipr

diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ branches:
     - develop
     - master
 after_success:
-  - mvn clean test jacoco:report cobertura:cobertura coveralls:report
+  - mvn clean test jacoco:report coveralls:report
   - "./.travis/before-deploy.sh"
   - "./.travis/deploy.sh"
 env:

diff --git a/.travis/before-deploy.sh b/.travis/before-deploy.sh
@@ -6,4 +6,4 @@ if [ "$TRAVIS_BRANCH" == 'develop' ] || [ "$TRAVIS_BRANCH" == 'master' ]; then
       -in .travis/codesigning.asc.enc -out .travis/codesigning.asc -d
     gpg --fast-import .travis/codesigning.asc
   fi
-fi
+fi
diff --git a/.travis/deploy.sh b/.travis/deploy.sh
@@ -4,4 +4,4 @@ if [ "$TRAVIS_BRANCH" == 'develop' ] || [ "$TRAVIS_BRANCH" == 'master' ]; then
   if [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then
     mvn deploy -DskipTests=true -P sign --settings .travis/settings.xml
   fi
-fi
+fi
diff --git a/ATTRIBUTIONS/wasabi-analytics-attribution.xml b/ATTRIBUTIONS/wasabi-analytics-attribution.xml
@@ -1158,7 +1158,7 @@
          <type>jar</type>
          <licenses/>
          <downloadUrls>
-            <string>TBD</string>
+            <string>file:/Users/iizrailevsky/Git/wasabi/modules/analytics/../../repository/Hyrule/Hyrule/0.0.1/Hyrule-0.0.1.jar</string>
          </downloadUrls>
       </dependency>
       <dependency>
@@ -1229,23 +1229,6 @@
             <string>https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.7.2/jackson-databind-2.7.2.jar</string>
          </downloadUrls>
       </dependency>
-      <dependency>
-         <name>JaCoCo :: Agent</name>
-         <groupId>org.jacoco</groupId>
-         <artifactId>org.jacoco.agent</artifactId>
-         <version>0.7.2.201409121644</version>
-         <projectUrl>http://org.jacoco.agent</projectUrl>
-         <type>pom</type>
-         <licenses>
-            <license>
-               <name>Eclipse Public License v1.0</name>
-               <url>http://www.eclipse.org/legal/epl-v10.html</url>
-            </license>
-         </licenses>
-         <downloadUrls>
-            <string>https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.agent/0.7.2.201409121644/org.jacoco.agent-0.7.2.201409121644.pom</string>
-         </downloadUrls>
-      </dependency>
       <dependency>
          <name>Java Agent for Memory Measurements</name>
          <groupId>com.github.stephenc</groupId>
@@ -2138,7 +2121,7 @@
          <name>wasabi-analytics-objects</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-analytics-objects</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-analytics-objects</projectUrl>
          <type>jar</type>
          <licenses>
@@ -2153,7 +2136,7 @@
          <name>wasabi-assignment-objects</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-assignment-objects</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-assignment-objects</projectUrl>
          <type>jar</type>
          <licenses>
@@ -2168,7 +2151,7 @@
          <name>wasabi-auditlog-objects</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-auditlog-objects</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-auditlog-objects</projectUrl>
          <type>jar</type>
          <licenses>
@@ -2183,7 +2166,7 @@
          <name>wasabi-authentication-objects</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-authentication-objects</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-authentication-objects</projectUrl>
          <type>jar</type>
          <licenses>
@@ -2198,7 +2181,7 @@
          <name>wasabi-authorization-objects</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-authorization-objects</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-authorization-objects</projectUrl>
          <type>jar</type>
          <licenses>
@@ -2213,7 +2196,7 @@
          <name>wasabi-cassandra</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-cassandra</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-cassandra</projectUrl>
          <type>jar</type>
          <licenses>
@@ -2228,7 +2211,7 @@
          <name>wasabi-database</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-database</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-database</projectUrl>
          <type>jar</type>
          <licenses>
@@ -2243,7 +2226,7 @@
          <name>wasabi-eventlog</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-eventlog</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-eventlog</projectUrl>
          <type>jar</type>
          <licenses>
@@ -2258,7 +2241,7 @@
          <name>wasabi-exceptions</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-exceptions</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-exceptions</projectUrl>
          <type>jar</type>
          <licenses>
@@ -2273,7 +2256,7 @@
          <name>wasabi-experiment</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-experiment</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-experiment</projectUrl>
          <type>jar</type>
          <licenses>
@@ -2288,7 +2271,7 @@
          <name>wasabi-experiment-objects</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-experiment-objects</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-experiment-objects</projectUrl>
          <type>jar</type>
          <licenses>
@@ -2303,7 +2286,7 @@
          <name>wasabi-export</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-export</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-export</projectUrl>
          <type>jar</type>
          <licenses>
@@ -2318,7 +2301,7 @@
          <name>wasabi-feedback-objects</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-feedback-objects</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-feedback-objects</projectUrl>
          <type>jar</type>
          <licenses>
@@ -2333,7 +2316,7 @@
          <name>wasabi-repository</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-repository</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-repository</projectUrl>
          <type>jar</type>
          <licenses>
@@ -2348,7 +2331,7 @@
          <name>wasabi-user-directory</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-user-directory</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-user-directory</projectUrl>
          <type>jar</type>
          <licenses>
@@ -2363,7 +2346,7 @@
          <name>wasabi-util</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-util</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-util</projectUrl>
          <type>jar</type>
          <licenses>
@@ -2430,4 +2413,4 @@
          </downloadUrls>
       </dependency>
    </dependencies>
-</attributionReport>
+</attributionReport>
diff --git a/ATTRIBUTIONS/wasabi-analytics-objects-attribution.xml b/ATTRIBUTIONS/wasabi-analytics-objects-attribution.xml
@@ -851,7 +851,7 @@
          <type>jar</type>
          <licenses/>
          <downloadUrls>
-            <string>TBD</string>
+            <string>file:/Users/iizrailevsky/Git/wasabi/modules/analytics-objects/../../repository/Hyrule/Hyrule/0.0.1/Hyrule-0.0.1.jar</string>
          </downloadUrls>
       </dependency>
       <dependency>
@@ -922,23 +922,6 @@
             <string>https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.7.2/jackson-databind-2.7.2.jar</string>
          </downloadUrls>
       </dependency>
-      <dependency>
-         <name>JaCoCo :: Agent</name>
-         <groupId>org.jacoco</groupId>
-         <artifactId>org.jacoco.agent</artifactId>
-         <version>0.7.2.201409121644</version>
-         <projectUrl>http://org.jacoco.agent</projectUrl>
-         <type>pom</type>
-         <licenses>
-            <license>
-               <name>Eclipse Public License v1.0</name>
-               <url>http://www.eclipse.org/legal/epl-v10.html</url>
-            </license>
-         </licenses>
-         <downloadUrls>
-            <string>https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.agent/0.7.2.201409121644/org.jacoco.agent-0.7.2.201409121644.pom</string>
-         </downloadUrls>
-      </dependency>
       <dependency>
          <name>Java Agent for Memory Measurements</name>
          <groupId>com.github.stephenc</groupId>
@@ -1517,7 +1500,7 @@
          <name>wasabi-assignment-objects</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-assignment-objects</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-assignment-objects</projectUrl>
          <type>jar</type>
          <licenses>
@@ -1532,7 +1515,7 @@
          <name>wasabi-exceptions</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-exceptions</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-exceptions</projectUrl>
          <type>jar</type>
          <licenses>
@@ -1547,7 +1530,7 @@
          <name>wasabi-experiment-objects</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-experiment-objects</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-experiment-objects</projectUrl>
          <type>jar</type>
          <licenses>
@@ -1562,7 +1545,7 @@
          <name>wasabi-export</name>
          <groupId>com.intuit.wasabi</groupId>
          <artifactId>wasabi-export</artifactId>
-         <version>1.0.20160801220857-SNAPSHOT</version>
+         <version>1.0.20161014052805-SNAPSHOT</version>
          <projectUrl>https://github.com/intuit/wasabi/modules/wasabi-export</projectUrl>
          <type>jar</type>
          <licenses>
@@ -1574,4 +1557,4 @@
          <downloadUrls/>
       </dependency>
    </dependencies>
-</attributionReport>
+</attributionReport>