Skip to content

Update to IBM dependencies #3239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisdennis merged 1 commit into from
Aug 3, 2024
Merged

Update to IBM dependencies #3239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build-logic/src/main/java/org/ehcache/build/conventions/JavaConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public void apply(Project project) {
config.getResolutionStrategy().dependencySubstitution(subs -> {
subs.substitute(subs.module("org.hamcrest:hamcrest-core:1.3")).with(subs.module("org.hamcrest:hamcrest-core:" + project.property("hamcrestVersion")));
subs.substitute(subs.module("org.hamcrest:hamcrest-library:1.3")).with(subs.module("org.hamcrest:hamcrest-library:" + project.property("hamcrestVersion")));
subs.substitute(subs.module("junit:junit:4.12")).using(subs.module("junit:junit:4.13.1"));
});
});
}
Expand Down
2 changes: 1 addition & 1 deletion clustered/ehcache-clustered/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ tasks.named('jar') {
osgi {
instruction Constants.BUNDLE_SYMBOLICNAME, 'org.ehcache.clustered'
instruction Constants.EXPORT_PACKAGE, '!com.tc.*, !com.terracotta.*, !org.terracotta.*, !org.ehcache.*.internal.*, !sun.misc, org.ehcache.clustered.client.*, org.ehcache.clustered.common.*'
instruction Constants.IMPORT_PACKAGE, '!sun.misc.*, org.ehcache.xml.*;resolution:=optional, jdk.jfr.*;resolution:=optional, javax.xml.bind*;version="[2.2,3)", *'
instruction Constants.IMPORT_PACKAGE, '!sun.misc.*, jdk.internal.misc;resolution:=optional, org.ehcache.xml.*;resolution:=optional, jdk.jfr.*;resolution:=optional, javax.xml.bind*;version="[2.2,3)", *'
}
}

Expand Down
4 changes: 2 additions & 2 deletions ehcache/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ tasks.named('jakartaJar') {
instruction Constants.BUNDLE_DESCRIPTION, 'Ehcache is an open-source caching library, compliant with the JSR-107 standard.'
instruction Constants.BUNDLE_ACTIVATOR, 'org.ehcache.core.osgi.EhcacheActivator'
instruction Constants.EXPORT_PACKAGE, '!org.ehcache.jsr107.tck, !org.ehcache.*.internal.*, org.ehcache.*'
instruction Constants.IMPORT_PACKAGE, 'javax.cache.*;resolution:=optional, !javax.annotation, !sun.misc, jakarta.xml.bind*;version="[3,4)", *'
instruction Constants.IMPORT_PACKAGE, 'javax.cache.*;resolution:=optional, jdk.internal.misc;resolution:=optional, !javax.annotation, !sun.misc, jakarta.xml.bind*;version="[3,4)", *'
}
}

Expand All @@ -114,6 +114,6 @@ tasks.named('jar') {
instruction Constants.BUNDLE_DESCRIPTION, 'Ehcache is an open-source caching library, compliant with the JSR-107 standard.'
instruction Constants.BUNDLE_ACTIVATOR, 'org.ehcache.core.osgi.EhcacheActivator'
instruction Constants.EXPORT_PACKAGE, '!org.ehcache.jsr107.tck, !org.ehcache.*.internal.*, org.ehcache.*'
instruction Constants.IMPORT_PACKAGE, 'javax.cache.*;resolution:=optional, !javax.annotation, !sun.misc, javax.xml.bind*;version="[2.2,3)", *'
instruction Constants.IMPORT_PACKAGE, 'javax.cache.*;resolution:=optional, jdk.internal.misc;resolution:=optional, !javax.annotation, !sun.misc, javax.xml.bind*;version="[2.2,3)", *'
}
}
16 changes: 8 additions & 8 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
ehcacheVersion = 3.11-SNAPSHOT

# Terracotta third parties
offheapVersion = 2.5.5
statisticVersion = 2.1.2
offheapVersion = 2.5.6
statisticVersion = 2.1.3
jcacheVersion = 1.1.0
slf4jVersion = 1.7.36
sizeofVersion = 0.4.3
sizeofVersion = 0.4.4

# Terracotta clustered
terracottaPlatformVersion = 5.10.21
terracottaApisVersion = 1.9.0
terracottaCoreVersion = 5.10.14
terracottaPassthroughTestingVersion = 1.9.0
terracottaUtilitiesVersion = 0.0.17
terracottaPlatformVersion = 5.10.22
terracottaApisVersion = 1.9.1
terracottaCoreVersion = 5.10.15
terracottaPassthroughTestingVersion = 1.9.1
terracottaUtilitiesVersion = 0.0.19

# Test lib versions
junitVersion = 4.13.1
Expand Down