zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-08-03 00:12:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove version pin for java-diff-utils dependency (#1667)

Browse source 
* Remove version pin for java-diff-utils dependency

Latest version of the lib introduces a small behavior change/bug fix.
It no longer ignores empty lines. This actually makes sense.

Update the test data to reflect this change.
This commit is contained in:
Weimin Yu 2022-06-13 10:35:51 -04:00 • committed by GitHub
parent 5781b8a39e
commit b92ce51147
128 changed files with 1521 additions and 1523 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/gradle/dependency-locks/testCompile.lockfile
View file

@ -11,7 +11,7 @@ com.google.guava:guava:31.1-jre
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.3
com.google.truth:truth:1.1.3
io.github.java-diff-utils:java-diff-utils:4.9
io.github.java-diff-utils:java-diff-utils:4.11
javax.inject:javax.inject:1
joda-time:joda-time:2.10.14
junit:junit:4.13.2

2
common/gradle/dependency-locks/testCompileClasspath.lockfile
View file

@ -11,7 +11,7 @@ com.google.guava:guava:31.1-jre
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.3
com.google.truth:truth:1.1.3
io.github.java-diff-utils:java-diff-utils:4.9
io.github.java-diff-utils:java-diff-utils:4.11
javax.inject:javax.inject:1
joda-time:joda-time:2.10.14
junit:junit:4.13.2

2
common/gradle/dependency-locks/testRuntime.lockfile
View file

@ -12,7 +12,7 @@ com.google.guava:guava:31.1-jre
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.3
com.google.truth:truth:1.1.3
io.github.java-diff-utils:java-diff-utils:4.9
io.github.java-diff-utils:java-diff-utils:4.11
javax.inject:javax.inject:1
joda-time:joda-time:2.10.14
junit:junit:4.13.2

2
common/gradle/dependency-locks/testRuntimeClasspath.lockfile
View file

@ -12,7 +12,7 @@ com.google.guava:guava:31.1-jre
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.3
com.google.truth:truth:1.1.3
io.github.java-diff-utils:java-diff-utils:4.9
io.github.java-diff-utils:java-diff-utils:4.11
javax.inject:javax.inject:1
joda-time:joda-time:2.10.14
junit:junit:4.13.2

2
common/gradle/dependency-locks/testingCompile.lockfile
View file

@ -11,7 +11,7 @@ com.google.guava:guava:31.1-jre
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.3
com.google.truth:truth:1.1.3
io.github.java-diff-utils:java-diff-utils:4.9
io.github.java-diff-utils:java-diff-utils:4.11
javax.inject:javax.inject:1
joda-time:joda-time:2.10.14
junit:junit:4.13.2

2
common/gradle/dependency-locks/testingCompileClasspath.lockfile
View file

@ -11,7 +11,7 @@ com.google.guava:guava:31.1-jre
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.3
com.google.truth:truth:1.1.3
io.github.java-diff-utils:java-diff-utils:4.9
io.github.java-diff-utils:java-diff-utils:4.11
javax.inject:javax.inject:1
joda-time:joda-time:2.10.14
junit:junit:4.13.2

2
common/gradle/dependency-locks/testingRuntime.lockfile
View file

@ -12,7 +12,7 @@ com.google.guava:guava:31.1-jre
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.3
com.google.truth:truth:1.1.3
io.github.java-diff-utils:java-diff-utils:4.9
io.github.java-diff-utils:java-diff-utils:4.11
javax.inject:javax.inject:1
joda-time:joda-time:2.10.14
junit:junit:4.13.2

2
common/gradle/dependency-locks/testingRuntimeClasspath.lockfile
View file

@ -12,7 +12,7 @@ com.google.guava:guava:31.1-jre
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.3
com.google.truth:truth:1.1.3
io.github.java-diff-utils:java-diff-utils:4.9
io.github.java-diff-utils:java-diff-utils:4.11
javax.inject:javax.inject:1
joda-time:joda-time:2.10.14
junit:junit:4.13.2

3
common/src/test/resources/google/registry/testing/truth/text-diff-expected.txt
View file

@ -1,3 +1,2 @@
This is a random file,
with three lines and terminates without a newline.
with three lines and terminates without a newline.

3
common/src/test/resources/google/registry/testing/truth/text-sidebyside-diff.txt
View file

@ -1,5 +1,4 @@
|Expected |Actual |
|------------------------------------------------------|-----------------------------------------------------|
|This is a random file, |This is a random file, |
| |with **two** lines and terminates **with** a newline.|
|with ~three~ lines and terminates ~without~ a newline.| |
|with ~three~ lines and terminates ~without~ a newline.|with **two** lines and terminates **with** a newline.|

3
common/src/test/resources/google/registry/testing/truth/text-unified-diff.txt
View file

@ -1,6 +1,5 @@
--- expected
+++ actual
@@ -2,2 +2,1 @@
-
@@ -2,1 +2,1 @@
-with three lines and terminates without a newline.
+with two lines and terminates with a newline.