Skip to content

Commit 8d819fb

Browse files
authored
ADD maven-compiler-plugin release for cross compile compatibility (#49)
1 parent 3fcf960 commit 8d819fb

File tree

3 files changed

+79
-4
lines changed

3 files changed

+79
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM eclipse-temurin:21-jre-jammy
33
MAINTAINER Open Identity Platform Community <open-identity-platform-openidm@googlegroups.com>
44

55
ENV USER="openicf"
6-
ENV OPENICF_OPTS="-server -XX:+UseContainerSupport"
6+
ENV OPENICF_OPTS="-server -XX:+UseContainerSupport --add-exports java.base/com.sun.jndi.ldap=ALL-UNNAMED "
77

88
ARG VERSION
99

OpenICF-ldap-connector/pom.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
with the fields enclosed by brackets [] replaced by
2222
your own identifying information:
2323
"Portions Copyrighted [year] [name of copyright owner]"
24+
25+
Portions Copyrighted 2018-2024 3A Systems, LLC
2426
-->
2527
<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/maven-v4_0_0.xsd">
2628
<modelVersion>4.0.0</modelVersion>
@@ -41,6 +43,30 @@
4143
<framework.compatibilityVersion>1.5</framework.compatibilityVersion>
4244
<framework.releaseVersion>2.0</framework.releaseVersion>
4345
</properties>
46+
<profiles>
47+
<profile>
48+
<id>set-compiler-release</id>
49+
<activation>
50+
<jdk>[9,)</jdk>
51+
</activation>
52+
<build>
53+
<pluginManagement>
54+
<plugins>
55+
<plugin>
56+
<groupId>org.apache.maven.plugins</groupId>
57+
<artifactId>maven-compiler-plugin</artifactId>
58+
<configuration>
59+
<!--
60+
package com.sun.jndi.ldap does not exist
61+
-->
62+
<release combine.self="override"/>
63+
</configuration>
64+
</plugin>
65+
</plugins>
66+
</pluginManagement>
67+
</build>
68+
</profile>
69+
</profiles>
4470
<dependencies>
4571
<dependency>
4672
<groupId>org.openidentityplatform.openicf.framework</groupId>

pom.xml

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
4+
5+
Copyright (c) 2011-2015 ForgeRock AS. All rights reserved.
6+
7+
The contents of this file are subject to the terms
8+
of the Common Development and Distribution License
9+
(the License). You may not use this file except in
10+
compliance with the License.x
11+
12+
You can obtain a copy of the License at
13+
http://forgerock.org/license/CDDLv1.0.html
14+
See the License for the specific language governing
15+
permission and limitations under the License.
16+
17+
When distributing Covered Code, include this CDDL
18+
Header Notice in each file and include the License file
19+
at http://forgerock.org/license/CDDLv1.0.html
20+
If applicable, add the following below the CDDL Header,
21+
with the fields enclosed by brackets [] replaced by
22+
your own identifying information:
23+
"Portions Copyrighted [year] [name of copyright owner]"
24+
25+
Portions Copyrighted 2018-2024 3A Systems, LLC
26+
-->
227
<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/maven-v4_0_0.xsd">
328
<modelVersion>4.0.0</modelVersion>
429
<groupId>org.openidentityplatform</groupId>
@@ -13,8 +38,8 @@
1338
<inceptionYear>2018</inceptionYear>
1439
<url>https://github.com/OpenIdentityPlatform/OpenICF</url>
1540
<properties>
16-
<maven.compiler.target>1.8</maven.compiler.target>
17-
<maven.compiler.source>1.8</maven.compiler.source>
41+
<maven.compiler.target>8</maven.compiler.target>
42+
<maven.compiler.source>8</maven.compiler.source>
1843
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1944
<java.surefire.options />
2045
</properties>
@@ -152,6 +177,30 @@
152177
</plugins>
153178
</build>
154179
</profile>
180+
<profile>
181+
<id>set-compiler-release</id>
182+
<activation>
183+
<jdk>[9,)</jdk>
184+
</activation>
185+
<build>
186+
<pluginManagement>
187+
<plugins>
188+
<plugin>
189+
<groupId>org.apache.maven.plugins</groupId>
190+
<artifactId>maven-compiler-plugin</artifactId>
191+
<configuration>
192+
<fork>true</fork>
193+
<release>8</release>
194+
<compilerArgs>
195+
<arg>-XDignore.symbol.file</arg>
196+
<arg>-Xlint:unchecked</arg>
197+
</compilerArgs>
198+
</configuration>
199+
</plugin>
200+
</plugins>
201+
</pluginManagement>
202+
</build>
203+
</profile>
155204
<profile>
156205
<id>jdk17.options</id>
157206
<activation>
@@ -330,7 +379,7 @@
330379
<plugin>
331380
<groupId>org.apache.maven.plugins</groupId>
332381
<artifactId>maven-javadoc-plugin</artifactId>
333-
<version>3.6.3</version>
382+
<version>3.10.1</version>
334383
<executions>
335384
<execution>
336385
<id>attach-javadocs</id>

0 commit comments

Comments
 (0)