Skip to content
This repository was archived by the owner on Nov 12, 2019. It is now read-only.

Commit 7d621bb

Browse files
committed
Move changelog to CHANGELOG.md
1 parent d5ef624 commit 7d621bb

File tree

2 files changed

+77
-38
lines changed

2 files changed

+77
-38
lines changed

CHANGELOG.md

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
6+
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
7+
8+
## [2.1.1] – 2016-10-24
9+
10+
### Added
11+
12+
- Added some unit tests.
13+
14+
### Changed
15+
16+
- Maven group is `com.github.bkromhout`
17+
18+
### Fixed
19+
20+
- Bugfix: Fix issue showing inline diffs.
21+
22+
## [2.1.0] – 2016-10-24
23+
24+
### Changed
25+
26+
- Removes the dependency on Guava time
27+
28+
## [2.0.0] – 2016-02-24
29+
30+
### Added
31+
32+
- Add the ability to differentiate the inserted and deleted tags and class-names in inline-diff
33+
- Add tha ability to skip data
34+
- Can now customize diff algorithm in `DiffRowGenerator.Builder`
35+
36+
### Fixed
37+
38+
- Fix "equal" lines when lines isn't really equals (when Equalizer return equals on different strings)
39+
- Fix imbrication tag bug in lineDiff (when inline is on a multi-line chunk)
40+
41+
### Changed
42+
43+
- Change groupId and artifactId to prevent conflict with origin library: now 'com.github.java-diff-utils:java-diff-utils' instead of 'jp.skypencil.java-diff-utils:diffutils'
44+
- Default class-name is now `null` for deleted and inserted data, and "`change`" for change data
45+
- Default tag for deleted data is `del`
46+
- Default tag for inserted data is `ins`
47+
48+
## 1.5.0 – 2014-05-22
49+
50+
### Changed
51+
52+
- make Equalizer configurable. ([pull #1](https://github.com/eller86/java-diff-utils/pull/1))
53+
54+
## 1.4.1 – 2014-01-01
55+
56+
### Fixed
57+
58+
- bugfix: parse method should be public
59+
60+
## 1.4.0 – 2014-01-01
61+
62+
### Added
63+
64+
- add Guava to dependency
65+
- let user uses other string to represent line which does not exist
66+
- implement event based parser like SAX (in difflib.event package)
67+
68+
### Changed
69+
70+
- switch from JDK5 to JDK7
71+
72+
[Unreleased]: https://github.com/koppor/java-diff-utils/compare/2.1.1...HEAD
73+
[2.1.1]: https://github.com/koppor/java-diff-utils/compare/2.1.0...2.1.1
74+
[2.1.0]: https://github.com/koppor/java-diff-utils/compare/2.0.0...2.1.0
75+
[2.0.0]: https://github.com/koppor/java-diff-utils/compare/1.5.0...2.0.0
76+
[1.5.0]: https://github.com/koppor/java-diff-utils/compare/1.4.1...1.5.0
77+
[1.4.1]: https://github.com/koppor/java-diff-utils/compare/1.4.0...1.4.1

README.md

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -44,44 +44,6 @@ This library implements Myers' diff algorithm, but it is modular so it is easy t
4444

4545
* In Spanish: [Comparar Ficheros java-diff-utils](https://www.adictosaltrabajo.com/tutoriales/comparar-ficheros-java-diff-utils/)
4646

47-
## Changelog
48-
49-
### 2.1.1
50-
51-
- Bugfix: Fix issue showing inline diffs.
52-
- Added some unit tests.
53-
54-
### 2.1.0
55-
56-
- Removes the dependency on Guava time
57-
58-
### 2.0.0
59-
60-
- Change groupId and artifactId to prevent conflict with origin library: now 'com.github.java-diff-utils:java-diff-utils' instead of 'jp.skypencil.java-diff-utils:diffutils'
61-
- Adds the ability to differentiate the inserted and deleted tags and class-names in inline-diff
62-
- Default class-name is now `null` for deleted and inserted data, and "`change`" for change data
63-
- Default tag for deleted data is `del`
64-
- Default tag for inserted data is `ins`
65-
- can now customize diff algorithm in `DiffRowGenerator.Builder`
66-
- fix "equal" lines when lines isn't really equals (when Equalizer return equals on different strings)
67-
- fix imbrication tag bug in lineDiff (when inline is on a multi-line chunk)
68-
- Adds tha ability to skip data
69-
70-
### 1.5.0
71-
72-
- make Equalizer configurable. ([pull #1](https://github.com/eller86/java-diff-utils/pull/1))
73-
74-
### 1.4.1
75-
76-
- bugfix: parse method should be public
77-
78-
### 1.4.0
79-
80-
- switch from JDK5 to JDK7
81-
- add Guava to dependency
82-
- let user uses other string to represent line which does not exist
83-
- implement event based parser like SAX (in difflib.event package)
84-
8547
## License
8648

8749
This work is licensed under The Apache Software License, Version 1.1.

0 commit comments

Comments
 (0)