From 7cbf317b42874886ad43130cecc06bc08b5fa127 Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Tue, 31 May 2022 05:07:30 -0400 Subject: [PATCH] Bump version with flatten plugin --- .gitignore | 5 +++-- api/pom.xml | 2 +- core/pom.xml | 2 +- dist/pom.xml | 3 +-- pom.xml | 37 +++++++++++++++++++++++++++++++++++-- v1_8_R1/pom.xml | 2 +- v1_8_R2/pom.xml | 2 +- v1_8_R3/pom.xml | 4 ++-- 8 files changed, 45 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index ae30cdd8c..554e8d907 100644 --- a/.gitignore +++ b/.gitignore @@ -19,10 +19,11 @@ nbdist/ # Maven files */target *dependency-reduced-pom.xml +*.flattened-pom.xml # Java files *.class *.log *.ctxt -hs_err_pid* -/target/ +hs_err_pid* +/target/ diff --git a/api/pom.xml b/api/pom.xml index f4ab6feb6..9d4cf8bfd 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -6,7 +6,7 @@ me.blackvein.quests quests-parent - 4.4.2 + ${revision} quests-api diff --git a/core/pom.xml b/core/pom.xml index 70daed22e..1f71bc046 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ me.blackvein.quests quests-parent - 4.4.2 + ${revision} quests-core diff --git a/dist/pom.xml b/dist/pom.xml index e5567aeba..ee69c3e58 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -6,10 +6,9 @@ me.blackvein.quests quests-parent - 4.4.2 + ${revision} quests-dist - pom true diff --git a/pom.xml b/pom.xml index 73308f31d..0e611674a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 me.blackvein.quests - 4.4.2 + ${revision} quests-parent pom @@ -21,7 +21,9 @@ - 4.4.2 + 4.4.3 + true + resolveCiFriendliesOnly UTF-8 1.8 1.8 @@ -33,4 +35,35 @@ https://repo.codemc.io/repository/nms/ + + + + + org.codehaus.mojo + flatten-maven-plugin + 1.1.0 + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + true + + + diff --git a/v1_8_R1/pom.xml b/v1_8_R1/pom.xml index c4c121703..87acc2860 100644 --- a/v1_8_R1/pom.xml +++ b/v1_8_R1/pom.xml @@ -6,7 +6,7 @@ me.blackvein.quests quests-parent - 4.4.2 + ${revision} quests-v1_8_R1 diff --git a/v1_8_R2/pom.xml b/v1_8_R2/pom.xml index 786edddc6..bdb56955d 100644 --- a/v1_8_R2/pom.xml +++ b/v1_8_R2/pom.xml @@ -6,7 +6,7 @@ me.blackvein.quests quests-parent - 4.4.2 + ${revision} quests-v1_8_R2 diff --git a/v1_8_R3/pom.xml b/v1_8_R3/pom.xml index b46f1a85d..2435c3ef8 100644 --- a/v1_8_R3/pom.xml +++ b/v1_8_R3/pom.xml @@ -1,12 +1,12 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 me.blackvein.quests quests-parent - 4.4.2 + ${revision} quests-v1_8_R3