From d3d53e481b27328233a563491842b421fa1b77a5 Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Mon, 20 Mar 2023 18:49:22 +0800
Subject: [PATCH] Upgrade maven-embedder version
---
initializer-backend/pom.xml | 8 ++++----
.../archetype/initializer/maven/MavenUtils.java | 12 ++++--------
.../param/ArchetypeGenerateParam.java | 3 ++-
initializer-ui/package.json | 10 +++++-----
initializer-ui/src/components/starter.vue | 6 +-----
pom.xml | 17 +++++++++--------
6 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/initializer-backend/pom.xml b/initializer-backend/pom.xml
index e7ff14f..7a4a379 100644
--- a/initializer-backend/pom.xml
+++ b/initializer-backend/pom.xml
@@ -35,12 +35,12 @@
maven-compat
- org.eclipse.aether
- aether-connector-basic
+ org.apache.maven.resolver
+ maven-resolver-connector-basic
- org.eclipse.aether
- aether-transport-http
+ org.apache.maven.resolver
+ maven-resolver-transport-http
org.eclipse.jgit
diff --git a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/maven/MavenUtils.java b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/maven/MavenUtils.java
index 6d4ab45..6610bed 100644
--- a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/maven/MavenUtils.java
+++ b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/maven/MavenUtils.java
@@ -41,13 +41,13 @@ public class MavenUtils {
static {
System.getProperties().setProperty(MULTIMODULE_PROJECT_DIRECTORY, "$M2_HOME");
- getSettingsFile();
+ initSettingsFile();
}
public static void install(String workDirectory) {
log.info("Prepare to install archive from : {}", workDirectory);
MavenCli mavenCli = new MavenCli();
- mavenCli.doMain(getInstallArgs(getSettingsFile().getAbsolutePath()), workDirectory, System.out, System.err);
+ mavenCli.doMain(getInstallArgs(SETTINGS_FILE.getAbsolutePath()), workDirectory, System.out, System.err);
log.info("Success install archive from : {}", workDirectory);
}
@@ -57,7 +57,7 @@ public class MavenUtils {
String id = IdWorker.getIdStr();
File archetype = getArchetypeDirectory(id);
String outputDirectory = archetype.getAbsolutePath();
- String[] args = getArchetypeGenerateArgs(param, getSettingsFile().getAbsolutePath(), outputDirectory);
+ String[] args = getArchetypeGenerateArgs(param, SETTINGS_FILE.getAbsolutePath(), outputDirectory);
mavenCli.doMain(args, null, System.out, System.err);
log.info("Generate archetype project at {}", outputDirectory);
if (param.isInitGitRepo()) {
@@ -118,10 +118,7 @@ public class MavenUtils {
return gitLabApi.getProjectApi().getProject(projectPath);
}
- private static File getSettingsFile() {
- if (SETTINGS_FILE.exists()) {
- return SETTINGS_FILE;
- }
+ private static void initSettingsFile() {
Settings settings = new Settings();
settings.setLocalRepository("/data/maven/repository");
@@ -150,7 +147,6 @@ public class MavenUtils {
} catch (IOException e) {
log.warn("Failed to write settings file", e);
}
- return SETTINGS_FILE;
}
@SuppressWarnings("SpellCheckingInspection")
diff --git a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/param/ArchetypeGenerateParam.java b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/param/ArchetypeGenerateParam.java
index 634aa75..ef8b6a5 100644
--- a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/param/ArchetypeGenerateParam.java
+++ b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/param/ArchetypeGenerateParam.java
@@ -1,5 +1,6 @@
package com.schbrain.archetype.initializer.param;
+import cn.hutool.core.text.StrPool;
import lombok.Data;
import org.springframework.util.StringUtils;
@@ -58,7 +59,7 @@ public class ArchetypeGenerateParam {
public String getPackageName() {
if (!StringUtils.hasText(this.packageName)) {
- this.packageName = String.format("%s.%s", this.groupId, this.getSubModuleNamePrefix());
+ this.packageName = String.format("%s.%s", this.groupId, this.getSubModuleNamePrefix()).replace(DELIMITER, StrPool.DOT);
}
return this.packageName;
}
diff --git a/initializer-ui/package.json b/initializer-ui/package.json
index a4d1a89..bcc746b 100644
--- a/initializer-ui/package.json
+++ b/initializer-ui/package.json
@@ -7,15 +7,15 @@
},
"dependencies": {
"vue": "^3.2.47",
- "axios": "^1.3.4",
- "ant-design-vue": "^3.2.15",
+ "axios": "^1.3.5",
+ "ant-design-vue": "^3.2.17",
"highlight.js": "^11.7.0",
"@highlightjs/vue-plugin": "^2.1.0"
},
"devDependencies": {
- "@vitejs/plugin-vue": "^4.0.0",
- "typescript": "^4.9.5",
- "vite": "^4.1.4",
+ "@vitejs/plugin-vue": "^4.1.0",
+ "typescript": "^5.0.4",
+ "vite": "^4.2.1",
"vue-tsc": "^1.2.0"
}
}
\ No newline at end of file
diff --git a/initializer-ui/src/components/starter.vue b/initializer-ui/src/components/starter.vue
index ffadb70..f40d62b 100644
--- a/initializer-ui/src/components/starter.vue
+++ b/initializer-ui/src/components/starter.vue
@@ -13,7 +13,7 @@
-
+
@@ -140,10 +140,6 @@ const fetchGroupTreeList = async (initGitRepo: boolean) => {
const onGenerate = async () => {
let result = await downloadForm.value?.validate()
if (result) {
- if (!result.packageName) {
- result.packageName = result.groupId
- }
-
if (result.initGitRepo) {
if (result.repoGroupId === -1) {
message.warn('Gitlab 群组不能为空!')
diff --git a/pom.xml b/pom.xml
index 4138e43..843f759 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,10 +18,11 @@
0.0.1-SNAPSHOT
- 1.1.0
5.0.1
- 3.8.5
+ 3.9.1
1.12.1
+ 1.9.7
+ 1.9.7
@@ -52,14 +53,14 @@
${maven-embedder.version}
- org.eclipse.aether
- aether-connector-basic
- ${aether.version}
+ org.apache.maven.resolver
+ maven-resolver-connector-basic
+ ${maven-resolver-connector-basic.version}
- org.eclipse.aether
- aether-transport-http
- ${aether.version}
+ org.apache.maven.resolver
+ maven-resolver-transport-http
+ ${maven-resolver-transport-http.version}
org.gitlab4j
--
GitLab