[tiles-autotag] 02/04: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Jul 18 14:22:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tiles-autotag.
commit cc57d9a693b60d40c9a3d56ea6dfc1c915a83e7e
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Jul 18 16:10:53 2016 +0200
Refreshed the patches
---
debian/changelog | 7 +++++++
debian/patches/01-xmlpull-dependency.patch | 4 ++--
debian/patches/02-velocity-compatibility.patch | 8 ++++----
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e6d822e..884eaf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tiles-autotag (1.2-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 18 Jul 2016 16:10:30 +0200
+
tiles-autotag (1.1.0-2) unstable; urgency=medium
* Use a sorted map in TemplateSuite to improve the reproducibility
diff --git a/debian/patches/01-xmlpull-dependency.patch b/debian/patches/01-xmlpull-dependency.patch
index fad6f58..be53b20 100644
--- a/debian/patches/01-xmlpull-dependency.patch
+++ b/debian/patches/01-xmlpull-dependency.patch
@@ -4,7 +4,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/maven-autotag-plugin/pom.xml
+++ b/maven-autotag-plugin/pom.xml
-@@ -59,6 +59,11 @@
+@@ -65,6 +65,11 @@
<version>1.3.1</version>
</dependency>
<dependency>
@@ -15,4 +15,4 @@ Forwarded: not-needed
+ <dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-autotag-jsp</artifactId>
- <version>1.1.0</version>
+ <version>1.2</version>
diff --git a/debian/patches/02-velocity-compatibility.patch b/debian/patches/02-velocity-compatibility.patch
index 5f11205..233e57c 100644
--- a/debian/patches/02-velocity-compatibility.patch
+++ b/debian/patches/02-velocity-compatibility.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/tiles-autotag-core/src/test/java/org/apache/tiles/autotag/generate/AbstractTemplateSuiteGeneratorTest.java
+++ b/tiles-autotag-core/src/test/java/org/apache/tiles/autotag/generate/AbstractTemplateSuiteGeneratorTest.java
-@@ -174,6 +174,7 @@
+@@ -182,6 +182,7 @@
* @throws ParseErrorException If something goes wrong.
* @throws ResourceNotFoundException If something goes wrong.
*/
@@ -11,7 +11,7 @@ Forwarded: not-needed
@Test(expected = AutotagRuntimeException.class)
public void testGenerateException3() throws Exception {
directory.delete();
-@@ -202,6 +203,7 @@
+@@ -210,6 +211,7 @@
* @throws ParseErrorException If something goes wrong.
* @throws ResourceNotFoundException If something goes wrong.
*/
@@ -21,7 +21,7 @@ Forwarded: not-needed
directory.delete();
--- a/tiles-autotag-core/src/test/java/org/apache/tiles/autotag/generate/AbstractTemplateClassGeneratorTest.java
+++ b/tiles-autotag-core/src/test/java/org/apache/tiles/autotag/generate/AbstractTemplateClassGeneratorTest.java
-@@ -177,6 +177,7 @@
+@@ -185,6 +185,7 @@
* Test method for {@link AbstractTemplateClassGenerator#generate(File, String, TemplateSuite, TemplateClass, Map)}.
* @throws Exception If something goes wrong.
*/
@@ -29,7 +29,7 @@ Forwarded: not-needed
@Test(expected = AutotagRuntimeException.class)
public void testGenerateException3() throws Exception {
directory.delete();
-@@ -208,6 +209,7 @@
+@@ -216,6 +217,7 @@
* @throws ParseErrorException If something goes wrong.
* @throws ResourceNotFoundException If something goes wrong.
*/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tiles-autotag.git
More information about the pkg-java-commits
mailing list