Commit 2e1d6ada authored by liaozan's avatar liaozan 🏀

fix: settings.xml

parent 3a7fbbcd
...@@ -28,12 +28,13 @@ public class MavenUtils { ...@@ -28,12 +28,13 @@ public class MavenUtils {
static { static {
System.getProperties().setProperty(MULTIMODULE_PROJECT_DIRECTORY, "$M2_HOME"); System.getProperties().setProperty(MULTIMODULE_PROJECT_DIRECTORY, "$M2_HOME");
getSettingsFile();
} }
public static void install(String workDirectory) { public static void install(String workDirectory) {
log.info("Prepare to install archive of : {}", workDirectory); log.info("Prepare to install archive of : {}", workDirectory);
MavenCli mavenCli = new MavenCli(); MavenCli mavenCli = new MavenCli();
mavenCli.doMain(getInstallArgs(), workDirectory, System.out, System.err); mavenCli.doMain(getInstallArgs(getSettingsFile().getAbsolutePath()), workDirectory, System.out, System.err);
log.info("Success install archive of : {}", workDirectory); log.info("Success install archive of : {}", workDirectory);
} }
...@@ -45,9 +46,7 @@ public class MavenUtils { ...@@ -45,9 +46,7 @@ public class MavenUtils {
File archetype = getArchetypeDirectory(param.getArtifact()); File archetype = getArchetypeDirectory(param.getArtifact());
String outputDirectory = archetype.getAbsolutePath(); String outputDirectory = archetype.getAbsolutePath();
File settingsFile = getSettingsFile(); String[] args = getArchetypeGenerateArgs(param, getSettingsFile().getAbsolutePath(), outputDirectory);
String[] args = getArchetypeGenerateArgs(param, settingsFile.getAbsolutePath(), outputDirectory);
mavenCli.doMain(args, null, System.out, System.err); mavenCli.doMain(args, null, System.out, System.err);
...@@ -55,7 +54,7 @@ public class MavenUtils { ...@@ -55,7 +54,7 @@ public class MavenUtils {
return ZipUtil.zip(archetype); return ZipUtil.zip(archetype);
} }
private static File getSettingsFile() throws IOException { private static File getSettingsFile() {
if (SETTINGS_FILE.exists()) { if (SETTINGS_FILE.exists()) {
return SETTINGS_FILE; return SETTINGS_FILE;
} }
...@@ -81,7 +80,11 @@ public class MavenUtils { ...@@ -81,7 +80,11 @@ public class MavenUtils {
settings.addServer(releaseServer); settings.addServer(releaseServer);
DefaultSettingsWriter settingsWriter = new DefaultSettingsWriter(); DefaultSettingsWriter settingsWriter = new DefaultSettingsWriter();
settingsWriter.write(SETTINGS_FILE, Collections.emptyMap(), settings); try {
settingsWriter.write(SETTINGS_FILE, Collections.emptyMap(), settings);
} catch (IOException e) {
log.warn("Failed to write settings file", e);
}
return SETTINGS_FILE; return SETTINGS_FILE;
} }
...@@ -93,8 +96,13 @@ public class MavenUtils { ...@@ -93,8 +96,13 @@ public class MavenUtils {
return archetype; return archetype;
} }
private static String[] getInstallArgs() { private static String[] getInstallArgs(String settingsFile) {
return new String[]{"-B", "clean", "install"}; return new String[]{
"-B",
"clean",
"install",
String.format("-gs=%s", settingsFile)
};
} }
@SuppressWarnings("SpellCheckingInspection") @SuppressWarnings("SpellCheckingInspection")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment