[checkstyle] 04/14: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Nov 24 11:20:45 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository checkstyle.
commit 3bc0965dd73d277dc118376b21c828ddebebfc3f
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Nov 24 09:06:25 2015 +0100
Refreshed the patches
---
debian/changelog | 2 +-
debian/patches/01_link_to_system_javadocs.diff | 26 +++++++++++-----------
...nore_tests_requiring_internet_connectivity.diff | 8 +++----
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2f9336a..14d9a58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-checkstyle (6.6-1) UNRELEASED; urgency=medium
+checkstyle (6.12.1-1) UNRELEASED; urgency=medium
* New upstream release
* Refreshed the patches
diff --git a/debian/patches/01_link_to_system_javadocs.diff b/debian/patches/01_link_to_system_javadocs.diff
index dc62a42..9cf05de 100644
--- a/debian/patches/01_link_to_system_javadocs.diff
+++ b/debian/patches/01_link_to_system_javadocs.diff
@@ -5,16 +5,16 @@ Last-Update: 2011-07-19
--- a/pom.xml
+++ b/pom.xml
-@@ -960,6 +960,12 @@
- <source>1.7</source>
- <failOnError>false</failOnError>
- <linksource>true</linksource>
-+ <offlineLinks>
-+ <offlineLink>
-+ <url>file:///usr/share/doc/default-jdk-doc/api/</url>
-+ <location>file:///usr/share/doc/default-jdk-doc/api/</location>
-+ </offlineLink>
-+ </offlineLinks>
- </configuration>
- <reportSets>
- <reportSet>
+@@ -310,6 +310,12 @@
+ <source>1.7</source>
+ <failOnError>true</failOnError>
+ <linksource>true</linksource>
++ <offlineLinks>
++ <offlineLink>
++ <url>file:///usr/share/doc/default-jdk-doc/api/</url>
++ <location>file:///usr/share/doc/default-jdk-doc/api/</location>
++ </offlineLink>
++ </offlineLinks>
+ <tags>
+ <tag>
+ <name>noinspection</name>
diff --git a/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff b/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff
index 06700e0..d5bddd0 100644
--- a/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff
+++ b/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff
@@ -5,11 +5,11 @@ Forwarded: not-needed
Bug-Debian: http://bugs.debian.org/714109
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
-@@ -50,6 +50,7 @@
+@@ -65,6 +65,7 @@
}
@Test
+ @org.junit.Ignore
- public void testLoadFromURL()
- throws CheckstyleException, InterruptedException
- {
+ public void testLoadFromURL() throws Exception {
+ final String[] urlCandidates = {
+ "http://checkstyle.sourceforge.net/files/suppressions_none.xml",
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/checkstyle.git
More information about the pkg-java-commits
mailing list