diff --git a/grouper-misc/grouper-installer/src/java/edu/internet2/middleware/grouperInstaller/GrouperInstaller.java b/grouper-misc/grouper-installer/src/java/edu/internet2/middleware/grouperInstaller/GrouperInstaller.java index a91100c89dd9..9bc44397eaa2 100644 --- a/grouper-misc/grouper-installer/src/java/edu/internet2/middleware/grouperInstaller/GrouperInstaller.java +++ b/grouper-misc/grouper-installer/src/java/edu/internet2/middleware/grouperInstaller/GrouperInstaller.java @@ -11152,6 +11152,9 @@ public boolean accept(File dir, String name) { // now download all the grouper project jars downloadGrouperJarsIntoLibDirectory(webInfDir); + // delete slf4j-api-1.6.1.jar from all the lib dirs + deleteJarsFromLibDirs(webInfDir, new String[] {"slf4j-api-1.6.1.jar"}); + // take care of conflicting jars reportOnConflictingJars(libDir.getAbsolutePath()); reportOnConflictingJars(libUiAndDaemonDir.getAbsolutePath()); @@ -13575,6 +13578,24 @@ private File downloadGrouperSourceTagFromGithub() { return grouperSourceCodeFile; } + private void deleteJarsFromLibDirs(File webInfDir, String[] jarsToBeDeleted) { + + for (String jarName: jarsToBeDeleted) { + File jarInLibDir = new File(webInfDir+File.separator+"lib" + File.separator + jarName); + GrouperInstallerUtils.fileDelete(jarInLibDir); + + File jarInLibUiAndDaemonDir = new File(webInfDir+File.separator+"libUiAndDaemon" + File.separator + jarName ); + GrouperInstallerUtils.fileDelete(jarInLibUiAndDaemonDir); + + File jarInLibWsDir = new File(webInfDir+File.separator+"libWs" + File.separator + jarName ); + GrouperInstallerUtils.fileDelete(jarInLibWsDir); + + File jarInLibScimDir = new File(webInfDir+File.separator+"libScim" + File.separator + jarName ); + GrouperInstallerUtils.fileDelete(jarInLibScimDir); + } + + } + private void downloadGrouperJarsIntoLibDirectory(File webInfDir) { String basePath = "https://oss.sonatype.org/service/local/repositories/releases/content/edu/internet2/middleware/grouper/";