From fb4ecc85b93efeb0efced8193cb0f8189afc8ac7 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Tue, 26 Jun 2018 21:13:14 +0200 Subject: [PATCH 1/6] New development cycle --- CHANGELOG.md | 2 ++ build.gradle | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 125cae6..eb0f6af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +[Unreleased] + ## [2.2.0] – 2018-06-26 ### Changed diff --git a/build.gradle b/build.gradle index f8a76b1..c43cdbd 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'signing' group = 'io.github.java-diff-utils' archivesBaseName = 'java-diff-utils' -version = '2.2.0' +version = '2.2.1-SNAPSHOT' sourceCompatibility = '1.7' targetCompatibility = '1.7' From 8f81d6d4588ed6bbfc54a3d5ed88dd0942922fbb Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 27 Jun 2018 08:23:45 +0200 Subject: [PATCH 2/6] Add links to other variants --- README.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8412cf3..b9d1362 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,6 @@ The main reason for creating this library was the lack of easy-to-use libraries with all the usual features necessary for working with diff files. Originally it was inspired by the [JRCS library](https://bitbucket.org/apalala/jrcs) and its nice diff module design. -**Original code and docs were forked from:** [java-diff-utils](https://code.google.com/p/java-diff-utils/). -The original author created his own fork at . - ## Main Features * Computing the difference between two chunks of text. @@ -39,6 +36,16 @@ This library implements Myers' diff algorithm, but it is modular so it is easy t * In Spanish: [Comparar Ficheros java-diff-utils](https://www.adictosaltrabajo.com/tutoriales/comparar-ficheros-java-diff-utils/) +## Other variants of this library + +The library was originally hosted on Google Code at . +This library is a fork originally created by @bkromhout. + +Since GitHub does not connect forks based on Google Code, other variants appeared in parallel: + +- https://github.com/dnaumenko/java-diff-utils - Created by the original Google Code maintainer +- https://github.com/wumpz/java-diff-utils - Created from the Google Code repository [starting in 2017](https://github.com/wumpz/java-diff-utils/commit/42fde56154afd92d2b9ef8e088185e7af0230cee). + ## License This work is licensed under The Apache Software License, Version 1.1. From aa4d9319eca345e368df17e433f191d0ead6021f Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 27 Jun 2018 08:28:48 +0200 Subject: [PATCH 3/6] Refine documentation of roots of this fork --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b9d1362..fcd2d52 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ This library implements Myers' diff algorithm, but it is modular so it is easy t ## Other variants of this library The library was originally hosted on Google Code at . -This library is a fork originally created by @bkromhout. +This library is a fork originally created by @KengoTODA ([published on maven central](https://mvnrepository.com/artifact/jp.skypencil.java-diff-utils/diffutils) using the group id `jp.skypencil.java-diff-utils`) and enhanced by @bkromhout. Since GitHub does not connect forks based on Google Code, other variants appeared in parallel: From e64edd455636fc187ae30da5809644e7ad1ebf6c Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 27 Jun 2018 08:30:35 +0200 Subject: [PATCH 4/6] Add maven central badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fcd2d52..4f22ea9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# java-diff-utils [![Build Status](https://travis-ci.org/java-diff-utils/java-diff-utils.svg?branch=master)](https://travis-ci.org/java-diff-utils/java-diff-utils) +# java-diff-utils [![Build Status](https://travis-ci.org/java-diff-utils/java-diff-utils.svg?branch=master)](https://travis-ci.org/java-diff-utils/java-diff-utils) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.java-diff-utils/java-diff-utils/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.java-diff-utils/java-diff-utils) > A library for computing diffs, applying patches, generation side-by-side view in Java. From 4421f29a6dbc9c0d1c4fb9282180b57e24f0e8d0 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 27 Jun 2018 08:31:26 +0200 Subject: [PATCH 5/6] Fix markdown --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb0f6af..0a27341 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -[Unreleased] +## [Unreleased] + +### Changed + +- Refined `README.md` ## [2.2.0] – 2018-06-26 From 4c175edaa9974ceaa9975fb5b53851ad092ff1eb Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Mon, 12 Nov 2018 21:58:48 +0100 Subject: [PATCH 6/6] Add pointer to successor --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4f22ea9..1e1231e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -# java-diff-utils [![Build Status](https://travis-ci.org/java-diff-utils/java-diff-utils.svg?branch=master)](https://travis-ci.org/java-diff-utils/java-diff-utils) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.java-diff-utils/java-diff-utils/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.java-diff-utils/java-diff-utils) +# (outdated) java-diff-utils [![Build Status](https://travis-ci.org/java-diff-utils/java-diff-utils.svg?branch=master)](https://travis-ci.org/java-diff-utils/java-diff-utils) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.java-diff-utils/java-diff-utils/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.java-diff-utils/java-diff-utils) [![No Maintenance Intended](http://unmaintained.tech/badge.svg)](http://unmaintained.tech/) + +> **The maintained successor if this library is https://github.com/java-diff-utils/java-diff-utils** > A library for computing diffs, applying patches, generation side-by-side view in Java. @@ -44,7 +46,7 @@ This library is a fork originally created by @KengoTODA ([published on maven cen Since GitHub does not connect forks based on Google Code, other variants appeared in parallel: - https://github.com/dnaumenko/java-diff-utils - Created by the original Google Code maintainer -- https://github.com/wumpz/java-diff-utils - Created from the Google Code repository [starting in 2017](https://github.com/wumpz/java-diff-utils/commit/42fde56154afd92d2b9ef8e088185e7af0230cee). +- https://github.com/wumpz/java-diff-utils - Created from the Google Code repository [starting in 2017](https://github.com/wumpz/java-diff-utils/commit/42fde56154afd92d2b9ef8e088185e7af0230cee). Now maintained at http://github.com/java-diff-utils/java-diff-utils. ## License