update dependencies

GumTreeDiff · Oct 4, 2017 · 25ffa28 · 25ffa28
1 parent ecb9b66
commit 25ffa28
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 24 deletions.
diff --git a/client.diff/build.gradle b/client.diff/build.gradle
@@ -2,7 +2,7 @@ description = 'GumTree diff client'
 
 dependencies {
 	compile project(':client')
-	compile 'com.sparkjava:spark-core:2.5.2'
+	compile 'com.sparkjava:spark-core:2.6.0'
 	// exclude servlet-api 2.0 because it causes a bug with spark-core
 	compile('org.rendersnake:rendersnake:1.9.0') {
 		exclude group: 'javax.servlet', module: 'servlet-api'

diff --git a/client.diff/src/main/java/com/github/gumtreediff/client/diff/ClusterDiff.java b/client.diff/src/main/java/com/github/gumtreediff/client/diff/ClusterDiff.java
@@ -1,3 +1,22 @@
+/*
+ * This file is part of GumTree.
+ *
+ * GumTree is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GumTree is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with GumTree.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright 2017 Jean-Rémy Falleri <jr.falleri@gmail.com>
+ */
+
 package com.github.gumtreediff.client.diff;
 
 import com.github.gumtreediff.actions.ActionClusterFinder;
@@ -25,7 +44,7 @@ public void run() {
         g.generate();
         List<Action> actions = g.getActions();
         ActionClusterFinder f = new ActionClusterFinder(getSrcTreeContext(), getDstTreeContext(), actions);
-        for(Set<Action> cluster: f.getClusters()) {
+        for (Set<Action> cluster: f.getClusters()) {
             System.out.println("New cluster:");
             System.out.println(f.getClusterLabel(cluster));
             System.out.println("------------");

diff --git a/client/build.gradle b/client/build.gradle
@@ -1,5 +1,5 @@
 description = 'GumTree abstract client module.'
 
 dependencies {
-	compile 'org.reflections:reflections:0.9.10'
+	compile 'org.reflections:reflections:0.9.11'
 }
diff --git a/core/build.gradle b/core/build.gradle
@@ -3,9 +3,10 @@ description = 'GumTree core module.'
 dependencies {
 	compile 'com.github.mpkorstanje:simmetrics-core:3.2.3'
 	compile 'net.sf.trove4j:trove4j:3.0.3'
-	compile 'com.google.code.gson:gson:2.4'
-	compile group: 'org.jgrapht', name: 'jgrapht-core', version: '1.0.1'
+	compile 'com.google.code.gson:gson:2.8.2'
+	compile 'org.jgrapht:jgrapht-core:1.0.1'
 }
+
 allprojects {
 	gradle.projectsEvaluated {
 		tasks.withType(JavaCompile) {

diff --git a/core/src/main/java/com/github/gumtreediff/actions/ActionClusterFinder.java b/core/src/main/java/com/github/gumtreediff/actions/ActionClusterFinder.java
@@ -1,3 +1,22 @@
+/*
+ * This file is part of GumTree.
+ *
+ * GumTree is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GumTree is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with GumTree.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright 2017 Jean-Rémy Falleri <jr.falleri@gmail.com>
+ */
+
 package com.github.gumtreediff.actions;
 
 import com.github.gumtreediff.actions.model.*;
@@ -37,8 +56,8 @@ public ActionClusterFinder(TreeContext src, TreeContext dst, List<Action> action
         for (Action a1: actions) {
             for (Action a2: actions) {
                 if (a1 != a2) {
-                    if (embeddedInserts(a1, a2) || sameValueUpdates(a1, a2) ||
-                            sameParentMoves(a1, a2) || embeddedDeletes(a1, a2))
+                    if (embeddedInserts(a1, a2) || sameValueUpdates(a1, a2)
+                            || sameParentMoves(a1, a2) || embeddedDeletes(a1, a2))
                         graph.addEdge(a1, a2);
                 }
             }

diff --git a/core/src/main/java/com/github/gumtreediff/io/DirectoryComparator.java b/core/src/main/java/com/github/gumtreediff/io/DirectoryComparator.java
@@ -138,7 +138,7 @@ public boolean hasChanged(String s1, String s2) throws IOException {
         if (l1 != l2) return true;
         else {
             try (DataInputStream dis1 = new DataInputStream(new FileInputStream(f1));
-                 DataInputStream dis2 = new DataInputStream(new FileInputStream(f2))) {
+                    DataInputStream dis2 = new DataInputStream(new FileInputStream(f2))) {
                 int c1, c2;
                 while ((c1 = dis1.read()) != -1) {
                     c2 = dis2.read();

diff --git a/core/src/main/java/com/github/gumtreediff/matchers/heuristic/XyBottomUpMatcher.java b/core/src/main/java/com/github/gumtreediff/matchers/heuristic/XyBottomUpMatcher.java
@@ -104,7 +104,8 @@ private void lastChanceMatch(ITree src, ITree dst) {
         }
 
         for (int t: srcKinds.keySet())
-            if (dstKinds.get(t) != null && srcKinds.get(t).size() == dstKinds.get(t).size() && srcKinds.get(t).size() == 1)
+            if (dstKinds.get(t) != null && srcKinds.get(t).size() == dstKinds.get(t).size()
+                    && srcKinds.get(t).size() == 1)
                 addMapping(srcKinds.get(t).get(0), dstKinds.get(t).get(0));
     }
 }
diff --git a/...ain/java/com/github/gumtreediff/matchers/heuristic/cd/ChangeDistillerBottomUpMatcher.java b/...ain/java/com/github/gumtreediff/matchers/heuristic/cd/ChangeDistillerBottomUpMatcher.java
@@ -43,9 +43,11 @@ public void match() {
         for (ITree currentSrcTree: this.src.postOrder()) {
             int numberOfLeaves = numberOfLeaves(currentSrcTree);
             for (ITree currentDstTree: dstTrees) {
-                if (isMappingAllowed(currentSrcTree, currentDstTree) && !(currentSrcTree.isLeaf() || currentDstTree.isLeaf())) {
+                if (isMappingAllowed(currentSrcTree, currentDstTree)
+                        && !(currentSrcTree.isLeaf() || currentDstTree.isLeaf())) {
                     double similarity = chawatheSimilarity(currentSrcTree, currentDstTree);
-                    if ((numberOfLeaves > 4 && similarity >= STRUCT_SIM_THRESHOLD_1) || (numberOfLeaves <= 4 && similarity >= STRUCT_SIM_THRESHOLD_2)) {
+                    if ((numberOfLeaves > 4 && similarity >= STRUCT_SIM_THRESHOLD_1)
+                            || (numberOfLeaves <= 4 && similarity >= STRUCT_SIM_THRESHOLD_2)) {
                         addMapping(currentSrcTree, currentDstTree);
                         break;
                     }

diff --git a/.../main/java/com/github/gumtreediff/matchers/heuristic/cd/ChangeDistillerLeavesMatcher.java b/.../main/java/com/github/gumtreediff/matchers/heuristic/cd/ChangeDistillerLeavesMatcher.java
@@ -58,7 +58,8 @@ public void match() {
         Collections.sort(leavesMappings, new LeafMappingComparator());
         while (leavesMappings.size() > 0) {
             Mapping bestMapping = leavesMappings.remove(0);
-            if (!(ignoredSrcTrees.contains(bestMapping.getFirst()) || ignoredDstTrees.contains(bestMapping.getSecond()))) {
+            if (!(ignoredSrcTrees.contains(bestMapping.getFirst())
+                    || ignoredDstTrees.contains(bestMapping.getSecond()))) {
                 addMapping(bestMapping.getFirst(),bestMapping.getSecond());
                 ignoredSrcTrees.add(bestMapping.getFirst());
                 ignoredDstTrees.add(bestMapping.getSecond());

diff --git a/...lr3-json/src/main/java/com/github/gumtreediff/gen/antlr3/json/AntlrJsonTreeGenerator.java b/...lr3-json/src/main/java/com/github/gumtreediff/gen/antlr3/json/AntlrJsonTreeGenerator.java
@@ -24,7 +24,6 @@
 import com.github.gumtreediff.gen.antlr3.AbstractAntlr3TreeGenerator;
 import org.antlr.runtime.*;
 
-
 @Register(id = "json-antlr", accept =  "\\.json$")
 public class AntlrJsonTreeGenerator extends AbstractAntlr3TreeGenerator<JSONLexer, JSONParser> {
 

diff --git a/gen.css/build.gradle b/gen.css/build.gradle
@@ -1,6 +1,5 @@
 description = 'GumTree tree generator for CSS code based on ph-css.'
 
 dependencies {
-	compile 'org.jruby:jrubyparser:0.5.3'
-	compile 'com.helger:ph-css:5.0.1'
+	compile 'com.helger:ph-css:6.0.0-b1'
 }
diff --git a/gen.css/src/main/java/com/github/gumtreediff/gen/css/CssTreeGenerator.java b/gen.css/src/main/java/com/github/gumtreediff/gen/css/CssTreeGenerator.java
@@ -51,7 +51,8 @@ public TreeContext generate(Reader r) throws IOException {
         p.setCustomErrorHandler(null);
         p.setBrowserCompliantMode(false);
         try {
-            CascadingStyleSheet sheet = CSSHandler.readCascadingStyleSheetFromNode(ECSSVersion.LATEST, p.styleSheet());
+            CascadingStyleSheet sheet = CSSHandler.readCascadingStyleSheetFromNode(ECSSVersion.LATEST,
+                    p.styleSheet(), CSSReader.getDefaultInterpretErrorHandler());
             GtCssVisitor v = new GtCssVisitor(sheet, lr);
             CSSVisitor.visitCSS(sheet, v);
             return v.getTreeContext();

diff --git a/gen.jdt/build.gradle b/gen.jdt/build.gradle
@@ -1,7 +1,7 @@
 description = 'GumTree tree generator for Java code (Eclipse JDT based).'
 
 dependencies {
-	compile 'org.eclipse.tycho:org.eclipse.jdt.core:3.11.0.v20150602-1242'
-	compile 'org.eclipse.core:runtime:3.10.0-v20140318-2214'
-	compile 'org.eclipse.birt.runtime:org.eclipse.core.resources:3.10.0.v20150423-0755'
+	compile group: 'org.eclipse.jdt', name: 'org.eclipse.jdt.core', version: '3.12.3'
+	// compile 'org.eclipse.core:runtime:3.10.0-v20140318-2214'
+	// compile 'org.eclipse.birt.runtime:org.eclipse.core.resources:3.10.0.v20150423-0755'
 }
diff --git a/gen.js/build.gradle b/gen.js/build.gradle
@@ -1,5 +1,5 @@
 description = 'GumTree tree generator for JavaScript code (Rhino based).'
 
 dependencies {
-	compile 'org.mozilla:rhino:1.7.7'
+	compile 'org.mozilla:rhino:1.7.7.2'
 }
diff --git a/gumtree_checkstyle.xml b/gumtree_checkstyle.xml
@@ -38,10 +38,6 @@
 						<property name="option" value="TEXT"/>
 						<property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
 				</module>
-				<module name="LeftCurly">
-						<property name="maxLineLength" value="100"/>
-				</module>
-				<module name="RightCurly"/>
 				<module name="RightCurly">
 						<property name="option" value="alone"/>
 						<property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>