Skip to content

Commit eada27b

Browse files
wumpzwumpz
committed
Merge multi-module
2 parents 1d98467 + 6c58e21 commit eada27b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+933
-873
lines changed

‎java-diff-utils-jgit/nb-configuration.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project-shared-configuration>
3+
<!--
4+
This file contains additional configuration written by modules in the NetBeans IDE.
5+
The configuration is intended to be shared among all the users of project and
6+
therefore it is assumed to be part of version control checkout.
7+
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
8+
-->
9+
<properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
10+
<!--
11+
Properties that influence various parts of the IDE, especially code formatting and the like.
12+
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
13+
That way multiple projects can share the same settings (useful for formatting rules for example).
14+
Any value defined here will override the pom.xml file value but is only applicable to the current project.
15+
-->
16+
<netbeans.compile.on.save>none</netbeans.compile.on.save>
17+
<netbeans.hint.jdkPlatform>JDK_1.8</netbeans.hint.jdkPlatform>
18+
</properties>
19+
</project-shared-configuration>

‎java-diff-utils-jgit/pom.xml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>io.github.java-diff-utils</groupId>
6+
<artifactId>java-diff-utils-parent</artifactId>
7+
<version>4.5-SNAPSHOT</version>
8+
</parent>
9+
<artifactId>java-diff-utils-jgit</artifactId>
10+
<name>java-diff-utils-jgit</name>
11+
<packaging>jar</packaging>
12+
<description>This is an extension of java-diff-utils using jgit to use its implementation of
13+
some difference algorithms.</description>
14+
<dependencies>
15+
<dependency>
16+
<groupId>junit</groupId>
17+
<artifactId>junit</artifactId>
18+
<version>4.12</version>
19+
<type>jar</type>
20+
<scope>test</scope>
21+
</dependency>
22+
<dependency>
23+
<groupId>org.eclipse.jgit</groupId>
24+
<artifactId>org.eclipse.jgit</artifactId>
25+
<version>4.4.1.201607150455-r</version>
26+
<exclusions>
27+
<exclusion>
28+
<groupId>com.googlecode.javaewah</groupId>
29+
<artifactId>JavaEWAH</artifactId>
30+
</exclusion>
31+
<exclusion>
32+
<groupId>commons-codec</groupId>
33+
<artifactId>commons-codec</artifactId>
34+
</exclusion>
35+
<exclusion>
36+
<groupId>commons-logging</groupId>
37+
<artifactId>commons-logging</artifactId>
38+
</exclusion>
39+
<exclusion>
40+
<groupId>org.apache.httpcomponents</groupId>
41+
<artifactId>httpclient</artifactId>
42+
</exclusion>
43+
<exclusion>
44+
<groupId>com.jcraft</groupId>
45+
<artifactId>jsch</artifactId>
46+
</exclusion>
47+
<exclusion>
48+
<groupId>org.slf4j</groupId>
49+
<artifactId>slf4j-api</artifactId>
50+
</exclusion>
51+
</exclusions>
52+
</dependency>
53+
<dependency>
54+
<groupId>${project.groupId}</groupId>
55+
<artifactId>java-diff-utils</artifactId>
56+
<version>${project.version}</version>
57+
</dependency>
58+
</dependencies>
59+
</project>

‎src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java renamed to ‎java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java

File renamed without changes.

‎src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java renamed to ‎java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java

File renamed without changes.

‎src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java renamed to ‎java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@
1515
*/
1616
package com.github.difflib.algorithm.jgit;
1717

18-
import static com.github.difflib.DiffUtilsTest.readStringListFromInputStream;
19-
import com.github.difflib.TestConstants;
2018
import com.github.difflib.algorithm.DiffAlgorithmListener;
2119
import com.github.difflib.patch.Patch;
2220
import com.github.difflib.patch.PatchFailedException;
21+
import java.io.BufferedReader;
2322
import java.io.IOException;
23+
import java.io.InputStream;
24+
import java.io.InputStreamReader;
25+
import java.nio.charset.Charset;
26+
import java.nio.charset.StandardCharsets;
2427
import java.util.ArrayList;
2528
import java.util.List;
29+
import static java.util.stream.Collectors.toList;
2630
import java.util.zip.ZipFile;
2731
import org.junit.After;
2832
import org.junit.AfterClass;
@@ -58,7 +62,7 @@ public void tearDown() {
5862

5963
@Test
6064
public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOException, PatchFailedException {
61-
ZipFile zip = new ZipFile(TestConstants.MOCK_FOLDER + "/large_dataset1.zip");
65+
ZipFile zip = new ZipFile("target/test-classes/mocks/large_dataset1.zip");
6266
List<String> original = readStringListFromInputStream(zip.getInputStream(zip.getEntry("ta")));
6367
List<String> revised = readStringListFromInputStream(zip.getInputStream(zip.getEntry("tb")));
6468

@@ -88,4 +92,11 @@ public void diffEnd() {
8892
assertEquals(246579, logdata.size());
8993
}
9094

95+
public static List<String> readStringListFromInputStream(InputStream is) throws IOException {
96+
try (BufferedReader reader = new BufferedReader(
97+
new InputStreamReader(is, Charset.forName(StandardCharsets.UTF_8.name())))) {
98+
99+
return reader.lines().collect(toList());
100+
}
101+
}
91102
}

‎src/test/resources/mocks/large_dataset1.zip renamed to ‎java-diff-utils-jgit/src/test/resources/mocks/large_dataset1.zip

File renamed without changes.

‎java-diff-utils/pom.xml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>io.github.java-diff-utils</groupId>
4+
<artifactId>java-diff-utils</artifactId>
5+
<packaging>jar</packaging>
6+
<name>java-diff-utils</name>
7+
<parent>
8+
<groupId>io.github.java-diff-utils</groupId>
9+
<artifactId>java-diff-utils-parent</artifactId>
10+
<version>4.5-SNAPSHOT</version>
11+
</parent>
12+
<properties>
13+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14+
</properties>
15+
16+
<dependencies>
17+
<dependency>
18+
<groupId>junit</groupId>
19+
<artifactId>junit</artifactId>
20+
<version>4.12</version>
21+
<type>jar</type>
22+
<scope>test</scope>
23+
</dependency>
24+
<dependency>
25+
<groupId>org.assertj</groupId>
26+
<artifactId>assertj-core</artifactId>
27+
<version>3.11.1</version>
28+
<scope>test</scope>
29+
</dependency>
30+
</dependencies>
31+
32+
<build>
33+
<plugins>
34+
<plugin>
35+
<groupId>org.apache.maven.plugins</groupId>
36+
<artifactId>maven-compiler-plugin</artifactId>
37+
<version>3.6.1</version>
38+
<configuration>
39+
<source>1.8</source>
40+
<target>1.8</target>
41+
<encoding>UTF-8</encoding>
42+
</configuration>
43+
</plugin>
44+
<plugin>
45+
<artifactId>maven-jar-plugin</artifactId>
46+
<version>3.0.2</version>
47+
<configuration>
48+
<archive>
49+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
50+
<manifestEntries>
51+
<!-- identical to OSGI name -->
52+
<Automatic-Module-Name>io.github.java-diff-utils</Automatic-Module-Name>
53+
</manifestEntries>
54+
</archive>
55+
</configuration>
56+
</plugin>
57+
</plugins>
58+
</build>
59+
</project>
60+

‎src/main/java/com/github/difflib/DiffUtils.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java

File renamed without changes.

‎src/main/java/com/github/difflib/UnifiedDiffUtils.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java

File renamed without changes.

‎src/main/java/com/github/difflib/algorithm/Change.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/algorithm/Change.java

File renamed without changes.

‎src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java

File renamed without changes.

‎src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java

File renamed without changes.

‎src/main/java/com/github/difflib/algorithm/DiffException.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffException.java

File renamed without changes.

‎src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java

File renamed without changes.

‎src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java

File renamed without changes.

‎src/main/java/com/github/difflib/algorithm/myers/PathNode.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/PathNode.java

File renamed without changes.

‎src/main/java/com/github/difflib/patch/AbstractDelta.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java

File renamed without changes.

‎src/main/java/com/github/difflib/patch/ChangeDelta.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java

File renamed without changes.

‎src/main/java/com/github/difflib/patch/Chunk.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java

File renamed without changes.

‎src/main/java/com/github/difflib/patch/DeleteDelta.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java

File renamed without changes.

‎src/main/java/com/github/difflib/patch/DeltaType.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/patch/DeltaType.java

File renamed without changes.

‎src/main/java/com/github/difflib/patch/DiffException.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/patch/DiffException.java

File renamed without changes.

‎src/main/java/com/github/difflib/patch/InsertDelta.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java

File renamed without changes.

‎src/main/java/com/github/difflib/patch/Patch.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java

File renamed without changes.

‎src/main/java/com/github/difflib/patch/PatchFailedException.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/patch/PatchFailedException.java

File renamed without changes.

‎src/main/java/com/github/difflib/text/DiffRow.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/text/DiffRow.java

File renamed without changes.

‎src/main/java/com/github/difflib/text/DiffRowGenerator.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java

File renamed without changes.

‎src/main/java/com/github/difflib/text/StringUtils.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/text/StringUtils.java

File renamed without changes.

‎src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java

File renamed without changes.

‎src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java

File renamed without changes.

‎src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParserException.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParserException.java

File renamed without changes.

‎src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java

File renamed without changes.

‎src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java

File renamed without changes.

‎src/main/java/com/github/difflib/unifieddiff/package-info.java renamed to ‎java-diff-utils/src/main/java/com/github/difflib/unifieddiff/package-info.java

File renamed without changes.

‎src/test/java/com/github/difflib/DiffUtilsTest.java renamed to ‎java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java

File renamed without changes.

‎src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java renamed to ‎java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java

File renamed without changes.

‎src/test/java/com/github/difflib/TestConstants.java renamed to ‎java-diff-utils/src/test/java/com/github/difflib/TestConstants.java

File renamed without changes.

‎src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java renamed to ‎java-diff-utils/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java

File renamed without changes.

‎src/test/java/com/github/difflib/examples/ApplyPatch.java renamed to ‎java-diff-utils/src/test/java/com/github/difflib/examples/ApplyPatch.java

File renamed without changes.

‎src/test/java/com/github/difflib/examples/ComputeDifference.java renamed to ‎java-diff-utils/src/test/java/com/github/difflib/examples/ComputeDifference.java

File renamed without changes.

‎src/test/java/com/github/difflib/patch/PatchTest.java renamed to ‎java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java

File renamed without changes.

‎src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java renamed to ‎java-diff-utils/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java

File renamed without changes.

‎src/test/java/com/github/difflib/text/StringUtilsTest.java renamed to ‎java-diff-utils/src/test/java/com/github/difflib/text/StringUtilsTest.java

File renamed without changes.

‎src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java renamed to ‎java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java

File renamed without changes.

‎src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java renamed to ‎java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffRoundTripTest.java

File renamed without changes.

‎src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java renamed to ‎java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java

File renamed without changes.

‎src/test/resources/com/github/difflib/unifieddiff/jsqlparser_patch_1.diff renamed to ‎java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/jsqlparser_patch_1.diff

File renamed without changes.

‎src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue33.diff renamed to ‎java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue33.diff

File renamed without changes.

‎src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue46.diff renamed to ‎java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue46.diff

File renamed without changes.

0 commit comments

Comments
 (0)