@@ -570,7 +570,8 @@ private static String convertEhcacheNameToPropertiesKey(String ehcacheName, Set<
570570 * @param args
571571 */
572572 public static void main(String[] args) {
573-
573+
574+
574575 GrouperInstaller grouperInstaller = new GrouperInstaller();
575576
576577 grouperInstaller.mainLogic();
@@ -9445,38 +9446,17 @@ private void mainBuildContainerLogic() {
94459446 grouperProjects.add(new File(grouperUntarredReleaseDir + File.separator + "grouper-misc" + File.separator + "grouper-messaging-aws"));
94469447 grouperProjects.add(new File(grouperUntarredReleaseDir + File.separator + "grouper-misc" + File.separator + "grouper-messaging-rabbitmq"));
94479448
9448- // run mvn install from grouper-parent pom
9449-
94509449 List<String> commands = new ArrayList<String>();
9451-
94529450 addMavenCommands(commands);
94539451
9454- commands.add("install");
9455-
9456- File grouperParent = new File(grouperUntarredReleaseDir + File.separator + "grouper-parent");
9457-
9458- CommandResult commandResult = GrouperInstallerUtils.execCommand(GrouperInstallerUtils.toArray(commands, String.class),
9459- true, true, null, new File(grouperParent.getAbsolutePath()), null, true);
9460-
9461- if (!GrouperInstallerUtils.isBlank(commandResult.getErrorText())) {
9462- System.out.println("stderr: " + commandResult.getErrorText());
9463- }
9464- if (!GrouperInstallerUtils.isBlank(commandResult.getOutputText())) {
9465- System.out.println("stdout: " + commandResult.getOutputText());
9466- }
9467-
9468- commands = new ArrayList<String>();
9469-
9470- addMavenCommands(commands);
9471-
9472- commands.add("dependency:copy-dependencies -DincludeScope=runtime");
9452+ commands.add("-DincludeScope=runtime -DexcludeArtifactIds=grouper,grouperClient dependency:copy-dependencies");
94739453
94749454 for (File file: grouperProjects) {
94759455 System.out.println("\n##################################");
94769456 System.out.println("Downloading third party jars for "+ file.getName()+" with command:\n"
94779457 + convertCommandsIntoCommand(commands) + "\n");
94789458
9479- commandResult = GrouperInstallerUtils.execCommand(GrouperInstallerUtils.toArray(commands, String.class),
9459+ CommandResult commandResult = GrouperInstallerUtils.execCommand(GrouperInstallerUtils.toArray(commands, String.class),
94809460 true, true, null, new File(file.getAbsolutePath()), null, true);
94819461
94829462 if (!GrouperInstallerUtils.isBlank(commandResult.getErrorText())) {
@@ -9560,7 +9540,7 @@ private void mainBuildContainerLogic() {
95609540
95619541 System.out.println("Making sure gsh.sh is executable with command: " + convertCommandsIntoCommand(commands) + "\n");
95629542
9563- commandResult = GrouperInstallerUtils.execCommand(
9543+ CommandResult commandResult = GrouperInstallerUtils.execCommand(
95649544 GrouperInstallerUtils.toArray(commands, String.class), true, true, null,
95659545 binDir, null, true);
95669546
0 commit comments