From c1ea49a115a381c92b27513d59eeea38ba5ae1c0 Mon Sep 17 00:00:00 2001
From: Joe Schmetzer <joe@exubero.com>
Date: Sat, 24 Aug 2019 02:44:08 +1000
Subject: [PATCH] Use different module names for hamcrest jars.

Resolves issue #269. Changes the module name of hamcrest-core and
hamcrest-libary to avoid split package problems with Java 9.
---
 hamcrest-core/hamcrest-core.gradle                              | 2 +-
 .../{ => core/deprecated}/HamcrestCoreIsDeprecated.java         | 2 +-
 .../java/org/hamcrest/{ => core/deprecated}/package-info.java   | 2 +-
 hamcrest-library/hamcrest-library.gradle                        | 2 +-
 .../{ => library/deprecated}/HamcrestLibraryIsDeprecated.java   | 2 +-
 .../org/hamcrest/{ => library/deprecated}/package-info.java     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename hamcrest-core/src/main/java/org/hamcrest/{ => core/deprecated}/HamcrestCoreIsDeprecated.java (83%)
 rename hamcrest-core/src/main/java/org/hamcrest/{ => core/deprecated}/package-info.java (79%)
 rename hamcrest-library/src/main/java/org/hamcrest/{ => library/deprecated}/HamcrestLibraryIsDeprecated.java (82%)
 rename hamcrest-library/src/main/java/org/hamcrest/{ => library/deprecated}/package-info.java (78%)

diff --git a/hamcrest-core/hamcrest-core.gradle b/hamcrest-core/hamcrest-core.gradle
index 962c4917..d2a91f8e 100644
--- 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/HamcrestCoreIsDeprecated.java b/hamcrest-core/src/main/java/org/hamcrest/core/deprecated/HamcrestCoreIsDeprecated.java
similarity index 83%
rename from hamcrest-core/src/main/java/org/hamcrest/HamcrestCoreIsDeprecated.java
rename to hamcrest-core/src/main/java/org/hamcrest/core/deprecated/HamcrestCoreIsDeprecated.java
index 53a4d904..19482c3d 100644
--- a/hamcrest-core/src/main/java/org/hamcrest/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/package-info.java b/hamcrest-core/src/main/java/org/hamcrest/core/deprecated/package-info.java
similarity index 79%
rename from hamcrest-core/src/main/java/org/hamcrest/package-info.java
rename to hamcrest-core/src/main/java/org/hamcrest/core/deprecated/package-info.java
index 4b9bbffe..394ab821 100644
--- a/hamcrest-core/src/main/java/org/hamcrest/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;
\ No newline at end of file
+package org.hamcrest.core.deprecated;
\ No newline at end of file
diff --git a/hamcrest-library/hamcrest-library.gradle b/hamcrest-library/hamcrest-library.gradle
index 1ca40d51..fd8d19d1 100644
--- 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/HamcrestLibraryIsDeprecated.java b/hamcrest-library/src/main/java/org/hamcrest/library/deprecated/HamcrestLibraryIsDeprecated.java
similarity index 82%
rename from hamcrest-library/src/main/java/org/hamcrest/HamcrestLibraryIsDeprecated.java
rename to hamcrest-library/src/main/java/org/hamcrest/library/deprecated/HamcrestLibraryIsDeprecated.java
index 4f45311d..b7ec20c3 100644
--- a/hamcrest-library/src/main/java/org/hamcrest/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/package-info.java b/hamcrest-library/src/main/java/org/hamcrest/library/deprecated/package-info.java
similarity index 78%
rename from hamcrest-library/src/main/java/org/hamcrest/package-info.java
rename to hamcrest-library/src/main/java/org/hamcrest/library/deprecated/package-info.java
index 9e73d768..c98f5aff 100644
--- a/hamcrest-library/src/main/java/org/hamcrest/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;
\ No newline at end of file
+package org.hamcrest.library.deprecated;
\ No newline at end of file