Use different module names for hamcrest jars.

tumbarumba · tumbarumba · commit c1ea49a115a3 · 2019-08-25T02:35:43.000+10:00
Resolves issue #269. Changes the module name of hamcrest-core and hamcrest-libary to avoid split package problems with Java 9.
diff --git a/hamcrest-core/hamcrest-core.gradle b/hamcrest-core/hamcrest-core.gradle
@@ -7,7 +7,7 @@ jar {
         attributes 'Implementation-Title': project.name,
                 'Implementation-Vendor': 'hamcrest.org',
                 'Implementation-Version': version,
-                'Automatic-Module-Name': 'org.hamcrest'
+                'Automatic-Module-Name': 'org.hamcrest.core.deprecated'
     }
 }
 
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/deprecated/HamcrestCoreIsDeprecated.java b/hamcrest-core/src/main/java/org/hamcrest/core/deprecated/HamcrestCoreIsDeprecated.java
@@ -1,4 +1,4 @@
-package org.hamcrest;
+package org.hamcrest.core.deprecated;
 
 /**
  * All the classes in <code>hamcrest-core.jar</code> have moved to
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/deprecated/package-info.java b/hamcrest-core/src/main/java/org/hamcrest/core/deprecated/package-info.java
@@ -2,4 +2,4 @@
  * All classes in <code>hamcrest-core.jar</code> have been migrated to
  * <code>hamcrest.jar</code>. Please use that dependency instead.
  */
-package org.hamcrest;
+package org.hamcrest.core.deprecated;
diff --git a/hamcrest-library/hamcrest-library.gradle b/hamcrest-library/hamcrest-library.gradle
@@ -7,7 +7,7 @@ jar {
         attributes 'Implementation-Title': project.name,
                 'Implementation-Vendor': 'hamcrest.org',
                 'Implementation-Version': version,
-                'Automatic-Module-Name': 'org.hamcrest'
+                'Automatic-Module-Name': 'org.hamcrest.library.deprecated'
     }
 }
 
diff --git a/hamcrest-library/src/main/java/org/hamcrest/library/deprecated/HamcrestLibraryIsDeprecated.java b/hamcrest-library/src/main/java/org/hamcrest/library/deprecated/HamcrestLibraryIsDeprecated.java
@@ -1,4 +1,4 @@
-package org.hamcrest;
+package org.hamcrest.library.deprecated;
 
 /**
  * All the classes in <code>hamcrest-library.jar</code> have moved to
diff --git a/hamcrest-library/src/main/java/org/hamcrest/library/deprecated/package-info.java b/hamcrest-library/src/main/java/org/hamcrest/library/deprecated/package-info.java
@@ -2,4 +2,4 @@
  * All classes in <code>hamcrest-library.jar</code> have been migrated to
  * <code>hamcrest.jar</code>. Please use that dependency instead.
  */
-package org.hamcrest;
+package org.hamcrest.library.deprecated;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ jar {`
`7`	`7`	`attributes 'Implementation-Title': project.name,`
`8`	`8`	`'Implementation-Vendor': 'hamcrest.org',`
`9`	`9`	`'Implementation-Version': version,`
`10`		`- 'Automatic-Module-Name': 'org.hamcrest'`
	`10`	`+ 'Automatic-Module-Name': 'org.hamcrest.core.deprecated'`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.hamcrest;`
	`1`	`+package org.hamcrest.core.deprecated;`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* All the classes in <code>hamcrest-core.jar</code> have moved to`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.hamcrest;`
	`1`	`+package org.hamcrest.library.deprecated;`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* All the classes in <code>hamcrest-library.jar</code> have moved to`