Skip to content

Commit

Permalink
Enable build steps for jdk11 onward
Browse files Browse the repository at this point in the history
Previously some build steps were disabled when a non-jdk8 JVM, either
due to compatibility or due to being a secondary CI build. This no
longer applies and it was an oversight to not enable them.
  • Loading branch information
ben-manes committed Apr 30, 2021
1 parent 3d735bc commit d3488a7
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 23 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -150,7 +150,7 @@ tasks.coveralls {
description = 'Uploads the aggregated coverage report to Coveralls'

dependsOn jacocoRootReport
onlyIf { System.env.'CI' && !JavaVersion.current().isJava9Compatible() }
onlyIf { System.env.'CI' }
}

def isNonStable = { String version ->
Expand Down
Expand Up @@ -571,7 +571,7 @@ public Caffeine<K, V> softValues() {
* removed
* @return this {@code Caffeine} instance (for chaining)
* @throws IllegalArgumentException if {@code duration} is negative
* @throws IllegalStateException if the time to live or time to idle was already set
* @throws IllegalStateException if the time to live or variable expiration was already set
* @throws ArithmeticException for durations greater than +/- approximately 292 years
*/
public Caffeine<K, V> expireAfterWrite(Duration duration) {
Expand Down Expand Up @@ -630,7 +630,7 @@ boolean expiresAfterWrite() {
* automatically removed
* @return this {@code Caffeine} instance (for chaining)
* @throws IllegalArgumentException if {@code duration} is negative
* @throws IllegalStateException if the time to idle or time to live was already set
* @throws IllegalStateException if the time to idle or variable expiration was already set
* @throws ArithmeticException for durations greater than +/- approximately 292 years
*/
public Caffeine<K, V> expireAfterAccess(Duration duration) {
Expand Down
2 changes: 0 additions & 2 deletions caffeine/testing.gradle
Expand Up @@ -59,8 +59,6 @@ task isolatedTests(type: Test, group: 'Cache tests') {
}

task osgiTests(type: Test, group: 'Cache tests', description: 'Isolated OSGi tests') {
enabled = !JavaVersion.current().isJava9Compatible()

useJUnit()
tasks.test.dependsOn(it)
systemProperty 'caffeine.osgi.jar', project(':caffeine').jar.archivePath.path
Expand Down
10 changes: 10 additions & 0 deletions checksum.xml
Expand Up @@ -217,6 +217,7 @@
<trusted-key id='c03ef1d7d692bcff' group='org.scala-lang' />
<trusted-key id='64163449a529ab1e' group='org.scala-lang.modules' />
<trusted-key id='2c7b12f2a511e325' group='org.slf4j' />
<trusted-key id='2161d72e7dcd4258' group='org.sonarsource.scanner.api' />
<trusted-key id='cfca4a29d26468de' group='org.sonarsource.scanner.api' />
<trusted-key id='cfca4a29d26468de' group='org.sonarsource.scanner.gradle' />
<trusted-key id='9440c8d6decafa12' group='org.testng' />
Expand Down Expand Up @@ -391,6 +392,9 @@
<dependency group='gradle.plugin.com.github.spotbugs.snom' module='spotbugs-gradle-plugin' version='4.7.0'>
<sha512>4D2D1FBDC1C8EBF905F8BCE824B3B87DEF250BFE77465D68A24A5FB348B40AED821AFD24060132A7320920F7C87B3A4B8373ECFD033C08D4660A625C6CD8B5C5</sha512>
</dependency>
<dependency group='gradle.plugin.com.github.spotbugs.snom' module='spotbugs-gradle-plugin' version='4.7.1'>
<sha512>8138BCC41F3573FABC75DAB54D73303408301880ABD63838E0CFB2E6C9405CF54DB623684536209035FA31ADE4E6D627A4C11460C98FF29EFC0A372B40375F93</sha512>
</dependency>
<dependency group='gradle.plugin.com.github.spotbugs' module='spotbugs-gradle-plugin' version='2.0.0'>
<sha512>B3BFAD07E6A3D4D73CBCE802D8614CF4AC84E589166D243D41028DC077F84C027DF4D514F145360405F37DA73A8F2E7B65D90877A9EE1151174D2440530F9051</sha512>
</dependency>
Expand All @@ -406,6 +410,9 @@
<dependency group='io.github.gradle-nexus' module='publish-plugin' version='1.0.0'>
<sha512>B57469B9FA2C5D598688FF9C6A3B3283496921B91E269EA6D5A1DA6511125BD2545E2CFA8D3736739787B0BACF69C0AF5C5ECDEA474CB9FD56C96495E654682B</sha512>
</dependency>
<dependency group='io.github.gradle-nexus' module='publish-plugin' version='1.1.0'>
<sha512>8D72884FB1D818ACB2732128FD96C1C3AAF7F89670EE505BEA419621B287D028AD61CFAEDB71B23BCB80491500BD7A30D5450F1CF6C326013310F6053479911A</sha512>
</dependency>
<dependency group='javax.inject' module='javax.inject' version='1'>
<sha512>E126B7CCF3E42FD1984A0BEEF1004A7269A337C202E59E04E8E2AF714280D2F2D8D2BA5E6F59481B8DCD34AAF35C966A688D0B48EC7E96F102C274DC0D3B381E</sha512>
</dependency>
Expand Down Expand Up @@ -573,6 +580,9 @@
<dependency group='org.sonarsource.scanner.gradle' module='sonarqube-gradle-plugin' version='3.1'>
<sha512>EB7805D2B2321B4C0537C4BC228E2485EF374ED22F37001AAAA4790A983B6DE3642E19DFDF3ADECFC5921BAEA0FFBD092901955D8184AA67969C5B32A912108E</sha512>
</dependency>
<dependency group='org.sonarsource.scanner.gradle' module='sonarqube-gradle-plugin' version='3.2.0'>
<sha512>7B0855B530B6AB5271CE774876DEB2CF98FED7BDC2A15989FD80B524C3CAD650EE40EC32DEE5476D08B7981FBF20FF7D860F3084A834D39289E688BA15907230</sha512>
</dependency>
<dependency group='org.testng' module='testng' version='7.0.0'>
<sha512>D31295F9998A446F62AE7BA9B7EE39A0F898D9B185047800920B72EE53632EC54A7BDD9E5BE4BB41EFAFE9D4C209DC4227CE6C9CC230301FE762875EFBC3F7C9</sha512>
</dependency>
Expand Down
20 changes: 9 additions & 11 deletions gradle/dependencies.gradle
Expand Up @@ -35,13 +35,13 @@ ext {
commonsIo: '2.8.0',
concurrentlinkedhashmap: '1.4.2',
config: '1.4.1',
ehcache3: '3.9.2',
ehcache3: '3.9.3',
errorprone: '2.6.0',
errorproneJavac: '9+181-r4173-1',
elasticSearch: '7.12.0',
elasticSearch: '7.12.1',
expiringMap: '0.5.9',
fastfilter: '1.0',
fastutil: '8.5.2',
fastutil: '8.5.4',
flipTables: '1.1.0',
googleJavaFormat: '1.10.0',
guava: '30.1.1-jre',
Expand All @@ -67,7 +67,6 @@ ext {
]
testVersions = [
awaitility: '4.0.3',
easymock: '4.3',
guice: '5.0.1',
hamcrest: '2.2',
jcacheTck: '1.1.1',
Expand All @@ -85,25 +84,25 @@ ext {
pluginVersions = [
bnd: '5.3.0',
checkerFramework: '0.5.19',
checkstyle: '8.41.1',
checkstyle: '8.42',
coveralls: '2.8.4',
errorprone: '2.0.1',
jacoco: '0.8.6',
jmh: '0.5.3',
jmhReport: '0.9.0',
nexusPublish: '1.0.0',
nexusPublish: '1.1.0',
nullaway: '1.1.0',
pmd: '6.33.0',
pmd: '6.34.0',
semanticVersioning: '1.1.0',
shadow: '6.1.0',
sonarqube: '3.1.1',
sonarqube: '3.2.0',
spotbugs: '4.2.3',
spotbugsPlugin: '4.7.0',
spotbugsPlugin: '4.7.1',
stats: '0.2.2',
versions: '0.38.0',
]
annotationProcessorVersions = [
autoValue: '1.8',
autoValue: '1.8.1',
autoValueBuilder: '2.9.3',
]

Expand Down Expand Up @@ -155,7 +154,6 @@ ext {
]
testLibraries = [
awaitility: "org.awaitility:awaitility:${testVersions.awaitility}",
easymock: "org.easymock:easymock:${testVersions.easymock}",
guavaTestLib: dependencies.create("com.google.guava:guava-testlib:${versions.guava}") {
exclude group: 'com.google.truth'
exclude group: 'junit'
Expand Down
2 changes: 0 additions & 2 deletions guava/build.gradle
Expand Up @@ -10,7 +10,6 @@ dependencies {
testImplementation testLibraries.junit
testImplementation testLibraries.truth
testImplementation testLibraries.jctools
testImplementation testLibraries.easymock
testImplementation testLibraries.guavaTestLib
}

Expand Down Expand Up @@ -39,7 +38,6 @@ test {
}

task osgiTests(type: Test, group: 'Cache tests', description: 'Isolated OSGi tests') {
enabled = !JavaVersion.current().isJava9Compatible()
tasks.test.dependsOn(it)

useJUnit {
Expand Down
2 changes: 0 additions & 2 deletions simulator/build.gradle
Expand Up @@ -71,8 +71,6 @@ tasks.withType(JavaCompile) {

tasks.withType(Javadoc) {
options.addStringOption('Xdoclint:none', '-quiet')
// https://github.com/akka/akka/issues/21165
enabled = !JavaVersion.current().isJava9Compatible()
}

run {
Expand Down
Expand Up @@ -65,7 +65,7 @@ public BloomFilter(Config config) {
* number of insertions. This operation forgets all previous memberships when resizing.
*
* @param expectedInsertions the number of expected insertions
* @param fpp the false positive probability, where 0.0 > fpp < 1.0
* @param fpp the false positive probability, where {@literal 0.0 > fpp < 1.0}
*/
public void ensureCapacity(@NonNegative long expectedInsertions, @NonNegative double fpp) {
checkArgument(expectedInsertions >= 0);
Expand Down
Expand Up @@ -37,6 +37,8 @@
* Implementation here differs from ClockProPolicy only in adjusting coldTarget and tracking for
* demoted status part. Below is a summarize of coldTarget adjusting differences between ClockPro
* and ClockPro+.
* <pre>
* {@literal
* +-----------------------------------------------------------------------------------+
* | ClockPro ColdTarget Adaption Algorithm Summary |
* +------+----------+-----------------------------------------------------------------+
Expand All @@ -55,7 +57,8 @@
* | Size | increase | d = (demoted size / non-resident size); d < 1 ? +1 : +d |
* | | decrease | d = (non-resident size / demoted size); d < 1 ? -1 : -d |
* +------+----------+-----------------------------------------------------------------+
*
* }
* </pre>
* This algorithm uses non-resident cold entries size to calculate adaption size so changing
* non-resident-multiplier may affect the adaption algorithm. In the author's research code
* percent-max-resident-cold was set to 0.5x.
Expand Down
Expand Up @@ -42,7 +42,7 @@
* total cache size and items are evicted from the tail of a queue to the head of the next lower
* queue to maintain the size invariants. Items evicted from queue 0 are evicted from the cache."
*
* For more details, see <a href="http://www.cs.cornell.edu/~qhuang/papers/sosp_fbanalysis.pdf"An
* For more details, see <a href="http://www.cs.cornell.edu/~qhuang/papers/sosp_fbanalysis.pdf">An
* Analysis of Facebook Photo Caching</a>.
*
* @author ben.manes@gmail.com (Ben Manes)
Expand Down

0 comments on commit d3488a7

Please sign in to comment.