[pkg-java] r17778 - in trunk/checkstyle/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-02-16 17:54:09 +0000 (Sun, 16 Feb 2014)
New Revision: 17778

Modified:
   trunk/checkstyle/debian/changelog
   trunk/checkstyle/debian/checkstyle.poms
   trunk/checkstyle/debian/docs
   trunk/checkstyle/debian/maven.rules
   trunk/checkstyle/debian/patches/01_link_to_system_javadocs.diff
   trunk/checkstyle/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff
Log:
New upstream release (5.7)
Refreshed the patches



Modified: trunk/checkstyle/debian/changelog
===================================================================
--- trunk/checkstyle/debian/changelog	2014-02-16 13:14:01 UTC (rev 17777)
+++ trunk/checkstyle/debian/changelog	2014-02-16 17:54:09 UTC (rev 17778)
@@ -1,9 +1,11 @@
-checkstyle (5.6-3) UNRELEASED; urgency=medium
+checkstyle (5.7-1) unstable; urgency=medium
 
+  * New upstream release
+  * Refreshed the patches
   * Switch to debhelper level 9
   * Standards-Version updated to 3.9.5 (no changes)
 
- -- Emmanuel Bourg <ebourg at apache.org>  Wed, 12 Feb 2014 22:03:59 +0100
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 16 Feb 2014 18:50:32 +0100
 
 checkstyle (5.6-2) unstable; urgency=low
 

Modified: trunk/checkstyle/debian/checkstyle.poms
===================================================================
--- trunk/checkstyle/debian/checkstyle.poms	2014-02-16 13:14:01 UTC (rev 17777)
+++ trunk/checkstyle/debian/checkstyle.poms	2014-02-16 17:54:09 UTC (rev 17778)
@@ -25,4 +25,4 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --no-parent --java-lib
+pom.xml --no-parent --java-lib --has-package-version

Modified: trunk/checkstyle/debian/docs
===================================================================
--- trunk/checkstyle/debian/docs	2014-02-16 13:14:01 UTC (rev 17777)
+++ trunk/checkstyle/debian/docs	2014-02-16 17:54:09 UTC (rev 17778)
@@ -1 +1 @@
-README
+README.textile

Modified: trunk/checkstyle/debian/maven.rules
===================================================================
--- trunk/checkstyle/debian/maven.rules	2014-02-16 13:14:01 UTC (rev 17777)
+++ trunk/checkstyle/debian/maven.rules	2014-02-16 17:54:09 UTC (rev 17778)
@@ -1,8 +1,8 @@
 
 antlr antlr jar s/2\..*/2.x/ * *
+com.google.guava s/guava-jdk5/guava s/jar/bundle/ s/.*/debian/ * *
 commons-beanutils commons-beanutils jar s/.*/debian/ * *
 junit junit jar s/4\..*/4.x/ * *
 commons-beanutils s/commons-beanutils-core/commons-beanutils/ * s/.*/debian/ * *
 org.apache.ant s/ant-nodeps/ant/ * s/.*/debian/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
-s/com.google.collections/com.google.guava/ s/google-collections/guava/ * s/.*/debian/ * *

Modified: trunk/checkstyle/debian/patches/01_link_to_system_javadocs.diff
===================================================================
--- trunk/checkstyle/debian/patches/01_link_to_system_javadocs.diff	2014-02-16 13:14:01 UTC (rev 17777)
+++ trunk/checkstyle/debian/patches/01_link_to_system_javadocs.diff	2014-02-16 17:54:09 UTC (rev 17778)
@@ -5,16 +5,16 @@
 
 --- a/pom.xml
 +++ b/pom.xml
-@@ -400,6 +400,12 @@
-         <version>2.8</version>
-         <configuration>
-           <source>1.5</source>
-+          <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>
+@@ -461,6 +461,12 @@
+         <version>2.8</version>
+         <configuration>
+           <source>1.5</source>
++          <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>

Modified: trunk/checkstyle/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff
===================================================================
--- trunk/checkstyle/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff	2014-02-16 13:14:01 UTC (rev 17777)
+++ trunk/checkstyle/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff	2014-02-16 17:54:09 UTC (rev 17778)
@@ -6,10 +6,10 @@
 --- a/src/tests/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
 +++ b/src/tests/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
 @@ -56,6 +56,7 @@
-     }
- 
-     @Test
-+    @org.junit.Ignore
-     public void testLoadFromURL() throws CheckstyleException
-     {
-         final FilterSet fc = SuppressionsLoader.loadSuppressions("http://checkstyle.hg.sourceforge.net/hgweb/checkstyle/checkstyle/raw-file/055e288619a5/src/testinputs/com/puppycrawl/tools/checkstyle/suppressions_none.xml");
+     }
+ 
+     @Test
++    @org.junit.Ignore
+     public void testLoadFromURL() throws CheckstyleException
+     {
+         final FilterSet fc = SuppressionsLoader.loadSuppressions("https://raw.github.com/checkstyle/checkstyle/master/src/testinputs/com/puppycrawl/tools/checkstyle/suppressions_none.xml");