This is an automated email from the ASF dual-hosted git repository.
alexoree pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
from 61cca49cb Merge pull request #452 from spyhunter99/feature/JSPWIKI-1234
add 555b147d9 JSPWIKI-794 updates the dependency for diffs. removes
org.jvnet.hudson:org.suigeneris.jrcs.diff in favor of java-diff-utils
add 3a869faf9 Merge remote-tracking branch 'upstream/master' into
feature/JSPWIKI-794-diff-replacement
new c6dbf7535 Merge pull request #446 from
spyhunter99/feature/JSPWIKI-794-diff-replacement
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
jspwiki-main/pom.xml | 4 +-
.../apache/wiki/diff/ContextualDiffProvider.java | 417 ---------------------
.../apache/wiki/diff/DefaultDifferenceManager.java | 2 +-
.../org/apache/wiki/diff/SvnStyleDiffProvider.java | 119 ++++++
.../apache/wiki/diff/TraditionalDiffProvider.java | 187 ---------
.../java/org/apache/wiki/filters/SpamFilter.java | 66 ++--
.../src/main/resources/ini/jspwiki.properties | 9 +-
...iderTest.java => SvnStyleDiffProviderTest.java} | 122 +++---
pom.xml | 13 +-
9 files changed, 216 insertions(+), 723 deletions(-)
delete mode 100644
jspwiki-main/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java
create mode 100644
jspwiki-main/src/main/java/org/apache/wiki/diff/SvnStyleDiffProvider.java
delete mode 100644
jspwiki-main/src/main/java/org/apache/wiki/diff/TraditionalDiffProvider.java
rename
jspwiki-main/src/test/java/org/apache/wiki/diff/{ContextualDiffProviderTest.java
=> SvnStyleDiffProviderTest.java} (51%)
