From 26f85d257229bdabd76fca48de43f160b85d5594 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 4 Jul 2013 20:05:41 +1000 Subject: [PATCH] Update Depends - All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries. --- Bukkit-Patches/0011-Update-Depends.patch | 48 ++++++++++++++++++++++ CraftBukkit-Patches/0001-POM-Changes.patch | 42 +++++++++++++++++-- 2 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 Bukkit-Patches/0011-Update-Depends.patch diff --git a/Bukkit-Patches/0011-Update-Depends.patch b/Bukkit-Patches/0011-Update-Depends.patch new file mode 100644 index 0000000000..3ca7bbc6d9 --- /dev/null +++ b/Bukkit-Patches/0011-Update-Depends.patch @@ -0,0 +1,48 @@ +From b4184510926c807d10c4f125fdcc670da12abcf8 Mon Sep 17 00:00:00 2001 +From: md_5 +Date: Thu, 4 Jul 2013 20:05:19 +1000 +Subject: [PATCH] Update Depends + +- All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries. + +diff --git a/pom.xml b/pom.xml +index bc164c0..cb39d0a 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -77,21 +77,21 @@ + + org.yaml + snakeyaml +- 1.9 ++ 1.12 + jar + compile + + + com.googlecode.json-simple + json-simple +- 1.1 ++ 1.1.1 + jar + compile + + + org.avaje + ebean +- 2.7.3 ++ 2.8.1 + jar + compile + +@@ -105,7 +105,7 @@ + + commons-lang + commons-lang +- 2.3 ++ 2.6 + + + +-- +1.8.1.2 + diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch index af45373ab3..fa802a0f13 100644 --- a/CraftBukkit-Patches/0001-POM-Changes.patch +++ b/CraftBukkit-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 29ade3ffce7ddfd6bef211f8f976b6703d42606e Mon Sep 17 00:00:00 2001 +From d049c9dd36773629cf8d52ddd74c5f844f637460 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 13:07:39 +1000 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 7257f87..75ef3c9 100644 +index 8b22a1c..d1cc48d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,20 @@ @@ -70,7 +70,41 @@ index 7257f87..75ef3c9 100644 ${project.version} jar compile -@@ -145,18 +134,23 @@ +@@ -105,33 +94,6 @@ + gson + 2.1 + +- +- org.avaje +- ebean +- 2.7.3 +- jar +- provided +- +- +- org.yaml +- snakeyaml +- 1.9 +- jar +- provided +- +- +- com.google.guava +- guava +- 10.0 +- jar +- provided +- +- +- commons-lang +- commons-lang +- 2.3 +- provided +- + + + junit +@@ -145,18 +107,23 @@ 1.3 test @@ -96,7 +130,7 @@ index 7257f87..75ef3c9 100644 -@@ -210,7 +204,7 @@ +@@ -210,7 +177,7 @@ org.apache.maven.plugins maven-shade-plugin