Skip to content

Commit 901b06e

Browse files
wumpzwumpz
committed
Merge origin/master
Conflicts: src/main/java/difflib/Delta.java
2 parents eed6982 + 061f46e commit 901b06e

Some content is hidden

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

45 files changed

+1541
-1515
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
/target/
1+
/target/
2+
/nbproject/

‎README.md‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,18 @@ This library implements Myer's diff algorithm. But it can easily replaced by any
2222
* switch to maven and removed other artifacts
2323
* changed groupid to *com.github.java-diff-utils* due to different forks at github
2424
* updated maven plugins
25-
* JDK 1.7 compatibility
25+
* JDK 1.8 compatibility
26+
* support for inline merge
27+
* restructured packages
28+
* changed API
2629
* Version 1.2
2730
* JDK 1.5 compatibility
2831
* Ant build script
2932
* Generate output in unified diff format (thanks for Bill James)
3033

3134
### To Install ###
3235

33-
This jar is not yet to get at maven central.
36+
**This jar is not yet to get at maven central.**
3437

3538
Just add the code below to your maven dependencies:
3639
```
@@ -40,14 +43,3 @@ Just add the code below to your maven dependencies:
4043
<version>1.2.1</version>
4144
</dependency>
4245
```
43-
44-
## Coming eventually ##
45-
46-
* support for inline diffs in output
47-
* helpers for showing side-by-side, line-by-line diffs or text with inter-line and intra-line change highlights
48-
* customization of diff algorithm for better experience while computing diffs between strings (ignoring blank lines or spaces, etc)
49-
* generating output in other formats (not only unified). E.g. CVS.
50-
51-
### Tutorials ###
52-
53-
http://www.adictosaltrabajo.com/tutoriales/tutoriales.php?pagina=CompararFicherosJavaDiffUtils (in Spanish). Thanks Miguel

‎pom.xml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,31 @@
2020
<developerConnection>scm:git:ssh://git@github.com:wumpz/java-diff-utils.git</developerConnection>
2121
<url>https://github.com/wumpz/java-diff-utils.git</url>
2222
</scm>
23+
24+
<issueManagement>
25+
<system>GitHub Issues</system>
26+
<url>https://github.com/wumpz/java-diff-utils/issues</url>
27+
</issueManagement>
28+
29+
<organization>
30+
<name>java-diff-utils</name>
31+
</organization>
32+
33+
<developers>
34+
<developer>
35+
<name>Tobias Warneke</name>
36+
<email>t.warneke@gmx.net</email>
37+
</developer>
38+
<developer>
39+
<name>Dmitry Naumenko</name>
40+
<email>dm.naumenko@gmail.com</email>
41+
</developer>
42+
<developer>
43+
<name>Juanco Anez</name>
44+
<email>juanco@suigeneris.org</email>
45+
</developer>
46+
</developers>
47+
2348
<licenses>
2449
<license>
2550
<name>The Apache Software License, Version 2.0</name>
@@ -84,7 +109,61 @@
84109
</execution>
85110
</executions>
86111
</plugin>
112+
<plugin>
113+
<groupId>org.apache.maven.plugins</groupId>
114+
<artifactId>maven-javadoc-plugin</artifactId>
115+
<version>2.10.4</version>
116+
<configuration>
117+
<additionalparam>${javadoc.opts}</additionalparam>
118+
</configuration>
119+
<executions>
120+
<execution>
121+
<id>attach-javadocs</id>
122+
<goals>
123+
<goal>jar</goal>
124+
</goals>
125+
</execution>
126+
</executions>
127+
</plugin>
128+
<!--
129+
<plugin>
130+
<groupId>org.codehaus.mojo</groupId>
131+
<artifactId>license-maven-plugin</artifactId>
132+
<version>1.12</version>
133+
<configuration>
134+
<verbose>false</verbose>
135+
<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
136+
<canUpdateDescription>false</canUpdateDescription>
137+
</configuration>
138+
<executions>
139+
<execution>
140+
<id>first</id>
141+
<goals>
142+
<goal>update-file-header</goal>
143+
</goals>
144+
<phase>process-sources</phase>
145+
<configuration>
146+
<licenseName>apache_v2</licenseName>
147+
<roots>
148+
<root>src/main/java</root>
149+
</roots>
150+
</configuration>
151+
</execution>
152+
</executions>
153+
</plugin>
154+
-->
87155
</plugins>
88156
</build>
157+
<profiles>
158+
<profile>
159+
<id>doclint-java8-disable</id>
160+
<activation>
161+
<jdk>[1.8,)</jdk>
162+
</activation>
163+
<properties>
164+
<javadoc.opts>-Xdoclint:none</javadoc.opts>
165+
</properties>
166+
</profile>
167+
</profiles>
89168
</project>
90169

‎src/main/java/difflib/DeltaComparator.java‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/main/java/difflib/DiffException.java‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)