From 5ca2ae461aa403230682c832326d3bfe797f71dc Mon Sep 17 00:00:00 2001 From: Jikoo Date: Tue, 17 Jan 2017 18:06:35 -0500 Subject: [PATCH] Properly use Maven versioning for better support of dependent plugins Closes #59 Bumped version to 3.1.0-SNAPSHOT for development, really should have bumped the minor version a while back. --- .gitignore | 1 + api/pom.xml | 2 +- assembly/pom.xml | 2 +- common/pom.xml | 4 ++-- internal/1_4_5/pom.xml | 4 ++-- internal/1_4_6/pom.xml | 4 ++-- internal/pom.xml | 2 +- internal/v1_10_R1/pom.xml | 4 ++-- internal/v1_11_R1/pom.xml | 4 ++-- internal/v1_4_R1/pom.xml | 4 ++-- internal/v1_5_R2/pom.xml | 4 ++-- internal/v1_5_R3/pom.xml | 4 ++-- internal/v1_6_R1/pom.xml | 4 ++-- internal/v1_6_R2/pom.xml | 4 ++-- internal/v1_6_R3/pom.xml | 4 ++-- internal/v1_7_R1/pom.xml | 4 ++-- internal/v1_7_R2/pom.xml | 4 ++-- internal/v1_7_R3/pom.xml | 4 ++-- internal/v1_7_R4/pom.xml | 4 ++-- internal/v1_8_R1/pom.xml | 4 ++-- internal/v1_8_R2/pom.xml | 4 ++-- internal/v1_8_R3/pom.xml | 4 ++-- internal/v1_9_R1/pom.xml | 4 ++-- internal/v1_9_R2/pom.xml | 4 ++-- plugin/plugin-core/pom.xml | 6 +++--- plugin/plugin-core/src/main/resources/plugin.yml | 2 +- plugin/plugin-v1_10_R1/pom.xml | 4 ++-- plugin/pom.xml | 2 +- pom.xml | 3 +-- 29 files changed, 52 insertions(+), 52 deletions(-) diff --git a/.gitignore b/.gitignore index ec7e59c..5fd7686 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ **/bin **/out **dependency-reduced-pom.xml +**pom.xml.versionsBackup diff --git a/api/pom.xml b/api/pom.xml index 5982258..c0273c6 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvparent - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvapi diff --git a/assembly/pom.xml b/assembly/pom.xml index 1247798..3434d70 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvparent - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvassembly diff --git a/common/pom.xml b/common/pom.xml index 835f733..9090031 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvparent - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvcommon @@ -22,7 +22,7 @@ com.lishid openinvapi - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/1_4_5/pom.xml b/internal/1_4_5/pom.xml index 40c1af4..92040e3 100644 --- a/internal/1_4_5/pom.xml +++ b/internal/1_4_5/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_4_5 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/1_4_6/pom.xml b/internal/1_4_6/pom.xml index 635515a..e59ddfd 100644 --- a/internal/1_4_6/pom.xml +++ b/internal/1_4_6/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_4_6 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/pom.xml b/internal/pom.xml index 07aa5f7..69ec088 100644 --- a/internal/pom.xml +++ b/internal/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvparent - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvinternal diff --git a/internal/v1_10_R1/pom.xml b/internal/v1_10_R1/pom.xml index aa06f40..cce3865 100644 --- a/internal/v1_10_R1/pom.xml +++ b/internal/v1_10_R1/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_10_R1 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/v1_11_R1/pom.xml b/internal/v1_11_R1/pom.xml index cd13e66..3a8f614 100644 --- a/internal/v1_11_R1/pom.xml +++ b/internal/v1_11_R1/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_11_R1 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/v1_4_R1/pom.xml b/internal/v1_4_R1/pom.xml index 6cb4a93..c55cf1d 100644 --- a/internal/v1_4_R1/pom.xml +++ b/internal/v1_4_R1/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_4_R1 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/v1_5_R2/pom.xml b/internal/v1_5_R2/pom.xml index 20b7a15..9f628a0 100644 --- a/internal/v1_5_R2/pom.xml +++ b/internal/v1_5_R2/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_5_R2 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/v1_5_R3/pom.xml b/internal/v1_5_R3/pom.xml index a304ea6..76b5f5e 100644 --- a/internal/v1_5_R3/pom.xml +++ b/internal/v1_5_R3/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_5_R3 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/v1_6_R1/pom.xml b/internal/v1_6_R1/pom.xml index 3d9947d..90f101e 100644 --- a/internal/v1_6_R1/pom.xml +++ b/internal/v1_6_R1/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_6_R1 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/v1_6_R2/pom.xml b/internal/v1_6_R2/pom.xml index 9bd7e39..8608798 100644 --- a/internal/v1_6_R2/pom.xml +++ b/internal/v1_6_R2/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_6_R2 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/v1_6_R3/pom.xml b/internal/v1_6_R3/pom.xml index ed49ca1..51f6de4 100644 --- a/internal/v1_6_R3/pom.xml +++ b/internal/v1_6_R3/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_6_R3 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/v1_7_R1/pom.xml b/internal/v1_7_R1/pom.xml index d5be01d..00a16ce 100644 --- a/internal/v1_7_R1/pom.xml +++ b/internal/v1_7_R1/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_7_R1 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/v1_7_R2/pom.xml b/internal/v1_7_R2/pom.xml index a4166ce..ca26359 100644 --- a/internal/v1_7_R2/pom.xml +++ b/internal/v1_7_R2/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_7_R2 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/v1_7_R3/pom.xml b/internal/v1_7_R3/pom.xml index ee6a076..7798a96 100644 --- a/internal/v1_7_R3/pom.xml +++ b/internal/v1_7_R3/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_7_R3 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/v1_7_R4/pom.xml b/internal/v1_7_R4/pom.xml index cfcd689..3563086 100644 --- a/internal/v1_7_R4/pom.xml +++ b/internal/v1_7_R4/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_7_R4 @@ -27,7 +27,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/v1_8_R1/pom.xml b/internal/v1_8_R1/pom.xml index 470b496..9977871 100644 --- a/internal/v1_8_R1/pom.xml +++ b/internal/v1_8_R1/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_8_R1 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/v1_8_R2/pom.xml b/internal/v1_8_R2/pom.xml index f6cd3b8..0e6dfee 100644 --- a/internal/v1_8_R2/pom.xml +++ b/internal/v1_8_R2/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_8_R2 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/v1_8_R3/pom.xml b/internal/v1_8_R3/pom.xml index c1b823a..97ebec5 100644 --- a/internal/v1_8_R3/pom.xml +++ b/internal/v1_8_R3/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_8_R3 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/v1_9_R1/pom.xml b/internal/v1_9_R1/pom.xml index 7e3090d..af0111b 100644 --- a/internal/v1_9_R1/pom.xml +++ b/internal/v1_9_R1/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_9_R1 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/internal/v1_9_R2/pom.xml b/internal/v1_9_R2/pom.xml index faec01e..ad83d57 100644 --- a/internal/v1_9_R2/pom.xml +++ b/internal/v1_9_R2/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvinternal - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvadapter1_9_R2 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/plugin/plugin-core/pom.xml b/plugin/plugin-core/pom.xml index 23db1c9..2b7f8d6 100644 --- a/plugin/plugin-core/pom.xml +++ b/plugin/plugin-core/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvplugin - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvplugincore @@ -22,12 +22,12 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT com.lishid openinvpluginv1_10_r1 - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/plugin/plugin-core/src/main/resources/plugin.yml b/plugin/plugin-core/src/main/resources/plugin.yml index cd626ba..85dad27 100644 --- a/plugin/plugin-core/src/main/resources/plugin.yml +++ b/plugin/plugin-core/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: OpenInv main: com.lishid.openinv.OpenInv -version: ${openinv.version} +version: ${project.version} author: lishid authors: [Jikoo, ShadowRanger] description: > diff --git a/plugin/plugin-v1_10_R1/pom.xml b/plugin/plugin-v1_10_R1/pom.xml index 4b0cd48..4e3fe0a 100644 --- a/plugin/plugin-v1_10_R1/pom.xml +++ b/plugin/plugin-v1_10_R1/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvplugin - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvpluginv1_10_r1 @@ -21,7 +21,7 @@ com.lishid openinvcommon - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/plugin/pom.xml b/plugin/pom.xml index a386781..3539fe1 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -5,7 +5,7 @@ com.lishid openinvparent - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT openinvplugin diff --git a/pom.xml b/pom.xml index c9759dc..10f30e1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,12 @@ openinvparent OpenInvParent http://dev.bukkit.org/bukkit-plugins/openinv/ - 1.0-SNAPSHOT + 3.1.0-SNAPSHOT pom UTF-8 - 3.0.7-SNAPSHOT