Skip to content

Commit c1ea49a

Browse files
committed
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.
1 parent 976a60f commit c1ea49a

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

hamcrest-core/hamcrest-core.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jar {
77
attributes 'Implementation-Title': project.name,
88
'Implementation-Vendor': 'hamcrest.org',
99
'Implementation-Version': version,
10-
'Automatic-Module-Name': 'org.hamcrest'
10+
'Automatic-Module-Name': 'org.hamcrest.core.deprecated'
1111
}
1212
}
1313

hamcrest-core/src/main/java/org/hamcrest/HamcrestCoreIsDeprecated.java hamcrest-core/src/main/java/org/hamcrest/core/deprecated/HamcrestCoreIsDeprecated.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.hamcrest;
1+
package org.hamcrest.core.deprecated;
22

33
/**
44
* All the classes in <code>hamcrest-core.jar</code> have moved to

hamcrest-core/src/main/java/org/hamcrest/package-info.java hamcrest-core/src/main/java/org/hamcrest/core/deprecated/package-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
* All classes in <code>hamcrest-core.jar</code> have been migrated to
33
* <code>hamcrest.jar</code>. Please use that dependency instead.
44
*/
5-
package org.hamcrest;
5+
package org.hamcrest.core.deprecated;

hamcrest-library/hamcrest-library.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jar {
77
attributes 'Implementation-Title': project.name,
88
'Implementation-Vendor': 'hamcrest.org',
99
'Implementation-Version': version,
10-
'Automatic-Module-Name': 'org.hamcrest'
10+
'Automatic-Module-Name': 'org.hamcrest.library.deprecated'
1111
}
1212
}
1313

hamcrest-library/src/main/java/org/hamcrest/HamcrestLibraryIsDeprecated.java hamcrest-library/src/main/java/org/hamcrest/library/deprecated/HamcrestLibraryIsDeprecated.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.hamcrest;
1+
package org.hamcrest.library.deprecated;
22

33
/**
44
* All the classes in <code>hamcrest-library.jar</code> have moved to

hamcrest-library/src/main/java/org/hamcrest/package-info.java hamcrest-library/src/main/java/org/hamcrest/library/deprecated/package-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
* All classes in <code>hamcrest-library.jar</code> have been migrated to
33
* <code>hamcrest.jar</code>. Please use that dependency instead.
44
*/
5-
package org.hamcrest;
5+
package org.hamcrest.library.deprecated;

0 commit comments

Comments
 (0)