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.

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

build(deps): bump com.h2database:h2 from 2.1.214 to 2.3.232 #6132

Merged
merged 17 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1425848
build(deps): bump com.h2database:h2 from 2.1.214 to 2.2.224
dependabot[bot] Sep 19, 2023
92ea419
fix: upgrade db file format
jeremylong Oct 9, 2023
c9fb759
Merge branch 'main' into dependabot/maven/com.h2database-h2-2.2.224
jeremylong Nov 21, 2023
2000fa8
Merge branch 'main' into dependabot/maven/com.h2database-h2-2.2.224
jeremylong Nov 21, 2023
dbd5dd6
Merge branch 'main' into dependabot/maven/com.h2database-h2-2.2.224
jeremylong Nov 27, 2023
4253012
Merge branch 'main' into dependabot/maven/com.h2database-h2-2.2.224
jeremylong Apr 16, 2024
5e925b3
Merge branch 'main' into dependabot/maven/com.h2database-h2-2.2.224
jeremylong Jun 30, 2024
2d9cb40
Merge branch 'main' into dependabot/maven/com.h2database-h2-2.2.224
jeremylong Sep 8, 2024
6061b3b
Bump further to 2.3.232
aikebah Sep 10, 2024
62f7ba2
build(deps): Update to Lucene 9.x (#6955)
aikebah Sep 9, 2024
4297e68
build(deps): bump org.apache.maven.plugins:maven-install-plugin
dependabot[bot] Sep 9, 2024
7ae19b3
build(deps): bump com.github.spotbugs:spotbugs-maven-plugin
dependabot[bot] Sep 9, 2024
033a5a9
build(deps): bump golang from 1.23.0-alpine to 1.23.1-alpine
dependabot[bot] Sep 9, 2024
b1c0ed6
build: Update Checkstyle configuration and Suppression DTD references…
aikebah Sep 10, 2024
352dad1
build(deps): bump org.apache.maven.plugins:maven-surefire-report-plugin
dependabot[bot] Sep 10, 2024
3ec62b8
build(deps): bump org.apache.commons:commons-compress
dependabot[bot] Sep 13, 2024
fa25f45
fix: bump data directory path
jeremylong Sep 17, 2024
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.0-alpine AS go
FROM golang:1.23.1-alpine AS go

FROM azul/zulu-openjdk-alpine:22 AS jlink

Expand Down
2 changes: 1 addition & 1 deletion ant/src/main/resources/task.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# the path to the data directory
data.directory=data/9.0
data.directory=data/11.0
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
<artifactId>lucene-analysis-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/dependencycheck.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ engine.version.url=https://jeremylong.github.io/DependencyCheck/current.txt
# to be supplied. If you are using another database (MySQL, Oracle, etc.) this property
# will not be used. The data.directory will be resolved and if the connection string
# below contains a %s then the data.directory will replace the %s.
data.directory=[JAR]/data/9.0
data.directory=[JAR]/data/11.0
#if the filename has a %s it will be replaced with the current expected version
data.file_name=odc.mv.db

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ public void setUp() throws Exception {
*/
@Test
public void testZippableExtensions() throws Exception {
assumeFalse(isPreviouslyLoaded("org.owasp.dependencycheck.analyzer.ArchiveAnalyzer"));
ArchiveAnalyzer instance = new ArchiveAnalyzer();
instance.initialize(getSettings());
assertTrue(instance.getFileFilter().accept(new File("c:/test.zip")));
Expand All @@ -61,21 +60,9 @@ public void testZippableExtensions() throws Exception {
*/
@Test
public void testRpmExtension() throws Exception {
assumeFalse(isPreviouslyLoaded("org.owasp.dependencycheck.analyzer.ArchiveAnalyzer"));
ArchiveAnalyzer instance = new ArchiveAnalyzer();
instance.initialize(getSettings());
assertTrue(instance.getFileFilter().accept(new File("/srv/struts-1.2.9-162.35.1.uyuni.noarch.rpm")));
}

private boolean isPreviouslyLoaded(String className) {
try {
Method m = ClassLoader.class.getDeclaredMethod("findLoadedClass", String.class);
m.setAccessible(true);
Object t = m.invoke(Thread.currentThread().getContextClassLoader(), className);
return t != null;
} catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
Logger.getLogger(ArchiveAnalyzerTest.class.getName()).log(Level.SEVERE, null, ex);
}
return false;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

import java.io.IOException;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import static org.apache.lucene.analysis.BaseTokenStreamTestCase.checkOneTerm;
import static org.apache.lucene.analysis.BaseTokenStreamTestCase.checkRandomData;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase;
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.checkOneTerm;
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.checkRandomData;
import org.apache.lucene.tests.analysis.MockTokenizer;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.KeywordTokenizer;
import static org.apache.lucene.util.LuceneTestCase.RANDOM_MULTIPLIER;
import static org.apache.lucene.util.LuceneTestCase.random;
import static org.apache.lucene.tests.util.LuceneTestCase.RANDOM_MULTIPLIER;
import static org.apache.lucene.tests.util.LuceneTestCase.random;
import org.junit.Test;
import static org.junit.Assert.*;
import org.junit.Before;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

import java.io.IOException;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import static org.apache.lucene.analysis.BaseTokenStreamTestCase.checkOneTerm;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase;
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.checkOneTerm;
import org.apache.lucene.tests.analysis.MockTokenizer;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.KeywordTokenizer;
import static org.junit.Assert.fail;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

import java.io.IOException;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.tests.analysis.MockTokenizer;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.KeywordTokenizer;
import org.junit.Test;
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/resources/dependencycheck.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ engine.version.url=https://jeremylong.github.io/DependencyCheck/current.txt
# to be supplied. If you are using another database (MySQL, Oracle, etc.) this property
# will not be used. The data.directory will be resolved and if the connection string
# below contains a %s then the data.directory will replace the %s.
data.directory=[JAR]/data/9.0
data.directory=[JAR]/data/11.0
#if the filename has a %s it will be replaced with the current expected version
data.file_name=odc.mv.db
data.version=5.5
Expand Down
2 changes: 1 addition & 1 deletion maven/src/main/resources/mojo.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
#### If the data directory version is changed remember to change
#### the gradle plugin also - `DataExtension.groovy`
####
data.directory=[JAR]/../../dependency-check-data/9.0
data.directory=[JAR]/../../dependency-check-data/11.0
analyzer.central.enabled=false
2 changes: 1 addition & 1 deletion maven/src/test/resources/mojo.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# the path to the data directory
data.directory=[JAR]/dependency-check-data/9.0
data.directory=[JAR]/dependency-check-data/11.0
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ Copyright (c) 2012 - Jeremy Long
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<github.global.server>github</github.global.server>

<apache.lucene.version>8.11.3</apache.lucene.version>
<apache.lucene.version>9.11.1</apache.lucene.version>
<apache.ant.version>1.10.14</apache.ant.version>

<!-- upgrading slf4j and logback can cause issues ;) https://github.com/jeremylong/DependencyCheck/issues/4846 -->
Expand All @@ -135,14 +135,14 @@ Copyright (c) 2012 - Jeremy Long
<!-- upgrading beyond 2.5 breaks maven site-->
<maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
<maven-project-info-reports-plugin.version>3.6.1</maven-project-info-reports-plugin.version>
<maven-surefire-report-plugin.version>3.2.5</maven-surefire-report-plugin.version>
<maven-surefire-report-plugin.version>3.5.0</maven-surefire-report-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<spotbugs.version>4.8.5</spotbugs.version>
<spotbugs.maven.plugin.version>4.8.6.2</spotbugs.maven.plugin.version>
<spotbugs.maven.plugin.version>4.8.6.3</spotbugs.maven.plugin.version>
<taglist-maven-plugin.version>3.1.0</taglist-maven-plugin.version>
<versions-maven-plugin.version>2.17.1</versions-maven-plugin.version>
<jetbrains.annotations.version>24.1.0</jetbrains.annotations.version>
<com.h2database.version>2.1.214</com.h2database.version>
<com.h2database.version>2.3.232</com.h2database.version>
<commons-cli.version>1.8.0</commons-cli.version>
<commons-io.version>2.16.1</commons-io.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
Expand All @@ -156,7 +156,7 @@ Copyright (c) 2012 - Jeremy Long
<hamcrest.version>2.2</hamcrest.version>
<mockito-core.version>5.12.0</mockito-core.version>
<jsoup.version>1.17.2</jsoup.version>
<commons-compress.version>1.27.0</commons-compress.version>
<commons-compress.version>1.27.1</commons-compress.version>
<org.apache.maven.shared.file-management.version>3.1.0</org.apache.maven.shared.file-management.version>
<maven-plugin-testing-harness.version>3.3.0</maven-plugin-testing-harness.version>
<maven-plugin-annotations.version>3.13.1</maven-plugin-annotations.version>
Expand Down Expand Up @@ -260,7 +260,7 @@ Copyright (c) 2012 - Jeremy Long
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.2</version>
<version>3.1.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -1127,7 +1127,7 @@ Copyright (c) 2012 - Jeremy Long
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
<artifactId>lucene-analysis-common</artifactId>
<version>${apache.lucene.version}</version>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions src/main/config/checkstyle-checks.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">

<module name="Checker">
<!--
Expand Down
4 changes: 2 additions & 2 deletions src/main/config/checkstyle-suppressions.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>

<!DOCTYPE suppressions PUBLIC
"-//Puppy Crawl//DTD Suppressions 1.0//EN"
"http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd">

<suppressions>
<suppress checks=".*" files=".*[\\/]package-info\.java" />
Expand Down
Binary file modified src/test/resources/data.zip
Binary file not shown.
Loading