Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update some dependencies #1348

Merged
merged 5 commits into from
Dec 19, 2023
Merged

update some dependencies #1348

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2420afb
update some dependencies.
ymo-sci Dec 13, 2023
89392b3
remove copyright-header from run-file
ymo-sci Dec 13, 2023
577b59d
upgrade to newest sirius-dependencies
ymo-sci Dec 18, 2023
da3f182
update to newest parent-version
ymo-sci Dec 19, 2023
746e404
upgrade to latest parent version
ymo-sci Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .run/sirius-web [test].run.xml → .../mvn clean test - without nightly.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
<!--
~ Made with all the love in the world
~ by scireum in Remshalden, Germany
~
~ Copyright by scireum GmbH
~ http://www.scireum.de - info@scireum.de
-->

<component name="ProjectRunConfigurationManager">
<configuration default="false" name="mvn clean test - without nightly" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
Expand Down
48 changes: 11 additions & 37 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<parent>
<groupId>com.scireum</groupId>
<artifactId>sirius-parent</artifactId>
<version>11.2.0</version>
<version>11.3.0</version>
</parent>
<artifactId>sirius-web</artifactId>
<version>DEVELOPMENT-SNAPSHOT</version>
<name>SIRIUS web</name>
<description>Provides a modern and scalable web server as SIRIUS module</description>

<properties>
<sirius.kernel>dev-41.0.0</sirius.kernel>
<sirius.kernel>dev-42.0.0</sirius.kernel>
</properties>

<repositories>
Expand Down Expand Up @@ -62,12 +62,12 @@
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
<exclusions>
<exclusion>
<groupId>com.github.jai-imageio</groupId>
Expand All @@ -94,52 +94,26 @@
</dependency>
<dependency>
<groupId>org.xhtmlrenderer</groupId>
<artifactId>flying-saucer-pdf</artifactId>
<version>9.1.22</version>
<exclusions>
<!-- This is replaced by com.github.librepdf:openpdf -->
<exclusion>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
</exclusion>
<exclusion>
<artifactId>bctsp-jdk14</artifactId>
<groupId>org.bouncycastle</groupId>
</exclusion>
<exclusion>
<artifactId>bcmail-jdk14</artifactId>
<groupId>org.bouncycastle</groupId>
</exclusion>
<exclusion>
<artifactId>bcprov-jdk14</artifactId>
<groupId>org.bouncycastle</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- Required as drop-in replacement for com.lowagie:itext, required by flying-saucer-pdf, as this has
security issues -->
<dependency>
<groupId>com.github.librepdf</groupId>
<artifactId>openpdf</artifactId>
<version>1.3.30</version>
<artifactId>flying-saucer-pdf-openpdf</artifactId>
<version>9.3.1</version>
</dependency>

<!-- POI is used to generate excel exports -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>5.2.2</version>
<version>5.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.2.2</version>
<version>5.2.5</version>
</dependency>

<dependency>
<groupId>com.github.pjfanning</groupId>
<artifactId>excel-streaming-reader</artifactId>
<version>4.0.5</version>
<version>4.2.1</version>
<exclusions>
<exclusion>
<groupId>com.h2database</groupId>
Expand All @@ -152,7 +126,7 @@
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>2.2.6</version>
<version>2.2.19</version>
</dependency>

<dependency>
Expand All @@ -168,7 +142,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>4.1.82.Final</version>
<version>4.1.101.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down