Skip to content

Commit 656a346

Browse files
authored
Merge branch 'master' into JAVA-20167_1
2 parents 720f641 + 5de999f commit 656a346

File tree

45 files changed

+1038
-202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1038
-202
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,7 @@ libraries-2/src/test/resources/crawler4j/**
120120
devDb*.db
121121

122122
#jaxb
123-
*.xjb
123+
*.xjb
124+
125+
#neo4j
126+
persistence-modules/neo4j/data/**

core-java-modules/core-java-8-datetime-2/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
- [Generating Random Dates in Java](https://www.baeldung.com/java-random-dates)
44
- [Creating a LocalDate with Values in Java](https://www.baeldung.com/java-creating-localdate-with-values)
55
- [Parsing Date Strings with Varying Formats](https://www.baeldung.com/java-parsing-dates-many-formats)
6+
- [How Many Days Are There in a Particular Month of a Given Year?](https://www.baeldung.com/days-particular-month-given-year)
67
- [[<-- Prev]](/core-java-modules/core-java-datetime-java8-1)

core-java-modules/core-java-arrays-operations-advanced/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ This module contains articles about advanced operations on arrays in Java. They
1212
- [Concatenate Two Arrays in Java](https://www.baeldung.com/java-concatenate-arrays)
1313
- [Performance of System.arraycopy() vs. Arrays.copyOf()](https://www.baeldung.com/java-system-arraycopy-arrays-copyof-performance)
1414
- [Slicing Arrays in Java](https://www.baeldung.com/java-slicing-arrays)
15+
- [Combining Two or More Byte Arrays](https://www.baeldung.com/java-concatenate-byte-arrays)

core-java-modules/core-java-datetime-string-2/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ This module contains articles about parsing and formatting Java date and time ob
44

55
### Relevant Articles:
66
- [Convert String to Instant](https://www.baeldung.com/java-string-to-instant)
7+
- [Sort Date Strings in Java](https://www.baeldung.com/java-sort-date-strings)

core-java-modules/core-java-string-operations-6/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
### Relevant Articles:
33

44
- [Find the Longest Word in a Given String in Java](https://www.baeldung.com/java-longest-word-string)
5+
- [Check if a String Is All Uppercase or Lowercase in Java](https://www.baeldung.com/java-check-string-uppercase-lowercase)

gradle-modules/gradle-7/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
- [Working With Multiple Repositories in Gradle](https://www.baeldung.com/java-gradle-multiple-repositories)
66
- [Different Dependency Version Declarations in Gradle](https://www.baeldung.com/gradle-different-dependency-version-declarations)
77
- [Generating Javadoc With Gradle](https://www.baeldung.com/java-gradle-javadoc)
8+
- [Generating WSDL Stubs With Gradle](https://www.baeldung.com/java-gradle-create-wsdl-stubs)

image-compressing/README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
This module contains tutorials related to the image compression in Java.
1+
This module contains tutorials related to the image compression in Java.
2+
3+
## Relevant Articles
4+
- [Lossy and Lossless Image Compression Using Java](https://www.baeldung.com/java-image-compression-lossy-lossless)

image-processing/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,15 @@
9191
<artifactId>webcam-capture</artifactId>
9292
<version>${webcam-capture.version}</version>
9393
</dependency>
94+
<dependency>
95+
<groupId>org.openjfx</groupId>
96+
<artifactId>javafx-graphics</artifactId>
97+
<version>${javafx-graphics.version}</version>
98+
</dependency>
9499
</dependencies>
95100

96101
<properties>
97-
<core-image.version>1.3.5</core-image.version>
102+
<core-image.version>1.3.10</core-image.version>
98103
<ij.version>1.51h</ij.version>
99104
<imageio.version>3.3.2</imageio.version>
100105
<tess4j.version>4.5.1</tess4j.version>
@@ -105,6 +110,7 @@
105110
<imgscalr-version>4.2</imgscalr-version>
106111
<thumbnailator-version>0.4.11</thumbnailator-version>
107112
<marvin-version>1.5.5</marvin-version>
113+
<javafx-graphics.version>11</javafx-graphics.version>
108114
</properties>
109115

110116
</project>

jackson-modules/jackson-annotations/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ This module contains articles about Jackson annotations.
99
- [Jackson JSON Views](https://www.baeldung.com/jackson-json-view-annotation)
1010
- [Deduction-Based Polymorphism in Jackson 2.12](https://www.baeldung.com/jackson-deduction-based-polymorphism)
1111
- [@JsonIgnore vs @Transient](https://www.baeldung.com/java-jsonignore-vs-transient)
12+
- [@JsonMerge Annotation in Jackson](https://www.baeldung.com/java-jsonmerge-annotation-jackson)

jmeter/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,4 @@ Enjoy it :)
5656
- [Basic Authentication in JMeter](https://www.baeldung.com/jmeter-basic-auth)
5757
- [JMeter: Latency vs. Load Time](https://www.baeldung.com/java-jmeter-latency-vs-load-time)
5858
- [How Do I Generate a Dashboard Report in JMeter?](https://www.baeldung.com/jmeter-dashboard-report)
59+
- [Run JMeter .jmx File From the Command Line and Configure the Report File](https://www.baeldung.com/java-jmeter-command-line)

0 commit comments

Comments
 (0)