Merge pull request #386 from keeps/cafonso-dev

Updated dbptk version to 2.11.0
keeps · Feb 29, 2024 · 74d34fe · 74d34fe
2 parents 13f6a5b + e8c5248
commit 74d34fe
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
 
  <version.gwt>2.10.0</version.gwt>
  <scope.gwt-dev>provided</scope.gwt-dev>
- <version.dbptk>2.10.3</version.dbptk>
+ <version.dbptk>2.11.0</version.dbptk>
  <version.roda>3.7.1</version.roda>
  <version.jersey>2.35</version.jersey>
  <version.swagger>2.2.6</version.swagger>
@@ -353,13 +353,29 @@
  <dependency>
  <groupId>commons-io</groupId>
  <artifactId>commons-io</artifactId>
- <version>2.7</version>
+ <version>2.15.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mapdb</groupId>
+ <artifactId>mapdb</artifactId>
+ <version>3.0.10</version>
  </dependency>
  </dependencies>
  </dependencyManagement>
 
  <dependencies>
  <!-- internal -->
+ <dependency>
+ <groupId>com.databasepreservation</groupId>
+ <artifactId>dbptk-bindings</artifactId>
+ <version>1.5.1</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>com.databasepreservation</groupId>
+ <artifactId>dbptk-bindings-siard2-1</artifactId>
+ <version>1.5.1</version>
+ </dependency>
  <dependency>
  <groupId>com.databasepreservation</groupId>
  <artifactId>dbptk-model</artifactId>

diff --git a/src/main/java/com/databasepreservation/common/server/ViewerConfiguration.java b/src/main/java/com/databasepreservation/common/server/ViewerConfiguration.java
@@ -41,7 +41,7 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.reflections.Reflections;
-import org.reflections.scanners.ResourcesScanner;
+import org.reflections.scanners.Scanners;
 import org.reflections.util.ClasspathHelper;
 import org.reflections.util.ConfigurationBuilder;
 import org.slf4j.Logger;
@@ -776,8 +776,8 @@ protected static void copyFilesFromClasspath(String classpathPrefix, Path destin
  classLoadersList.add(ClasspathHelper.contextClassLoader());
 
  Reflections reflections = new Reflections(
- new ConfigurationBuilder().setScanners(new ResourcesScanner()).setUrls(ClasspathHelper.forPackage(classpathPrefix,
- ClasspathHelper.contextClassLoader(), ClasspathHelper.staticClassLoader())));
+ new ConfigurationBuilder().forPackage(classpathPrefix,
+ ClasspathHelper.contextClassLoader(), ClasspathHelper.staticClassLoader()).setScanners(Scanners.Resources));
 
  Set<String> resources = reflections.getResources(Pattern.compile(".*"));
  resources = resources.stream().filter(r -> !shouldExclude(r, classpathPrefix, excludePaths))