Skip to content

Commit 7ed7dfe

Browse files
vharsekovharseko
committed
Merge remote-tracking branch 'maximthomas/update-jdk-11' into release/16.0.0-SNAPSHOT
2 parents c5c9d25 + 028c73a commit 7ed7dfe

File tree

18 files changed

+129
-45
lines changed

18 files changed

+129
-45
lines changed

‎.github/FUNDING.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# These are supported funding model platforms
2+
3+
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: # Replace with a single Patreon username
5+
open_collective: openam
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
12+
polar: # Replace with a single Polar username
13+
buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
14+
thanks_dev: # Replace with a single thanks.dev username
15+
custom: ['https://www.openidentityplatform.org/sponsor'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

‎SECURITY.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414

1515
## Reporting a Vulnerability
1616

17-
Please create issue https://github.com/OpenIdentityPlatform/OpenAM/issues/new?template=Bug_report.md
17+
Please draft [security advisory](https://github.com/OpenIdentityPlatform/OpenAM/security/advisories/new)

‎jato-shaded/pom.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,22 @@
4545
</dependencies>
4646
<build>
4747
<plugins>
48+
<plugin>
49+
<groupId>org.apache.maven.plugins</groupId>
50+
<artifactId>maven-dependency-plugin</artifactId>
51+
<executions>
52+
<execution>
53+
<id>unpack</id>
54+
<phase>process-sources</phase>
55+
<goals>
56+
<goal>unpack-dependencies</goal>
57+
</goals>
58+
<configuration>
59+
<outputDirectory>${project.build.directory}/classes</outputDirectory>
60+
</configuration>
61+
</execution>
62+
</executions>
63+
</plugin>
4864
<plugin>
4965
<groupId>org.apache.maven.plugins</groupId>
5066
<artifactId>maven-shade-plugin</artifactId>

‎openam-distribution/openam-distribution-docker/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM tomcat:10-jre21
1+
FROM tomcat:11-jre21
22

33
LABEL org.opencontainers.image.authors="Open Identity Platform Community"
44

@@ -17,7 +17,7 @@ RUN mkdir /usr/openam \
1717

1818
#COPY openam-server/target/OpenAM-*.war $CATALINA_HOME/webapps/$OPENAM_PATH.war
1919
#COPY openam-distribution/openam-distribution-ssoadmintools/target/*.zip /usr/openam/ssoadmintools.zip
20-
#COPY openam-distribution/openam-distribution-ssoadmintools/target/*.war /usr/openam/ssoconfiguratortools.war
20+
#COPY openam-distribution/openam-distribution-ssoconfiguratortools/target/*.zip /usr/openam/ssoconfiguratortools.zip
2121

2222
RUN if [ ! -f "$CATALINA_HOME/webapps/$OPENAM_PATH.war" ]; then echo file exists; fi
2323

‎openam-distribution/openam-distribution-ssoconfiguratortools/src/main/assembly/openAMToolsAssembly_Descriptor.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,22 @@
2929
<id>openam-ssoConfiguratorTools</id>
3030
<formats>
3131
<format>zip</format>
32+
<format>dir</format>
3233
</formats>
3334
<includeBaseDirectory>false</includeBaseDirectory>
3435
<dependencySets>
3536
<dependencySet>
37+
<!-- <unpack>true</unpack>-->
3638
<outputDirectory>lib</outputDirectory>
39+
<outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
3740
<includes>
38-
<include>com.google.inject:guice:jar:no_aop</include>
41+
<include>com.google.inject:guice:jar</include>
42+
<include>aopalliance:aopalliance</include>
43+
<include>com.google.guava:guava</include>
44+
<include>com.google.guava:failureaccess</include>
3945
<include>org.openidentityplatform.commons.guice:core</include>
4046
<include>org.openidentityplatform.openam:openam-license-manager-cli</include>
41-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.javax-inject</include>
47+
<include>jakarta.inject:jakarta.inject-api</include>
4248
<include>org.slf4j:slf4j-api</include>
4349
<include>org.slf4j:slf4j-nop</include>
4450
<include>org.apache.commons:commons-lang3</include>

‎openam-tools/openam-configurator-tool/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</goals>
4444
<configuration>
4545
<outputDirectory>${project.build.directory}/lib</outputDirectory>
46-
<useRepositoryLayout>true</useRepositoryLayout>
46+
<useRepositoryLayout>false</useRepositoryLayout>
4747
</configuration>
4848
</execution>
4949
</executions>
@@ -58,7 +58,7 @@
5858

5959
<addClasspath>true</addClasspath>
6060
<classpathPrefix>lib/</classpathPrefix>
61-
<classpathLayoutType>repository</classpathLayoutType>
61+
<classpathLayoutType>simple</classpathLayoutType>
6262
<useUniqueVersions>false</useUniqueVersions>
6363
</manifest>
6464
</archive>

‎openam-tools/openam-license-core/pom.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,28 @@
3939
<dependency>
4040
<groupId>org.openidentityplatform.openam</groupId>
4141
<artifactId>openam-shared</artifactId>
42+
<exclusions>
43+
<exclusion>
44+
<groupId>org.openidentityplatform.commons.http-framework</groupId>
45+
<artifactId>core</artifactId>
46+
</exclusion>
47+
<exclusion>
48+
<groupId>org.openidentityplatform.opendj</groupId>
49+
<artifactId>opendj-core</artifactId>
50+
</exclusion>
51+
<exclusion>
52+
<groupId>org.openidentityplatform.openam</groupId>
53+
<artifactId>openam-audit-context</artifactId>
54+
</exclusion>
55+
<exclusion>
56+
<groupId>org.openidentityplatform.opendj</groupId>
57+
<artifactId>opendj-grizzly</artifactId>
58+
</exclusion>
59+
<exclusion>
60+
<groupId>org.openidentityplatform.commons</groupId>
61+
<artifactId>json-resource-http</artifactId>
62+
</exclusion>
63+
</exclusions>
4264
</dependency>
4365
<dependency>
4466
<groupId>org.openidentityplatform.commons.guice</groupId>

‎transform-jakarta/activemq-client/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434

3535
<build>
3636
<plugins>
37+
<plugin>
38+
<groupId>org.apache.maven.plugins</groupId>
39+
<artifactId>maven-dependency-plugin</artifactId>
40+
</plugin>
3741
<plugin>
3842
<groupId>org.eclipse.transformer</groupId>
3943
<artifactId>transformer-maven-plugin</artifactId>

‎transform-jakarta/cc/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333

3434
<build>
3535
<plugins>
36+
<plugin>
37+
<groupId>org.apache.maven.plugins</groupId>
38+
<artifactId>maven-dependency-plugin</artifactId>
39+
</plugin>
3640
<plugin>
3741
<groupId>org.eclipse.transformer</groupId>
3842
<artifactId>transformer-maven-plugin</artifactId>

‎transform-jakarta/jato-shaded/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535

3636
<build>
3737
<plugins>
38+
<plugin>
39+
<groupId>org.apache.maven.plugins</groupId>
40+
<artifactId>maven-dependency-plugin</artifactId>
41+
</plugin>
3842
<plugin>
3943
<groupId>org.eclipse.transformer</groupId>
4044
<artifactId>transformer-maven-plugin</artifactId>

0 commit comments

Comments
 (0)