Skip to content

Commit 30cd31b

Browse files
committed
Merge pull request '添加 JDK 9 版本的测试代码到项目中' (#27) from java-9 into main
Reviewed-on: https://src.isharkfly.com/iSharkFly-Docs/java-tutorials/pulls/27
2 parents 0b76149 + e1f6933 commit 30cd31b

7 files changed

Lines changed: 24 additions & 13 deletions

File tree

.idea/compiler.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/encodings.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core-java-modules/core-java-10/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<name>core-java-10</name>
99

1010
<parent>
11-
<groupId>com.baeldung.core-java-modules</groupId>
11+
<groupId>com.ossez.core-java-modules</groupId>
1212
<artifactId>core-java-modules</artifactId>
13-
<version>0.0.1-SNAPSHOT</version>
13+
<version>0.0.2-SNAPSHOT</version>
1414
</parent>
1515

1616
<dependencies>

core-java-modules/core-java-9-jigsaw/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
</modules>
1313

1414
<parent>
15-
<groupId>com.baeldung.core-java-modules</groupId>
15+
<groupId>com.ossez.core-java-modules</groupId>
1616
<artifactId>core-java-modules</artifactId>
17-
<version>0.0.1-SNAPSHOT</version>
17+
<version>0.0.2-SNAPSHOT</version>
1818
</parent>
1919

2020
<build>

core-java-modules/core-java-9/pom.xml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<artifactId>core-java-9</artifactId>
77
<name>core-java-9</name>
88

99
<parent>
10-
<groupId>com.baeldung</groupId>
11-
<artifactId>parent-modules</artifactId>
12-
<version>1.0.0-SNAPSHOT</version>
13-
<relativePath>../../</relativePath>
10+
<groupId>com.ossez.core-java-modules</groupId>
11+
<artifactId>core-java-modules</artifactId>
12+
<version>0.0.2-SNAPSHOT</version>
1413
</parent>
1514

1615
<dependencies>
@@ -59,11 +58,13 @@
5958
<plugin>
6059
<groupId>org.apache.maven.plugins</groupId>
6160
<artifactId>maven-compiler-plugin</artifactId>
61+
<version>${maven-compiler-plugin.version}</version>
6262
<configuration>
6363
<source>${maven.compiler.source}</source>
6464
<target>${maven.compiler.target}</target>
65+
<encoding>UTF-8</encoding>
6566
<compilerArgs>
66-
<arg>--add-exports=java.base/com.sun.crypto.provider=ALL-UNNAMED</arg>
67+
<!-- <arg>&#45;&#45;add-exports=java.base/sun.net.util=ALL-UNNAMED</arg>-->
6768
</compilerArgs>
6869
</configuration>
6970
</plugin>
@@ -77,6 +78,7 @@
7778
</pluginRepository>
7879
</pluginRepositories>
7980

81+
8082
<properties>
8183
<awaitility.version>1.7.0</awaitility.version>
8284
<maven.compiler.source>1.9</maven.compiler.source>

core-java-modules/core-java-9/src/main/java/com/baeldung/java9/prejpms/App.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import javax.xml.bind.JAXBContext;
1010
import javax.xml.bind.Marshaller;
1111

12-
import com.sun.crypto.provider.SunJCE;
12+
//import com.sun.crypto.provider.SunJCE;
1313

1414
import org.slf4j.Logger;
1515
import org.slf4j.LoggerFactory;
@@ -28,7 +28,7 @@ public static void main(String[] args) throws Exception {
2828

2929
private static void getCrytpographyProviderName() {
3030
try {
31-
LOGGER.info("1. JCE Provider Name: {}\n", new SunJCE().getName());
31+
// LOGGER.info("1. JCE Provider Name: {}\n", new SunJCE().getName());
3232
} catch (Throwable e) {
3333
LOGGER.error(e.toString());
3434
}

core-java-modules/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<modules>
1818
<module>core-java</module>
1919
<module>core-java-8</module>
20+
<module>core-java-9</module>
21+
<!-- <module>core-java-10</module>-->
2022
<module>core-java-11</module>
2123
<module>core-java-annotations</module>
2224
<module>core-java-collections</module>

0 commit comments

Comments
 (0)