Skip to content

Commit 28f7de0

Browse files
author
Jonathan Knight
committed
Fixing build to exclude compiling CreateKeystore.java
[git-p4: depot-paths = "//dev/coherence-ce/release/coherence-ce-v21.12/": change = 97409]
1 parent b4c1266 commit 28f7de0

File tree

2 files changed

+34
-10
lines changed

2 files changed

+34
-10
lines changed

prj/test/functional/security/pom.xml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ Copyright (c) 2000, 2021, Oracle and/or its affiliates.
4-
~
5-
~ Licensed under the Universal Permissive License v 1.0 as shown at
6-
~ http://oss.oracle.com/licenses/upl.
3+
Copyright (c) 2000, 2022, Oracle and/or its affiliates.
4+
5+
Licensed under the Universal Permissive License v 1.0 as shown at
6+
https://oss.oracle.com/licenses/upl.
77
-->
88
<project xmlns="http://maven.apache.org/POM/4.0.0"
99
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -69,13 +69,20 @@
6969

7070
<build>
7171
<plugins>
72-
<!-- Can be removed when COH-20993 is resolved -->
72+
<!-- CreateKeyStore.java is used to create key stores for
73+
the security tests and requires a Sun JDK to build.
74+
To build CreateKeyStore.java, replace
75+
<excludes> with
76+
<source>${java.version}</source>
77+
<target>${java.version}</target>
78+
and make sure the JDK is a Sun JDK -->
7379
<plugin>
7480
<groupId>org.apache.maven.plugins</groupId>
7581
<artifactId>maven-compiler-plugin</artifactId>
76-
<configuration combine.self="override">
77-
<source>${java.version}</source>
78-
<target>${java.version}</target>
82+
<configuration>
83+
<excludes>
84+
<exclude>**/CreateKeyStore.java</exclude>
85+
</excludes>
7986
</configuration>
8087
</plugin>
8188
</plugins>

prj/test/functional/security/src/test/java/security/CreateKeyStore.java

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
2-
* Copyright (c) 2000, 2020, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2022, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
5-
* http://oss.oracle.com/licenses/upl.
5+
* https://oss.oracle.com/licenses/upl.
66
*/
77
package security;
88

@@ -44,6 +44,23 @@
4444
/**
4545
* This class creates a set of keystores used by the Security tests.
4646
*
47+
* Note: This class dependends on sun.security.x509.* which is no longer
48+
* available in JDK11. The class needs to be built using JDK8.
49+
* To build with JDK 8, modify the <configuration></configuration>
50+
* of <maven-compiler-plugin></maven-compiler-plugin>
51+
* section in the pom.xml by replacing
52+
*
53+
* <testExcludes>
54+
* <testExclude>**\/CreateKeyStore.java</testExclude>
55+
* </testExcludes>
56+
*
57+
* with
58+
*
59+
* <source>${java.version}</source>
60+
* <target>${java.version}</target>
61+
*
62+
* where java.version = 1.8
63+
*
4764
* @author lh 2018.1l.01
4865
*/
4966
public class CreateKeyStore

0 commit comments

Comments
 (0)