Skip to content

Commit b0221fa

Browse files
committed
Merge remote-tracking branch 'maximthomas/update-jdk-11' into release/3.0.0-SNAPSHOT
2 parents c250271 + 946b869 commit b0221fa

File tree

172 files changed

+609
-469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+609
-469
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
13-
java: [ '8', '11', '17', '21', '24' ]
13+
java: [ '11', '17', '21', '24' ]
1414
fail-fast: false
1515
steps:
1616
- uses: actions/checkout@v4

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Set up Java for publishing to Maven Central Repository OSS
3131
uses: actions/setup-java@v4
3232
with:
33-
java-version: '8'
33+
java-version: '11'
3434
distribution: 'temurin'
3535
server-id: ossrh
3636
server-username: MAVEN_USERNAME

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Set up Java for publishing to Maven Central Repository OSS
2828
uses: actions/setup-java@v4
2929
with:
30-
java-version: '8'
30+
java-version: '11'
3131
distribution: 'temurin'
3232
server-id: ossrh
3333
server-username: MAVEN_USERNAME

SECURITY.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
| Version | Java Versions Support | EE | Support Status |
6+
|--------------------------------------|-----------------------|-------------|--------------------------------------------------------------------------------------------------------------------------------------------|
7+
| Open Identity Platform Commons 3.x.x | 11 and later | Jakarta EE | :white_check_mark: Community support, [approved vendor support](https://github.com/OpenIdentityPlatform/.github/wiki/Approved-Vendor-List) |
8+
| Open Identity Platform Commons 2.x.x | 8 and later | Java EE | :white_check_mark: [Approved vendor support](https://github.com/OpenIdentityPlatform/.github/wiki/Approved-Vendor-List) |
9+
| ForgeRock Commons 1.x.x | 7 | Java EE | :x: |
10+
11+
## Reporting a Vulnerability
12+
13+
Please create issue https://github.com/OpenIdentityPlatform/commons/security/advisories/new

bloomfilter/core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<artifactId>bloomfilter</artifactId>
2121
<groupId>org.openidentityplatform.commons</groupId>
22-
<version>2.4.1-SNAPSHOT</version>
22+
<version>3.0.0-SNAPSHOT</version>
2323
</parent>
2424
<modelVersion>4.0.0</modelVersion>
2525

bloomfilter/monitoring/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<artifactId>bloomfilter</artifactId>
2121
<groupId>org.openidentityplatform.commons</groupId>
22-
<version>2.4.1-SNAPSHOT</version>
22+
<version>3.0.0-SNAPSHOT</version>
2323
</parent>
2424
<modelVersion>4.0.0</modelVersion>
2525

bloomfilter/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.openidentityplatform.commons</groupId>
2222
<artifactId>parent</artifactId>
23-
<version>2.4.1-SNAPSHOT</version>
23+
<version>3.0.0-SNAPSHOT</version>
2424
</parent>
2525
<groupId>org.openidentityplatform.commons</groupId>
2626
<artifactId>bloomfilter</artifactId>
@@ -29,7 +29,6 @@
2929
<packaging>pom</packaging>
3030
<properties>
3131
<hdrhistogram.version>2.1.4</hdrhistogram.version>
32-
<slf4j.version>1.7.5</slf4j.version>
3332
</properties>
3433

3534
<modules>
@@ -72,11 +71,6 @@
7271
<artifactId>testng</artifactId>
7372
<scope>test</scope>
7473
</dependency>
75-
<dependency>
76-
<groupId>org.slf4j</groupId>
77-
<artifactId>slf4j-jcl</artifactId>
78-
<scope>test</scope>
79-
</dependency>
8074
</dependencies>
8175

8276
<build><finalName>${project.groupId}.${project.artifactId}</finalName>

build-tools/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>org.openidentityplatform.commons</groupId>
2121
<artifactId>parent</artifactId>
22-
<version>2.4.1-SNAPSHOT</version>
22+
<version>3.0.0-SNAPSHOT</version>
2323
</parent>
2424
<artifactId>build-tools</artifactId>
2525
<packaging>jar</packaging>

cassandra-embedded/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.openidentityplatform.commons</groupId>
2222
<artifactId>parent</artifactId>
23-
<version>2.4.1-SNAPSHOT</version>
23+
<version>3.0.0-SNAPSHOT</version>
2424
</parent>
2525

2626
<artifactId>cassandra-embedded</artifactId>

commons/audit/core/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.openidentityplatform.commons</groupId>
2222
<artifactId>audit</artifactId>
23-
<version>2.4.1-SNAPSHOT</version>
23+
<version>3.0.0-SNAPSHOT</version>
2424
</parent>
2525
<groupId>org.openidentityplatform.commons.audit</groupId>
2626
<artifactId>core</artifactId>
@@ -46,8 +46,8 @@
4646
<artifactId>joda-time</artifactId>
4747
</dependency>
4848
<dependency>
49-
<groupId>org.apache.servicemix.bundles</groupId>
50-
<artifactId>org.apache.servicemix.bundles.javax-inject</artifactId>
49+
<groupId>jakarta.inject</groupId>
50+
<artifactId>jakarta.inject-api</artifactId>
5151
</dependency>
5252

5353
<!-- Open Identity Platform CommunityCommons Dependencies -->

0 commit comments

Comments
 (0)