Skip to content

Commit

Permalink
Streamline slf4j version
Browse files Browse the repository at this point in the history
  • Loading branch information
alexsuter committed Jul 5, 2024
1 parent d1a8c16 commit 204bbfb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<java.version>17</java.version>
<maven.version>3.6.3</maven.version>
<!-- version should match ivy Engine sfl4j version! And version in EngineClassLoaderFactory.SLF4J_VERSION -->
<slf4j.version>2.0.12</slf4j.version>
<slf4j.version>2.0.13</slf4j.version>
<site.path>snapshot</site.path>
<other.site.path>release</other.site.path>
<other.site.name>Stable</other.site.name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* Factory that provides an {@link URLClassLoader} for ivy Engine class access.
* This makes invocation of engine parts possible without starting a new java
* process.
*
*
* @author Reguel Wermelinger
* @since 25.09.2014
*/
Expand All @@ -54,7 +54,7 @@ public interface OsgiDir {
}

/** must match version in pom.xml */
private static final String SLF4J_VERSION = "2.0.12";
private static final String SLF4J_VERSION = "2.0.13";

private static final List<String> ENGINE_LIB_DIRECTORIES = Arrays.asList(
OsgiDir.INSTALL_AREA + "/" + OsgiDir.LIB_BOOT,
Expand Down Expand Up @@ -102,9 +102,7 @@ public static List<File> getOsgiBootstrapClasspath(File engineDirectory) {

private static void addToClassPath(List<File> classPathFiles, File dir, IOFileFilter fileFilter) {
if (dir.isDirectory()) {
for (File jar : FileUtils.listFiles(dir, fileFilter, null)) {
classPathFiles.add(jar);
}
classPathFiles.addAll(FileUtils.listFiles(dir, fileFilter, null));
}
}

Expand All @@ -115,9 +113,7 @@ public static List<File> getIvyEngineClassPathFiles(File engineDirectory) {
if (!jarDir.isDirectory()) {
continue;
}
for (File jar : FileUtils.listFiles(jarDir, new String[] {"jar"}, true)) {
classPathFiles.add(jar);
}
classPathFiles.addAll(FileUtils.listFiles(jarDir, new String[] {"jar"}, true));
}
return classPathFiles;
}
Expand Down

0 comments on commit 204bbfb

Please sign in to comment.