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

refact: upgrade a string of dependencies to address CVEs report & clean code #110

Merged
merged 9 commits into from
Oct 26, 2022
Merged

refact: upgrade a string of dependencies to address CVEs report & clean code #110

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3a7ed21
feat(apache): support check license header with RAT
imbajin Oct 13, 2022
10716b2
separate some changes
imbajin Oct 19, 2022
13aaea4
enable rat in ci
imbajin Oct 19, 2022
8b1c1a8
refact: improve some code
imbajin Oct 19, 2022
ebbe665
Merge branch 'master' into clean
imbajin Oct 20, 2022
80b81cc
fix(sec): upgrade a string of dependencies to address CVEs report
imbajin Oct 20, 2022
d14792a
adopt error message with junit-4.13
imbajin Oct 20, 2022
459f8df
clean code (31 files)
imbajin Oct 21, 2022
adc98d6
ignore pom backup file
imbajin Oct 21, 2022
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
7 changes: 1 addition & 6 deletions hugegraph-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</parent>

<artifactId>hugegraph-common</artifactId>
<name>${artifactId}</name>
<name>${project.artifactId}</name>
<url>https://github.com/apache/incubator-hugegraph-commons/tree/master/hugegraph-common</url>
<description>
hugegraph-common is a common module for HugeGraph and its peripheral components.
Expand Down Expand Up @@ -211,7 +211,6 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>${compiler.source}</source>
<target>${compiler.target}</target>
Expand All @@ -226,7 +225,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<index>true</index>
Expand Down Expand Up @@ -281,7 +279,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -294,7 +291,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -307,7 +303,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
10 changes: 3 additions & 7 deletions hugegraph-common/src/test/java/org/apache/hugegraph/testutil/AssertTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,7 @@ public void testAssertThrowsWithError() {
});
Assert.fail("Expect error");
} catch (AssertionError e) {
Assert.assertEquals("No exception was thrown" +
"(expected java.lang.NullPointerException)",
e.getMessage());
Assert.assertContains("java.lang.NullPointerException", e.getMessage());
}

try {
Expand All @@ -203,10 +201,8 @@ public void testAssertThrowsWithError() {
});
Assert.fail("Expect error");
} catch (AssertionError e) {
Assert.assertEquals("Bad exception type " +
"java.lang.RuntimeException" +
"(expected java.lang.NullPointerException)",
e.getMessage());
Assert.assertContains("java.lang.NullPointerException", e.getMessage());
Assert.assertContains("java.lang.RuntimeException", e.getMessage());
}
}

Expand Down
2 changes: 1 addition & 1 deletion hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/BarrierEventTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

public class BarrierEventTest {

private static int WAIT_THREADS_COUNT = 10;
private static final int WAIT_THREADS_COUNT = 10;

@Test(timeout = 5000)
public void testAWait() throws InterruptedException {
Expand Down
7 changes: 1 addition & 6 deletions hugegraph-rpc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</parent>

<artifactId>hugegraph-rpc</artifactId>
<name>${artifactId}</name>
<name>${project.artifactId}</name>
<description>HugeGraph RPC component</description>

<properties>
Expand Down Expand Up @@ -104,7 +104,6 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>${compiler.source}</source>
<target>${compiler.target}</target>
Expand All @@ -119,7 +118,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<index>true</index>
Expand Down Expand Up @@ -174,7 +172,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -187,7 +184,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -200,7 +196,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,21 @@
<top.level.dir>${project.basedir}/..</top.level.dir>
<compiler.source>1.8</compiler.source>
<compiler.target>1.8</compiler.target>
<log4j2.version>2.17.0</log4j2.version>
<log4j2.version>2.18.0</log4j2.version>
<commons.configuration.version>1.10</commons.configuration.version>
<commons.configuration2.version>2.3</commons.configuration2.version>
<commons.configuration2.version>2.8.0</commons.configuration2.version>
<commons.beanutils.version>1.9.4</commons.beanutils.version>
<commons.collections.version>3.2.2</commons.collections.version>
<commons.io.version>2.7</commons.io.version>
<commons.codec.version>1.11</commons.codec.version>
<guava.version>25.1-jre</guava.version>
<commons.codec.version>1.13</commons.codec.version>
<guava.version>30.0-jre</guava.version>
<javax.json.version>1.0</javax.json.version>
<jsr305.version>3.0.1</jsr305.version>
<javassist.version>3.28.0-GA</javassist.version>
<jersey.version>3.0.3</jersey.version>
<jersey.hk2.version>3.0.3</jersey.hk2.version>
<jackson.version>2.12.1</jackson.version>
<junit.version>4.12</junit.version>
<jackson.version>2.14.0-rc1</jackson.version>
<junit.version>4.13.1</junit.version>
Comment on lines -63 to +77
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

contains a lot of CVE problems alerts (high impact)

and ignore commons.collections.version (3.x) now because it changed package name in version 4.x (someone could address it in future)

<mockito.version>4.1.0</mockito.version>
<jakarta.xml.version>4.0.0-RC2</jakarta.xml.version>
<sun.xml.version>3.0.2</sun.xml.version>
Expand Down