Skip to content

Commit c5c61b0

Browse files
SamuelBussmannSamuelBussmann
authored
Merge branch 'ehcache:master' into event-firing-veto
2 parents 248e59a + 1da5a94 commit c5c61b0

19 files changed

Lines changed: 275 additions & 18 deletions

‎.cra/.cveignore‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
[
2+
{
3+
"cve": "CVE-2022-42920",
4+
"alwaysOmit": true,
5+
"comment": "testing"
6+
},
7+
{
8+
"cve": "CVE-2022-42889",
9+
"alwaysOmit": true,
10+
"comment": "testing"
11+
},
12+
{
13+
"cve": "CVE-2022-25647",
14+
"alwaysOmit": true,
15+
"comment": "testing"
16+
},
17+
{
18+
"cve": "CVE-2014-0114",
19+
"alwaysOmit": true,
20+
"comment": "testing"
21+
},
22+
{
23+
"cve": "CVE-2019-10086",
24+
"alwaysOmit": true,
25+
"comment": "testing"
26+
},
27+
{
28+
"cve": "CVE-2020-8908",
29+
"alwaysOmit": true,
30+
"comment": "testing"
31+
},
32+
{
33+
"cve": "CVE-2021-29425",
34+
"alwaysOmit": true,
35+
"comment": "testing"
36+
},
37+
{
38+
"cve": "CVE-2023-2976",
39+
"alwaysOmit": true,
40+
"comment": "testing"
41+
},
42+
{
43+
"cve": "CVE-2024-12798",
44+
"alwaysOmit": true,
45+
"comment": "testing"
46+
},
47+
{
48+
"cve": "CVE-2024-12801",
49+
"alwaysOmit": true,
50+
"comment": "testing"
51+
},
52+
{
53+
"cve": "CVE-2024-31573",
54+
"alwaysOmit": true,
55+
"comment": "testing"
56+
},
57+
{
58+
"cve": "CVE-2024-47554",
59+
"alwaysOmit": true,
60+
"comment": "testing"
61+
},
62+
{
63+
"cve": "CVE-2025-48734",
64+
"alwaysOmit": true,
65+
"comment": "testing"
66+
},
67+
{
68+
"cve": "CVE-2025-48924",
69+
"alwaysOmit": true,
70+
"comment": "testing"
71+
}
72+
]

‎.cra/.fileignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
build-logic
2+
azure*
3+
Jenkinsfile
4+
demos/
5+
# we use gradle to handle Dockerfiles
6+
**/Dockerfile

‎.cra/.secrets.baseline‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
{
2+
"exclude": {
3+
"files": "^.secrets.baseline$",
4+
"lines": null
5+
},
6+
"generated_at": "2025-09-25T12:32:30Z",
7+
"plugins_used": [
8+
{
9+
"name": "AWSKeyDetector"
10+
},
11+
{
12+
"name": "ArtifactoryDetector"
13+
},
14+
{
15+
"name": "AzureStorageKeyDetector"
16+
},
17+
{
18+
"base64_limit": 4.5,
19+
"name": "Base64HighEntropyString"
20+
},
21+
{
22+
"name": "BasicAuthDetector"
23+
},
24+
{
25+
"name": "BoxDetector"
26+
},
27+
{
28+
"name": "CloudantDetector"
29+
},
30+
{
31+
"ghe_instance": "github.ibm.com",
32+
"name": "GheDetector"
33+
},
34+
{
35+
"name": "GitHubTokenDetector"
36+
},
37+
{
38+
"hex_limit": 3,
39+
"name": "HexHighEntropyString"
40+
},
41+
{
42+
"name": "IbmCloudIamDetector"
43+
},
44+
{
45+
"name": "IbmCosHmacDetector"
46+
},
47+
{
48+
"name": "JwtTokenDetector"
49+
},
50+
{
51+
"keyword_exclude": null,
52+
"name": "KeywordDetector"
53+
},
54+
{
55+
"name": "MailchimpDetector"
56+
},
57+
{
58+
"name": "NpmDetector"
59+
},
60+
{
61+
"name": "PrivateKeyDetector"
62+
},
63+
{
64+
"name": "SlackDetector"
65+
},
66+
{
67+
"name": "SoftlayerDetector"
68+
},
69+
{
70+
"name": "SquareOAuthDetector"
71+
},
72+
{
73+
"name": "StripeDetector"
74+
},
75+
{
76+
"name": "TwilioKeyDetector"
77+
}
78+
],
79+
"results": {
80+
"docs/css/font-awesome.min.css": [
81+
{
82+
"hashed_secret": "3b3c84f10a63cb8e95b93ea5f46e02d885153f5d",
83+
"is_secret": false,
84+
"is_verified": false,
85+
"line_number": 4,
86+
"type": "Secret Keyword",
87+
"verified_result": null
88+
}
89+
],
90+
"gradle.properties": [
91+
{
92+
"hashed_secret": "e415ece8638b3d0936f205e8da03d87b267f998b",
93+
"is_secret": false,
94+
"is_verified": false,
95+
"line_number": 27,
96+
"type": "Secret Keyword",
97+
"verified_result": null
98+
}
99+
]
100+
},
101+
"version": "0.13.1+ibm.62.dss",
102+
"word_list": {
103+
"file": null,
104+
"hash": null
105+
}
106+
}

‎.cra/cra-scan-custom-script.sh‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#!/usr/bin/env bash
2+
3+
echo "Begin CRA custom script"
4+
5+
if [[ "${PIPELINE_DEBUG:-0}" == 1 ]]; then
6+
trap env EXIT
7+
env | sort
8+
set -x
9+
fi
10+
11+
export BUILD_ARM_TOKEN=$(get_env jfrog_func_is_token)
12+
export BUILD_ARM_PASSWORD=$(get_env jfrog_func_is_token)
13+
export BUILD_ARM_USERNAME=Ibm-webmethods-integration-server@ibm.com
14+
15+
16+
which java
17+
java -version
18+
cat /etc/*elease*
19+
id
20+
21+
# Install JDK 17
22+
dnf install -y java-17-openjdk-devel
23+
export JAVA_HOME=/usr/lib/jvm/java-17
24+
$JAVA_HOME/bin/java -version
25+
26+
27+
# debug: dump all scripts
28+
find /opt/commons/compliance-checks | while read filename ; do
29+
echo =========== BEGIN FILE $filename ===========
30+
cat $filename
31+
echo =========== END FILE $filename ===========
32+
done
33+
34+
echo "End CRA custom script"
35+

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
.gradle/
33
**/build/
44
!**/src/**/build/
5+
.dependency-check-data/

‎Jenkinsfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@
1717

1818
//See Jenkins wiki pages for info
1919
checkmarxBuild checkmarx_project_name: 'Terracotta DB (TDB) Ehcache OSS'
20+
gradleBuild jdk: '17+'

‎azure-pipelines-static-analysis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@ resources:
2727
jobs:
2828
- template: build-templates/gradle-common.yml@templates
2929
parameters:
30+
jdkVersion: '17'
3031
gradleTasks: 'check'

‎build.gradle‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,26 @@ allprojects {
2929
version = findProperty('overrideVersion') ?: ehcacheVersion
3030
}
3131

32-
assert (JavaVersion.current().isJava8Compatible()) : 'The Ehcache 3 build requires Java 8+ to run'
32+
assert JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17) : 'The Ehcache 3 build requires Java 17+ to run'
3333

3434
dependencyCheck {
3535
failBuildOnCVSS = 0
3636
suppressionFile = 'config/owasp-supressions.xml'
3737
skipConfigurations += ['checkstyle', 'spotbugs', 'xjcClasspath', 'jakartaXjcClasspath', 'commonXjcClasspath']
3838
skipProjects += [':docs', ':demos:00-NoCache', ':demos:01-CacheAside']
39+
40+
formats = ['HTML', 'JSON']
41+
42+
nvd {
43+
apiKey = project.hasProperty('nvdApiKey') ? project.property('nvdApiKey') : System.getenv("NVD_API_KEY")
44+
validForHours = 24 // Cache NVD data for 24 hours
45+
}
46+
47+
analyzers {
48+
// Disable analyzers that aren't needed
49+
assemblyEnabled = false
50+
ossIndexEnabled = false
51+
}
3952
}
4053
tasks.register('check') {
4154
dependsOn dependencyCheckAggregate

‎clustered/ehcache-client/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,15 @@ dependencies {
3232
compileOnlyApi project(':ehcache-xml:ehcache-xml-spi')
3333

3434
api project(':clustered:ehcache-common')
35-
implementation "org.terracotta:client-api:$terracottaApisVersion"
35+
compileOnly "org.terracotta:client-api:$terracottaApisVersion"
3636
implementation "org.terracotta:terracotta-runnel:$terracottaPlatformVersion"
3737
implementation "org.terracotta:terracotta-lease-client:$terracottaPlatformVersion"
3838
implementation "org.terracotta:terracotta-dynamic-config-entities-topology-client:$terracottaPlatformVersion"
3939
implementation "org.terracotta:terracotta-utilities-tools:$terracottaUtilitiesVersion"
4040

4141
compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0'
4242

43+
testImplementation "org.terracotta:client-api:$terracottaApisVersion"
4344
testImplementation "org.terracotta:terracotta-resources-offheap:$terracottaPlatformVersion"
4445
testImplementation "org.terracotta:terracotta-management-server-api:$terracottaPlatformVersion"
4546
testImplementation project(':clustered:server:ehcache-service-api')

‎clustered/ehcache-common-api/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ publishing.publications.withType(MavenPublication) {
2727
}
2828

2929
dependencies {
30-
api "org.terracotta:common-api:$terracottaApisVersion"
30+
compileOnlyApi "org.terracotta:common-api:$terracottaApisVersion"
3131
}

0 commit comments

Comments
 (0)