Skip to content

Commit 07e6111

Browse files
committed
Merge pull request 'xml 项目添加' (#45) from xml into main
Reviewed-on: https://src.isharkfly.com/iSharkFly-Docs/java-tutorials/pulls/45
2 parents b13d0c4 + df92665 commit 07e6111

File tree

8 files changed

+23
-6
lines changed

8 files changed

+23
-6
lines changed

.idea/compiler.xml

Lines changed: 1 addition & 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: 2 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-io/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
7777
<groupId>org.slf4j</groupId>
7878
<artifactId>log4j-over-slf4j</artifactId>
79-
<version>${version.slf4j}</version>
79+
<version>${slf4j.version}</version>
8080
</dependency>
8181
<dependency>
8282
<groupId>org.projectlombok</groupId>

jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import static org.junit.Assert.assertThat;
88

99
import java.io.File;
10+
import java.net.URI;
1011
import java.net.URL;
1112
import java.util.List;
1213
import java.util.Map;
@@ -103,7 +104,7 @@ public void wheReadFromFile_thanCorrect() throws Exception {
103104

104105
@Test
105106
public void wheReadFromUrl_thanCorrect() throws Exception {
106-
URL resource = new URL("file:src/test/resources/json_car.json");
107+
URL resource = new URI("file:src/test/resources/json_car.json").toURL();
107108

108109
ObjectMapper objectMapper = new ObjectMapper();
109110
Car fromFile = objectMapper.readValue(resource, Car.class);

libraries-jackson/jackson-conversions/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<artifactId>jackson-conversions</artifactId>
77
<version>0.0.1-SNAPSHOT</version>
88
<name>jackson-conversions</name>
9+
<properties>
10+
<maven.compiler.source>17</maven.compiler.source>
11+
<maven.compiler.target>17</maven.compiler.target>
12+
</properties>
913

1014
<parent>
1115
<groupId>com.ossez</groupId>

persistence-modules/activejdbc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>org.slf4j</groupId>
3636
<artifactId>slf4j-simple</artifactId>
37-
<version>${version.slf4j}</version>
37+
<version>${slf4j.version}</version>
3838
</dependency>
3939
</dependencies>
4040

pom.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<module>testing-modules</module>
5656
<module>toolkits</module>
5757
<module>xml</module>
58+
<module>xml-2</module>
5859
</modules>
5960

6061
<properties>
@@ -64,7 +65,7 @@
6465
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6566

6667
<!-- Logging -->
67-
<version.slf4j>1.7.36</version.slf4j>
68+
<slf4j.version>1.7.36</slf4j.version>
6869
<log4j.version>1.2.17</log4j.version>
6970
<log4j-over-slf4j.version>2.0.7</log4j-over-slf4j.version>
7071
<version.log4j2>2.18.0</version.log4j2>
@@ -133,6 +134,8 @@
133134
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
134135
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
135136
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
137+
<maven.compiler.source>17</maven.compiler.source>
138+
<maven.compiler.target>17</maven.compiler.target>
136139

137140
</properties>
138141

@@ -141,6 +144,12 @@
141144
<!-- OSSEZ COMMON -->
142145

143146
<!-- LOG -->
147+
<dependency>
148+
<groupId>org.slf4j</groupId>
149+
<artifactId>slf4j-api</artifactId>
150+
<version>${slf4j.version}</version>
151+
</dependency>
152+
144153
<dependency>
145154
<groupId>ch.qos.logback</groupId>
146155
<artifactId>logback-classic</artifactId>

xml-2/pom.xml

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

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

1616
<dependencies>

0 commit comments

Comments
 (0)