Skip to content

Commit 99871fb

Browse files
vharsekovharseko
committed
Merge remote-tracking branch 'maximthomas/update-jdk-11' into release/16.0.0-SNAPSHOT
2 parents 7ed7dfe + 27da499 commit 99871fb

File tree

33 files changed

+3152
-3995
lines changed

33 files changed

+3152
-3995
lines changed

‎.github/FUNDING.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# These are supported funding model platforms
22

3-
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
3+
github: [OpenIdentityPlatform]
44
patreon: # Replace with a single Patreon username
5-
open_collective: openam
5+
open_collective: OpenAM
66
ko_fi: # Replace with a single Ko-fi username
77
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
88
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry

‎.github/ISSUE_TEMPLATE/Bug_report.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,7 @@ If applicable, add screenshots to help explain your problem.
3333

3434
**Additional context**
3535
Add any other context about the problem here.
36+
37+
38+
[Vote to raise the priority 🖐️](https://opencollective.com/openidentityplatform/projects/openam/contribute/vote-to-raise-the-priority-of-an-issue-92505)
39+

‎.github/ISSUE_TEMPLATE/Feature_request.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@ A clear and concise description of any alternative solutions or features you've
1515

1616
**Additional context**
1717
Add any other context or screenshots about the feature request here.
18+
19+
[Vote to raise the priority 🖐️](https://opencollective.com/openidentityplatform/projects/openam/contribute/vote-to-raise-the-priority-of-an-issue-92505)
20+

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ${{ matrix.os }}
1111
strategy:
1212
matrix:
13-
java: [ '11', '17', '21', '24' ]
13+
java: [ '11', '17', '21', '25' ]
1414
os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
1515
fail-fast: false
1616
steps:

‎README.md‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,21 @@ The next step is then to go to [http://login.domain.com:8080/openam](http://logi
9090
## Contributing
9191
Please, make [Pull request](https://github.com/OpenIdentityPlatform/OpenAM/pulls)
9292

93-
<a href="https://github.com/OpenIdentityPlatform/OpenAM/graphs/contributors">
94-
<img src="https://contributors-img.web.app/image?repo=OpenIdentityPlatform/OpenAM" />
93+
<a href="https://opencollective.com/OpenAM/tiers" target="_blank">
94+
<!--img src="https://contributors-img.web.app/image?repo=OpenIdentityPlatform/OpenAM" /-->
95+
<img src="https://opencollective.com/OpenAM/contributors.svg?width=890&button=true" />
96+
</a>
97+
98+
## Backers
99+
Thank you to all our backers! [Become a backer 🙏](https://opencollective.com/OpenAM/tiers)
100+
101+
<a href="https://opencollective.com/OpenAM/tiers" target="_blank">
102+
<img src="https://opencollective.com/OpenAM/backers.svg?width=890">
103+
</a>
104+
105+
## Sponsors
106+
Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [Become a sponsor ❤️](https://opencollective.com/OpenAM/tiers)
107+
108+
<a href="https://opencollective.com/OpenAM/tiers" target="_blank">
109+
<img src="https://opencollective.com/OpenAM/sponsors.svg?width=890">
95110
</a>

‎legal/THIRDPARTYREADME.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,7 @@ Copyright: Copyright (c) 2009 Kazuhiko Arase
888888
Version: qunit-1.15.0.js
889889
Copyright: Copyright 2012-2014 The Dojo Foundation
890890

891-
Version: requirejs-2.1.14-min.js
891+
Version: requirejs-2.3.7-min.js
892892
Copyright: Copyright (c) 2010-2014, The Dojo Foundation
893893

894894
Version: spin-2.0.1-min.js

‎openam-authentication/openam-auth-oauth2/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@
5353
<groupId>org.owasp.esapi</groupId>
5454
<artifactId>esapi</artifactId>
5555
</dependency>
56-
<dependency>
57-
<groupId>org.bouncycastle</groupId>
58-
<artifactId>bcpkix-jdk15on</artifactId>
59-
<version>1.69</version>
60-
</dependency>
56+
<dependency>
57+
<groupId>org.bouncycastle</groupId>
58+
<artifactId>bcpkix-jdk18on</artifactId>
59+
<version>1.81</version>
60+
</dependency>
6161
<dependency>
6262
<groupId>org.mockito</groupId>
6363
<artifactId>mockito-all</artifactId>

‎openam-cassandra/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>org.apache.cassandra</groupId>
5151
<artifactId>cassandra-all</artifactId>
52-
<version>4.0.16</version>
52+
<version>4.0.17</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>org.lz4</groupId>

‎openam-documentation/openam-doc-services-ref/pom.xml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
* The contents of this file are subject to the terms of the Common Development and
4+
* Distribution License (the License). You may not use this file except in compliance with the
5+
* License.
6+
*
7+
* You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
8+
* specific language governing permission and limitations under the License.
9+
*
10+
* When distributing Covered Software, include this CDDL Header Notice in each file and include
11+
* the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
12+
* Header, with the fields enclosed by brackets [] replaced by your own identifying
13+
* information: "Portions copyright [year] [name of copyright owner]".
14+
*
15+
* Copyright 2025 3A Systems LLC.
16+
-->
17+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
18+
<modelVersion>4.0.0</modelVersion>
19+
<parent>
20+
<groupId>org.openidentityplatform.openam</groupId>
21+
<artifactId>openam-documentation</artifactId>
22+
<version>16.0.0-SNAPSHOT</version>
23+
</parent>
24+
<artifactId>openam-doc-services-ref</artifactId>
25+
<name>OpenAM documentation reference guide generator</name>
26+
<dependencies>
27+
<dependency>
28+
<groupId>org.openidentityplatform.openam</groupId>
29+
<artifactId>openam-server-only</artifactId>
30+
<version>${project.version}</version>
31+
<type>pom</type>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.jsoup</groupId>
35+
<artifactId>jsoup</artifactId>
36+
<version>1.21.2</version>
37+
</dependency>
38+
</dependencies>
39+
<build>
40+
<plugins>
41+
<plugin>
42+
<groupId>org.codehaus.mojo</groupId>
43+
<artifactId>exec-maven-plugin</artifactId>
44+
<version>3.5.1</version>
45+
<executions>
46+
<execution>
47+
<goals>
48+
<goal>java</goal>
49+
</goals>
50+
<phase>prepare-package</phase>
51+
</execution>
52+
</executions>
53+
<configuration>
54+
<mainClass>org.openidentityplatform.openam.docs.services.Generator</mainClass>
55+
<arguments>
56+
<argument>${project.basedir}/../../openam-server-only/target/OpenAM-ServerOnly-${project.version}</argument>
57+
<argument>${build.outputDirectory}</argument>
58+
</arguments>
59+
</configuration>
60+
</plugin>
61+
</plugins>
62+
</build>
63+
64+
</project>

0 commit comments

Comments
 (0)