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 56781f0e9a6cf9018461d0e5d72b6328b1f41615..3f90d2135fc44766cdb93e95f48f5eda76eb9abd 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 @@ -37,7 +37,7 @@ public class MavenUtils { private static final File SETTINGS_FILE = new File(MavenCli.USER_MAVEN_CONFIGURATION_HOME, "settings.xml"); - private static final List ADDITIONAL_BRANCHES = List.of("release", "develop"); + private static final List ADDITIONAL_BRANCHES = List.of("release", "main"); static { System.getProperties().setProperty(MULTIMODULE_PROJECT_DIRECTORY, "$M2_HOME"); @@ -74,7 +74,7 @@ public class MavenUtils { private static void initGitRepo(Path directory, Long repoGroupId, ArchetypeGenerateParam param) { try { - Git git = Git.init().setInitialBranch("main").setDirectory(directory.toFile()).call(); + Git git = Git.init().setInitialBranch("develop").setDirectory(directory.toFile()).call(); git.add().addFilepattern(".").call(); git.commit().setAllowEmpty(true).setAuthor("initializer", "no-reply@schbrain.com").setMessage("Initial Commit").call(); diff --git a/initializer-ui/package.json b/initializer-ui/package.json index b0edd73a438b92e23aba36f9004089b14d45d036..13186e04e0116c5fcc8f099d63d0c1009ddb9c77 100644 --- a/initializer-ui/package.json +++ b/initializer-ui/package.json @@ -6,16 +6,16 @@ "build": "vite build --mode production" }, "dependencies": { - "vue": "^3.2.41", + "vue": "^3.2.44", "axios": "^1.1.3", - "ant-design-vue": "^3.2.13", + "ant-design-vue": "^3.2.15", "highlight.js": "^11.6.0", "@highlightjs/vue-plugin": "^2.1.0" }, "devDependencies": { "@vitejs/plugin-vue": "^3.2.0", "typescript": "^4.8.4", - "vite": "^3.2.2", + "vite": "^3.2.3", "vue-tsc": "^1.0.9" } } \ No newline at end of file