Skip to content

Commit

Permalink
Some vulnerabilities were addressed
Browse files Browse the repository at this point in the history
  • Loading branch information
@solomax
solomax committed Sep 26, 2024
1 parent 5a32259 commit 1b28b30
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 63 deletions.
6 changes: 6 additions & 0 deletions datatables-parent/datatables/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@
<groupId>org.webjars</groupId>
<artifactId>datatables</artifactId>
<version>2.1.0</version>
<exclusions>
<exclusion>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
Expand Down
12 changes: 12 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@
<commons-lang3.version>3.17.0</commons-lang3.version>
<commons-logging.version>1.3.4</commons-logging.version>
<commons-dbcp2.version>2.12.0</commons-dbcp2.version>
<commons-compress.version>1.27.1</commons-compress.version>
<validation-api.version>3.1.0</validation-api.version>
<jta.version>2.0.1</jta.version>
<htmlcompressor.version>1.5.2</htmlcompressor.version>
Expand Down Expand Up @@ -659,6 +660,11 @@
<artifactId>commons-dbcp2</artifactId>
<version>${commons-dbcp2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
</dependency>

<!-- SPRING -->
<dependency>
Expand Down Expand Up @@ -972,6 +978,12 @@
<groupId>org.webjars</groupId>
<artifactId>jquery-ui</artifactId>
<version>${jquery-ui.version}</version>
<exclusions>
<exclusion>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.webjars.npm</groupId>
Expand Down
132 changes: 69 additions & 63 deletions serializer-fast2/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,29 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-core</artifactId>
<version>10.3.0-SNAPSHOT</version>
</parent>
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-core</artifactId>
<version>10.3.0-SNAPSHOT</version>
</parent>

<artifactId>wicketstuff-serializer-fast2</artifactId>
<artifactId>wicketstuff-serializer-fast2</artifactId>

<name>WicketStuff Fast 2 Serializer</name>
<description>ISerializer based on version 2 of Fast https://github.com/RuedigerMoeller/fast-serialization</description>
<name>WicketStuff Fast 2 Serializer</name>
<description>ISerializer based on version 2 of Fast https://github.com/RuedigerMoeller/fast-serialization</description>

<dependencies>
<dependencies>
<dependency>
<groupId>de.ruedigermoeller</groupId>
<artifactId>fst</artifactId>
</dependency>
<dependency>
<!-- this one is required to override vulnerable commons-compress from de.ruedigermoeller:fst -->
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand All @@ -22,19 +32,15 @@
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-serializer-common</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>de.ruedigermoeller</groupId>
<artifactId>fst</artifactId>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-serializer-common</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand All @@ -56,51 +62,51 @@
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jakarta-server</artifactId>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-tester</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<!-- USAGE: mvn license:check OR mvn license:format -->
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<configuration>
<header>${header.location}</header>
<excludes>
<exclude>src/test/java/**.tree</exclude>
</excludes>
</configuration>
</plugin>
<build>
<plugins>
<plugin>
<!-- USAGE: mvn license:check OR mvn license:format -->
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<configuration>
<header>${header.location}</header>
<excludes>
<exclude>src/test/java/**.tree</exclude>
</excludes>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
--add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/java.math=ALL-UNNAMED
--add-opens java.base/java.net=ALL-UNNAMED
--add-opens java.base/java.text=ALL-UNNAMED
--add-opens java.base/java.util=ALL-UNNAMED
--add-opens java.base/java.util.concurrent=ALL-UNNAMED
--add-opens java.sql/java.sql=ALL-UNNAMED
--add-opens java.base/sun.reflect.annotation=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
</plugins>
</build>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
--add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/java.math=ALL-UNNAMED
--add-opens java.base/java.net=ALL-UNNAMED
--add-opens java.base/java.text=ALL-UNNAMED
--add-opens java.base/java.util=ALL-UNNAMED
--add-opens java.base/java.util.concurrent=ALL-UNNAMED
--add-opens java.sql/java.sql=ALL-UNNAMED
--add-opens java.base/sun.reflect.annotation=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
</plugins>
</build>

<properties>
<header.location>lic/header.txt</header.location>
</properties>
<properties>
<header.location>lic/header.txt</header.location>
</properties>
</project>

0 comments on commit 1b28b30

Please sign in to comment.