diff options
| -rw-r--r-- | make/lib/semantic-versioning/VERSION | 39 | ||||
| -rw-r--r-- | make/lib/semantic-versioning/semver-src.zip | bin | 46469 -> 47078 bytes | |||
| -rw-r--r-- | make/lib/semantic-versioning/semver.jar | bin | 329495 -> 330548 bytes | |||
| -rw-r--r-- | src/junit/com/jogamp/common/util/TestVersionSemantics.java | 6 | ||||
| -rw-r--r-- | src/junit/com/jogamp/junit/util/VersionSemanticsUtil.java | 1 |
5 files changed, 7 insertions, 39 deletions
diff --git a/make/lib/semantic-versioning/VERSION b/make/lib/semantic-versioning/VERSION index 24d8d3c..7e5bf79 100644 --- a/make/lib/semantic-versioning/VERSION +++ b/make/lib/semantic-versioning/VERSION @@ -3,42 +3,9 @@ https://github.com/sgothel/semantic-versioning 0.9.33-SNAPSHOT -commit c714666c0f4e19bb9db163f576e28d36cad7df74 +commit a6d08112c8e09e3bb32dcdb8397919d664c9c14c Author: Sven Gothel <[email protected]> -Date: Fri Apr 3 05:00:00 2015 +0200 +Date: Fri Apr 3 23:25:40 2015 +0200 - Add Delta.CompatChange for binary compatible changes, i.e. change in method throws clause or final field value - - Change in method throws clause: - - Tools.isThrowsClauseChange(..) - - <https://docs.oracle.com/javase/specs/jls/se7/html/jls-13.html#jls-13.4.21> - - Change of final field value: - - Tools.isFieldValueChange(..) - - <https://docs.oracle.com/javase/specs/jls/se7/html/jls-13.html#jls-13.4.9> - - -commit 616f566cfe60638eb97823e1f63cf203161502da -Author: Sven Gothel <[email protected]> -Date: Wed Sep 24 01:08:38 2014 +0200 - - Fix jardiff's Tools.isAccessChange(..): Differentiate between Class, Field and Method and apply all rules of the Java Language Specification - - Class, Field and Methods have different binary backward compatibility rules - as specified in the Java Language Specification, Java SE 7 Edition: - - http://docs.oracle.com/javase/specs/jls/se7/html/jls-13.html - - For Field 'volatile' the Java Language Specification, first edition has been used: - - http://www.wsu.edu/UNIX_Systems/java/langspec-1.0/13.doc.html#45194 - - For each type separate method have been created, i.e. Tools.is<Type>AccessChange(). - Each new method has the rules referenced and partially copied into the method - for better documentation. - - The now deprecated method Tools.isAccessChange(..) calls Tools.isClassAccessChange(..) - and shall be removed. - - Unit test ToolsTest has been expanded for each type and its rules. - -branch jogamp + Add CompatibilityType.BACKWARD_COMPATIBLE_BINARY: Allowing changes in throw-clause and field-value diff --git a/make/lib/semantic-versioning/semver-src.zip b/make/lib/semantic-versioning/semver-src.zip Binary files differindex c1d867b..145c9f9 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 e93b0c2..b8d4054 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 4fe4bcd..f1e9c6e 100644 --- a/src/junit/com/jogamp/common/util/TestVersionSemantics.java +++ b/src/junit/com/jogamp/common/util/TestVersionSemantics.java @@ -100,14 +100,14 @@ public class TestVersionSemantics extends SingletonJunitCase { VersionSemanticsUtil.testVersion(diffCriteria, expectedCompatibilityType, previousJar, preVersionNumber, - currentJar, curVersionNumber, - excludes); + currentJar, curVersionNumber, excludes); } @Test public void testVersionV230V23x() throws IllegalArgumentException, IOException, URISyntaxException { // final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.NON_BACKWARD_COMPATIBLE; - final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.BACKWARD_COMPATIBLE_USER; + // final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.BACKWARD_COMPATIBLE_USER; + final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.BACKWARD_COMPATIBLE_BINARY; final VersionNumberString preVersionNumber = new VersionNumberString("2.3.0"); final File previousJar = new File("lib/v"+preVersionNumber.getVersionString()+"/"+jarFile); diff --git a/src/junit/com/jogamp/junit/util/VersionSemanticsUtil.java b/src/junit/com/jogamp/junit/util/VersionSemanticsUtil.java index 32ea816..de850d0 100644 --- a/src/junit/com/jogamp/junit/util/VersionSemanticsUtil.java +++ b/src/junit/com/jogamp/junit/util/VersionSemanticsUtil.java @@ -89,6 +89,7 @@ public class VersionSemanticsUtil { System.err.println(" criteria: "+diffCriteria); System.err.println(" Previous version: "+preVersionNumber+" - "+previousJar.toString()); System.err.println(" Current version: "+curVersionNumber+" - "+currentJar.toString()); + System.err.println(" Field values changed: "+delta.fieldCompatChanged()); System.err.println(" Compat. expected: "+expectedCompatibilityType); System.err.println(" Compat. detected: "+detectedCompatibilityType); System.err.println(" Compat. result: detected "+compS+" expected -> "+(compOK ? "OK" : "ERROR")); |