Skip to content

Commit ebd2bf9

Browse files
JoranVanBelleJoranVanBelle
committed
Bump spring-boot from 3.5.5 to 4.0.4 [#2625]
1 parent 1a843ec commit ebd2bf9

174 files changed

Lines changed: 1148 additions & 1126 deletions

File tree

Some content is hidden

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

‎.github/workflows/build-the-code.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
- uses: actions/checkout@v2
1818
with:
1919
fetch-depth: 0
20-
- name: Set up JDK 21
20+
- name: Set up JDK 25
2121
uses: actions/setup-java@v1
2222
with:
23-
java-version: 21
23+
java-version: 25
2424
- name: Cache Maven packages
2525
uses: actions/cache@v3
2626
with:

‎.github/workflows/publish-release-to-maven-repository.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup build environment
2020
uses: actions/setup-java@v1
2121
with:
22-
java-version: 21
22+
java-version: 25
2323
server-id: central
2424
server-username: ${{ secrets.NEXUS_USERNAME }}
2525
server-password: ${{ secrets.NEXUS_PASSWORD }}

‎.github/workflows/publish-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup build environment
2525
uses: actions/setup-java@v1
2626
with:
27-
java-version: 21
27+
java-version: 25
2828
- name: Create the release artifact
2929
run: mvn package -DskipTests -Pci
3030
- name: Create pre-release
@@ -52,7 +52,7 @@ jobs:
5252
- name: Setup build environment
5353
uses: actions/setup-java@v1
5454
with:
55-
java-version: 21
55+
java-version: 25
5656
- name: Create the release artifact
5757
run: mvn package -DskipTests -D"assembly.name=GA" -Pci
5858
- name: Create the Windows installer

‎.github/workflows/publish-snapshot-to-maven-repository.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup build environment
2121
uses: actions/setup-java@v1
2222
with:
23-
java-version: 21
23+
java-version: 25
2424
server-id: central
2525
server-username: ${{ secrets.NEXUS_USERNAME }}
2626
server-password: ${{ secrets.NEXUS_PASSWORD }}

‎NOTES.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ STEPS TO UPGRADE.
1111
v3.0 to ensure your database is in the right state to migrate from
1212
V2 to v3.
1313
2. If you are not running from a Docker container, you will need to
14-
install Java 21.
14+
install Java 25.
1515
3. Before you install this release, you MUST drop the batch tables with the
1616
following query:
1717
* DROP TABLE BATCH_STEP_EXECUTION_CONTEXT;

‎QUICKSTART.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ComiXed makes heavy use of databases to manage the information for a
1919
comic book library. As such, it requires one that provides a stable,
2020
durable environment.
2121

22-
ComiXed ships with support for two database environments:
22+
ComiXed ships with support for three database environments:
2323
* [MySQL](https://www.mysql.com/) v8.1 or later
2424
* [MariaDB](https://mariadb.org/) v10.11 or later.
2525
* [PosgreSQL](https://www.postgresql.org/) v16.0 or later

‎UPGRADING.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,26 @@ DROP SEQUENCE BATCH_JOB_SEQ IF EXISTS;
6565
```
6666

6767
After this, you can then run ComiXed 2.0.
68+
69+
## v3.x -> v4.x
70+
71+
If you are running a version prior to v3.x, then you **must** first upgrade
72+
to v3.x. After installing v3.x and running it, you should run the server
73+
once to perform some necessary database changes. Then you can perform the
74+
recommended upgrade steps.
75+
76+
Next you will need to run the following SQL. To do this, start up ComiXed with the
77+
database console enabled using the **-C** commandline option:
78+
79+
```sql
80+
DROP TABLE BATCH_STEP_EXECUTION_CONTEXT IF EXISTS;
81+
DROP TABLE BATCH_JOB_EXECUTION_CONTEXT IF EXISTS;
82+
DROP TABLE BATCH_STEP_EXECUTION IF EXISTS;
83+
DROP TABLE BATCH_JOB_EXECUTION_PARAMS IF EXISTS;
84+
DROP TABLE BATCH_JOB_EXECUTION IF EXISTS;
85+
DROP TABLE BATCH_JOB_INSTANCE IF EXISTS;
86+
87+
DROP SEQUENCE BATCH_STEP_EXECUTION_SEQ IF EXISTS;
88+
DROP SEQUENCE BATCH_JOB_EXECUTION_SEQ IF EXISTS;
89+
DROP SEQUENCE BATCH_JOB_SEQ IF EXISTS;
90+
```

‎comixed-adaptors/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@
5454
<artifactId>imageio-webp</artifactId>
5555
<version>3.12.0</version>
5656
</dependency>
57-
<dependency>
58-
<groupId>com.fasterxml.jackson.dataformat</groupId>
59-
<artifactId>jackson-dataformat-xml</artifactId>
60-
</dependency>
6157
<dependency>
6258
<groupId>com.h2database</groupId>
6359
<artifactId>h2</artifactId>

‎comixed-adaptors/src/main/java/org/comixedproject/adaptors/AdaptorConfiguration.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.springframework.context.annotation.Bean;
2424
import org.springframework.context.annotation.ComponentScan;
2525
import org.springframework.context.annotation.Configuration;
26+
import org.springframework.http.converter.xml.JacksonXmlHttpMessageConverter;
2627

2728
/**
2829
* <code>AdaptorConfiguration</code> provides beans for the adaptors package.
@@ -41,4 +42,10 @@ public Tika tika() {
4142
public Metadata metadata() {
4243
return new Metadata();
4344
}
45+
46+
/** replaces the default mapper used before the migration */
47+
@Bean
48+
public JacksonXmlHttpMessageConverter xmlHttpMessageConverter() {
49+
return new JacksonXmlHttpMessageConverter();
50+
}
4451
}

‎comixed-adaptors/src/main/java/org/comixedproject/adaptors/content/ComicInfoXmlFilenameContentAdaptor.java‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
import static org.apache.commons.lang3.StringUtils.trim;
2323
import static org.apache.commons.lang3.StringUtils.truncate;
2424

25-
import com.fasterxml.jackson.databind.DeserializationFeature;
2625
import java.io.ByteArrayInputStream;
27-
import java.io.IOException;
2826
import java.text.ParseException;
2927
import java.text.SimpleDateFormat;
3028
import java.util.*;
@@ -38,8 +36,10 @@
3836
import org.comixedproject.model.comicpages.ComicPage;
3937
import org.comixedproject.model.metadata.ComicInfo;
4038
import org.comixedproject.model.metadata.PageInfo;
41-
import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter;
39+
import org.springframework.http.converter.xml.JacksonXmlHttpMessageConverter;
4240
import org.springframework.util.StringUtils;
41+
import tools.jackson.core.exc.StreamReadException;
42+
import tools.jackson.databind.DeserializationFeature;
4343

4444
/**
4545
* <code>ComicInfoXmlFilenameContentAdaptor</code> provides an implementation of {@link
@@ -52,13 +52,15 @@ public class ComicInfoXmlFilenameContentAdaptor implements FilenameContentAdapto
5252
@Getter private ArchiveEntryType archiveEntryType = ArchiveEntryType.FILE;
5353

5454
private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
55-
private MappingJackson2XmlHttpMessageConverter xmlConverter;
55+
private final JacksonXmlHttpMessageConverter xmlConverter;
5656

5757
public ComicInfoXmlFilenameContentAdaptor() {
58-
this.xmlConverter = new MappingJackson2XmlHttpMessageConverter();
58+
this.xmlConverter = new JacksonXmlHttpMessageConverter();
5959
this.xmlConverter
60-
.getObjectMapper()
61-
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
60+
.getMapper()
61+
.rebuild()
62+
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
63+
.build();
6264
}
6365

6466
@Override
@@ -69,7 +71,7 @@ public void loadContent(final ComicBook comicBook, final String filename, final
6971
try {
7072
comicInfo =
7173
this.xmlConverter
72-
.getObjectMapper()
74+
.getMapper()
7375
.readValue(new ByteArrayInputStream(content), ComicInfo.class);
7476
log.trace("Setting comic metadata");
7577
comicBook.getComicDetail().setPublisher(trim(comicInfo.getPublisher()));
@@ -163,7 +165,7 @@ public void loadContent(final ComicBook comicBook, final String filename, final
163165
}
164166
}
165167
}
166-
} catch (IOException | ParseException error) {
168+
} catch (StreamReadException | ParseException error) {
167169
throw new ContentAdaptorException("Failed to load ComicInfo.xml", error);
168170
}
169171
}

0 commit comments

Comments
 (0)