Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commiteada27b

Browse files
committed
Merge multi-module
2 parents1d98467 +6c58e21 commiteada27b

File tree

62 files changed

+933
-873
lines changed

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
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+
<propertiesxmlns="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+
<projectxmlns="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/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.javarenamed 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
packagecom.github.difflib.algorithm.jgit;
1717

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

5963
@Test
6064
publicvoidtestPossibleDiffHangOnLargeDatasetDnaumenkoIssue26()throwsIOException,PatchFailedException {
61-
ZipFilezip =newZipFile(TestConstants.MOCK_FOLDER +"/large_dataset1.zip");
65+
ZipFilezip =newZipFile("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+
publicstaticList<String>readStringListFromInputStream(InputStreamis)throwsIOException {
96+
try (BufferedReaderreader =newBufferedReader(
97+
newInputStreamReader(is,Charset.forName(StandardCharsets.UTF_8.name())))) {
98+
99+
returnreader.lines().collect(toList());
100+
}
101+
}
91102
}

‎java-diff-utils/pom.xml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<projectxmlns="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+

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp