diff options
| -rw-r--r-- | make/lib/semantic-versioning/VERSION | 11 | ||||
| -rw-r--r-- | make/lib/semantic-versioning/semver-src.zip | bin | 40354 -> 40997 bytes | |||
| -rw-r--r-- | make/lib/semantic-versioning/semver.jar | bin | 294397 -> 295434 bytes | |||
| -rw-r--r-- | src/junit/com/jogamp/common/util/TestVersionSemantics.java | 3 | ||||
| -rw-r--r-- | src/junit/com/jogamp/junit/util/VersionSemanticsUtil.java | 14 |
5 files changed, 14 insertions, 14 deletions
diff --git a/make/lib/semantic-versioning/VERSION b/make/lib/semantic-versioning/VERSION index 09a5894..803e0d9 100644 --- a/make/lib/semantic-versioning/VERSION +++ b/make/lib/semantic-versioning/VERSION @@ -1,10 +1,11 @@ -https://github.com/jeluard/semantic-versioning +https://github.com/sgothel/semantic-versioning + forked from https://github.com/jeluard/semantic-versioning 0.9.24-SNAPSHOT -commit dd1e89102b15eb10d8c94e9efe3a4203e5484121 -Author: Julien Eluard <[email protected]> -Date: Fri Apr 18 08:44:34 2014 -0300 +commit 731db3566b4096ecf6a08a9d33991400e66c5021 +Author: Sven Gothel <[email protected]> +Date: Tue May 13 16:15:09 2014 +0200 -branch master +branch jogamp diff --git a/make/lib/semantic-versioning/semver-src.zip b/make/lib/semantic-versioning/semver-src.zip Binary files differindex df78442..da2d33a 100644 --- a/make/lib/semantic-versioning/semver-src.zip +++ b/make/lib/semantic-versioning/semver-src.zip diff --git a/make/lib/semantic-versioning/semver.jar b/make/lib/semantic-versioning/semver.jar Binary files differindex 3c9303f..05d845d 100644 --- a/make/lib/semantic-versioning/semver.jar +++ b/make/lib/semantic-versioning/semver.jar diff --git a/src/junit/com/jogamp/common/util/TestVersionSemantics.java b/src/junit/com/jogamp/common/util/TestVersionSemantics.java index dba42b5..6a7b93a 100644 --- a/src/junit/com/jogamp/common/util/TestVersionSemantics.java +++ b/src/junit/com/jogamp/common/util/TestVersionSemantics.java @@ -78,8 +78,7 @@ public class TestVersionSemantics extends JunitTracer { static final Set<String> excludes; static { excludes = new HashSet<String>(); - excludes.add("jogamp.common.**"); - excludes.add("jogamp.android.**"); + excludes.add("^\\Qjogamp/\\E.*$"); } @Test diff --git a/src/junit/com/jogamp/junit/util/VersionSemanticsUtil.java b/src/junit/com/jogamp/junit/util/VersionSemanticsUtil.java index dd5dcd0..2c1aaf5 100644 --- a/src/junit/com/jogamp/junit/util/VersionSemanticsUtil.java +++ b/src/junit/com/jogamp/junit/util/VersionSemanticsUtil.java @@ -39,8 +39,8 @@ import org.junit.Assert; import org.osjava.jardiff.DiffCriteria; import org.semver.Comparer; import org.semver.Delta; -import org.semver.Dumper; import org.semver.Delta.Difference; +import org.semver.Dumper; import com.jogamp.common.util.IOUtil; import com.jogamp.common.util.JarUtil; @@ -52,7 +52,7 @@ public class VersionSemanticsUtil { final Delta.CompatibilityType expectedCompatibilityType, final File previousJar, final VersionNumberString preVersionNumber, final Class<?> currentJarClazz, final ClassLoader currentJarCL, final VersionNumberString curVersionNumber, - final Set<String> excludes) + final Set<String> excludesRegExp) throws IllegalArgumentException, IOException, URISyntaxException { // Get containing JAR file "TestJarsInJar.jar" and add it to the TempJarCache @@ -62,19 +62,19 @@ public class VersionSemanticsUtil { testVersion(diffCriteria, expectedCompatibilityType, previousJar, preVersionNumber, currentJar, curVersionNumber, - excludes); + excludesRegExp); } public static void testVersion(final DiffCriteria diffCriteria, final Delta.CompatibilityType expectedCompatibilityType, final File previousJar, final VersionNumberString preVersionNumber, final File currentJar, final VersionNumberString curVersionNumber, - final Set<String> excludes) + final Set<String> excludesRegExp) throws IllegalArgumentException, IOException, URISyntaxException { - final Set<String> includes = new HashSet<String>(); + final Set<String> includesRegExp = new HashSet<String>(); - final Comparer comparer = new Comparer(diffCriteria, previousJar, currentJar, includes, excludes); + final Comparer comparer = new Comparer(diffCriteria, previousJar, currentJar, includesRegExp, true, excludesRegExp, true); final Delta delta = comparer.diff(); //Validates that computed and provided compatibility type are compatible. @@ -111,7 +111,7 @@ public class VersionSemanticsUtil { final Difference diff = iter.next(); System.err.printf("Diff %4d: %-11s in class %s%n", diffI, diff.getClass().getSimpleName(), diff.getClassName()); } - Dumper.dump(delta); + Dumper.dump(delta, System.err); Assert.assertTrue(resS, compOK); |