[Git][java-team/dokujclient][master] 9 commits: Standards-Version updated to 4.5.1
Emmanuel Bourg
gitlab at salsa.debian.org
Mon Jan 18 14:52:53 GMT 2021
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / dokujclient
Commits:
8e77a006 by Emmanuel Bourg at 2021-01-18T14:55:03+01:00
Standards-Version updated to 4.5.1
- - - - -
7613dfa8 by Emmanuel Bourg at 2021-01-18T14:55:08+01:00
Switch to debhelper level 13
- - - - -
93968faa by Emmanuel Bourg at 2021-01-18T14:55:12+01:00
Use salsa.debian.org Vcs-* URLs
- - - - -
70ddd418 by Emmanuel Bourg at 2021-01-18T15:28:27+01:00
Removed the -java-doc package
- - - - -
48f02b9c by Emmanuel Bourg at 2021-01-18T15:28:30+01:00
Wrap and sort
- - - - -
84958c1f by Emmanuel Bourg at 2021-01-18T15:28:30+01:00
Build with the DH sequencer instead of CDBS
- - - - -
d00a2948 by Emmanuel Bourg at 2021-01-18T15:29:18+01:00
New upstream version 3.9.1
- - - - -
9e91373f by Emmanuel Bourg at 2021-01-18T15:29:19+01:00
Update upstream source from tag 'upstream/3.9.1'
Update to upstream version '3.9.1'
with Debian dir 7b8aa2ffb3e072b0990726e50c2006aa94bdfca8
- - - - -
d540271e by Emmanuel Bourg at 2021-01-18T15:37:19+01:00
New upstream release (3.9.1)
- - - - -
19 changed files:
- Changelog
- README.md
- debian/changelog
- + debian/clean
- − debian/compat
- debian/control
- − debian/libdokujclient-java-doc.doc-base.api
- − debian/libdokujclient-java-doc.install
- debian/maven.ignoreRules
- debian/rules
- − debian/scripts/test.sh
- man/man.footer.txt
- pom.xml
- src/main/java/dw/xmlrpc/ExceptionConverter.java
- src/test/java/dw/cli/commands/itest/Test_LinksLister.java
- src/test/java/dw/cli/itest/TestHelper.java
- src/test/java/dw/xmlrpc/itest/TestParams.java
- src/test/java/dw/xmlrpc/itest/Test_XmlRpcQueries.java
- src/test/resources/installTestEnvironment.sh
Changes:
=====================================
Changelog
=====================================
@@ -1,3 +1,6 @@
+* Upgrade aXMLRPC to fix #27
+
+3.9.0
* Fix getPageVersions when a non 0 offset is provided
3.8.1
=====================================
README.md
=====================================
@@ -3,14 +3,15 @@ and a Java library for [Dokuwiki xmlrpc interface](https://www.dokuwiki.org/deve
which is also compatible with Android.
Currently tested with:
-* Elenor of Tsort (dokuwiki-2016-06-26)
-* Detritus (dokuwiki-2015-08-10)
-* Hrun (dokuwiki-2014-09-29)
-* Ponder Stibbons (dokuwiki-2014-05-05)
-* Binky (dokuwiki-2013-12-08)
-* Weatherwax (dokuwiki-2013-05-10)
-* Adora Belle (dokuwiki-2012-10-03)
-* Angua (dokuwiki-2012-01-25b)
+* Frusterick Manners (dokuwiki-2017-02-19)
+* Elenor of Tsort (dokuwiki-2016-06-26)
+* Detritus (dokuwiki-2015-08-10)
+* Hrun (dokuwiki-2014-09-29)
+* Ponder Stibbons (dokuwiki-2014-05-05)
+* Binky (dokuwiki-2013-12-08)
+* Weatherwax (dokuwiki-2013-05-10)
+* Adora Belle (dokuwiki-2012-10-03)
+* Angua (dokuwiki-2012-01-25b)
See the "Compatibility" section for more info
@@ -115,7 +116,7 @@ JAR files are available via [Maven Central](http://repo1.maven.org/maven2/fr/tur
<dependency>
<groupId>fr.turri</groupId>
<artifactId>dokujclient</artifactId>
- <version>3.8.0</version>
+ <version>3.9.0</version>
</dependency>
```
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+dokujclient (3.9.1-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ * Build with the DH sequencer instead of CDBS
+ * Removed the -java-doc package (Closes: #961699)
+ * Standards-Version updated to 4.5.1
+ * Switch to debhelper level 13
+ * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 18 Jan 2021 15:36:25 +0100
+
dokujclient (3.9.0-1) unstable; urgency=medium
* New upstream release
=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+man/man1/dokujclient.1
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9
=====================================
debian/control
=====================================
@@ -3,51 +3,34 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Guillaume Turri <guillaume.turri at gmail.com>
-Build-Depends: cdbs,
- debhelper (>= 9),
- default-jdk,
- maven-debian-helper (>= 1.5)
-Build-Depends-Indep: default-jdk-doc,
- libaxmlrpc-java (>= 1.8.0),
- libaxmlrpc-java-doc,
- libguava-java,
- libguava-java-doc,
- libjsap-java,
- libjsap-java-doc,
- libmaven-javadoc-plugin-java
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/dokujclient.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/dokujclient.git
+Build-Depends:
+ debhelper-compat (= 13),
+ default-jdk,
+ libaxmlrpc-java (>= 1.8.0),
+ libguava-java,
+ libjsap-java,
+ maven-debian-helper (>= 1.5)
+Standards-Version: 4.5.1
+Vcs-Git: https://salsa.debian.org/java-team/dokujclient.git
+Vcs-Browser: https://salsa.debian.org/java-team/dokujclient
Homepage: https://github.com/gturri/dokuJClient
Package: libdokujclient-java
Architecture: all
Depends: ${maven:Depends}, ${misc:Depends}
-Suggests: libdokujclient-java-doc, ${maven:OptionalDepends}
+Suggests: ${maven:OptionalDepends}
Description: Client library for Dokuwiki's xmlrpc interface
Java library which can be used in other programs, to interact
(read, write, ...) with an instance of Dokuwiki.
Nearly all the xmlrpc interface is mirrored, and all recent versions
of Dokuwiki are supported.
-Package: libdokujclient-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Recommends: ${maven:DocDepends}, ${maven:DocOptionalDepends}
-Suggests: libdokujclient-java
-Description: Client for Dokuwiki's xmlrpc interface -- documentation
- Java library which can be used in other programs, to interact
- (read, write, ...) with an instance of Dokuwiki.
- Nearly all the xmlrpc interface is mirrored, and all recent versions
- of Dokuwiki are supported.
- .
- This package contains the API documentation of libdokujclient-java.
-
Package: dokujclient
Architecture: all
-Depends: default-jre-headless | java6-runtime-headless, libdokujclient-java, ${misc:Depends}
-Suggests:
+Depends:
+ default-jre-headless | java6-runtime-headless,
+ libdokujclient-java,
+ ${misc:Depends}
Description: Command line tool to interact with an instance of Dokuwiki
Command line tool which can be used interactively or in scripts, to
interact (read, write, ...) with an instance of Dokuwiki.
=====================================
debian/libdokujclient-java-doc.doc-base.api deleted
=====================================
@@ -1,10 +0,0 @@
-Document: libdokujclient-java
-Title: API Javadoc for fr.turri:dokujclient
-Author: fr.turri:dokujclient developers
-Abstract: This is the API Javadoc provided for the
- libdokujclient-java library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libdokujclient-java/api/index.html
-Files: /usr/share/doc/libdokujclient-java/api/*
=====================================
debian/libdokujclient-java-doc.install deleted
=====================================
@@ -1 +0,0 @@
-target/apidocs/* usr/share/doc/libdokujclient-java/api
=====================================
debian/maven.ignoreRules
=====================================
@@ -5,6 +5,7 @@ junit junit * * * *
org.apache.maven.plugins maven-antrun-plugin * * * *
org.apache.maven.plugins maven-assembly-plugin * * * *
org.apache.maven.plugins maven-dependency-plugin * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
org.apache.maven.plugins maven-surefire-plugin * * * *
org.codehaus.mojo cobertura-maven-plugin * * * *
org.codehaus.mojo findbugs-maven-plugin * * * *
=====================================
debian/rules
=====================================
@@ -1,20 +1,18 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+%:
+ dh $@
-JAVA_HOME := /usr/lib/jvm/default-java
+override_dh_auto_build:
+ dh_auto_build
-build/dokujclient::
# Build the man page
cd man && DOKUJCLIENT_CMD='../debian/scripts/dokujclient_from_build_tree.sh' ./build_man.sh
-binary-predeb/dokujclient::
- # Test the command line tool
- PKG_LIB_PATH=debian/libdokujclient-java/usr/share/java PKG_BIN_PATH=debian/dokujclient/usr/bin ./debian/scripts/test.sh
-
-clean::
- rm -f man/man1/dokujclient.1
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ dh_auto_test
-get-orig-source:
- uscan --download-current-version --force-download --rename
+ # Test the command line tool
+ CLASSPATH=target/dokujclient-3.9.1.jar debian/scripts/dokujclient --help
+endif
=====================================
debian/scripts/test.sh deleted
=====================================
@@ -1,3 +0,0 @@
-#/bin/bash
-
-CLASSPATH=$PKG_LIB_PATH/dokujclient.jar $PKG_BIN_PATH/dokujclient --help
=====================================
man/man.footer.txt
=====================================
@@ -9,7 +9,7 @@ and put some or all of this info in it.
.SH EXAMPLES
- dokujclient \-\-user myUser \-\-password myPassword \-\-url http://mywiki/lib/lib/exe/xmlrpc.php getTitle
+ dokujclient \-\-user myUser \-\-password myPassword \-\-url http://mywiki/lib/exe/xmlrpc.php getTitle
> myWiki title
dokujclient help
=====================================
pom.xml
=====================================
@@ -4,7 +4,7 @@
<groupId>fr.turri</groupId>
<artifactId>dokujclient</artifactId>
<packaging>jar</packaging>
- <version>3.9.0</version>
+ <version>3.9.1</version>
<name>${project.groupId}:${project.artifactId}</name>
<description>Library to use the xmlrpc interface of Dokuwiki</description>
<url>http://turri.fr/dokujclient</url>
@@ -24,7 +24,7 @@
<connection>scm:git:https://github.com/gturri/dokuJClient.git</connection>
<developerConnection>scm:git:git at github.com:gturri/dokuJClient.git</developerConnection>
<url>https://github.com/gturri/DokuJClient</url>
- <tag>dokujclient-3.9.0</tag>
+ <tag>dokujclient-3.9.1</tag>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -89,7 +89,7 @@
<dependency>
<groupId>fr.turri</groupId>
<artifactId>aXMLRPC</artifactId>
- <version>1.9.0</version>
+ <version>1.10.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
=====================================
src/main/java/dw/xmlrpc/ExceptionConverter.java
=====================================
@@ -91,7 +91,7 @@ class ExceptionConverter {
return new DokuAttachmentUploadException(message, e);
}
- if ( e.getCause() != null && e.getCause().getClass() == SAXParseException.class){
+ if (message.contains("XML-RPC server not enabled") || (e.getCause() != null && e.getCause().getClass() == SAXParseException.class)){
return new DokuMisConfiguredWikiException("The wiki doesn't seem to be configured to accept incoming xmlrpc requests." +
" Check the 'remote' option in Dokuwiki's configuration manager.", e);
}
=====================================
src/test/java/dw/cli/commands/itest/Test_LinksLister.java
=====================================
@@ -15,7 +15,7 @@ public class Test_LinksLister extends TestHelper{
public void listLinksWithLongFormat() throws Exception {
String expected = "extern http://dokuwiki.org http://dokuwiki.org"
+ "\nextern http://github.com/gturri http://github.com/gturri"
- + "\nlocal ns1:dummy /dokuwikiITestsForXmlRpcClient_dokuwiki-2016-06-26/doku.php?id=ns1:dummy";
+ + "\nlocal ns1:dummy /dokuwikiITestsForXmlRpcClient_dokuwiki-2017-02-19/doku.php?id=ns1:dummy";
assertSuccess(expected, runWithArguments("listLinks", "-l", "links:start"));
}
=====================================
src/test/java/dw/cli/itest/TestHelper.java
=====================================
@@ -13,7 +13,7 @@ import dw.cli.Program;
import dw.xmlrpc.itest.TestParams;
public class TestHelper {
- protected final TestParams params = new TestParams("dokuwiki-2016-06-26", "Release 2016-06-26 \"Elenor of Tsort\"", 10, 2);
+ protected final TestParams params = new TestParams("dokuwiki-2017-02-19", "Release 2017-02-19 \"Frusterick Manners\"", 10, 2);
protected final String dateRegex = "[A-Za-z]{3} [A-Za-z]{3} [0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} [A-Z]{3}? [0-9]{4}";
=====================================
src/test/java/dw/xmlrpc/itest/TestParams.java
=====================================
@@ -43,14 +43,15 @@ public class TestParams {
public static Collection<Object[]> data() {
List<Object[]> result = new ArrayList<Object[]>();
- result.add(new Object[]{new TestParams("dokuwiki-2012-01-25b", "Release 2012-01-25b \"Angua\"", 6, 2)});
- result.add(new Object[]{new TestParams("dokuwiki-2012-10-13", "Release 2012-10-13 \"Adora Belle\"", 7, 2)});
- result.add(new Object[]{new TestParams("dokuwiki-2013-05-10", "Release 2013-05-10 \"Weatherwax\"", 8, 2)});
+ //result.add(new Object[]{new TestParams("dokuwiki-2012-01-25b", "Release 2012-01-25b \"Angua\"", 6, 2)});
+ //result.add(new Object[]{new TestParams("dokuwiki-2012-10-13", "Release 2012-10-13 \"Adora Belle\"", 7, 2)});
+ //result.add(new Object[]{new TestParams("dokuwiki-2013-05-10", "Release 2013-05-10 \"Weatherwax\"", 8, 2)});
result.add(new Object[]{new TestParams("dokuwiki-2013-12-08", "Release 2013-12-08 \"Binky\"", 8, 2)});
- result.add(new Object[]{new TestParams("dokuwiki-2014-05-05", "Release 2014-05-05 \"Ponder Stibbons\"", 9, 2)});
- result.add(new Object[]{new TestParams("dokuwiki-2014-09-29a", "Release 2014-09-29a \"Hrun\"", 9, 2)});
+ //result.add(new Object[]{new TestParams("dokuwiki-2014-05-05", "Release 2014-05-05 \"Ponder Stibbons\"", 9, 2)});
+ //result.add(new Object[]{new TestParams("dokuwiki-2014-09-29a", "Release 2014-09-29a \"Hrun\"", 9, 2)});
result.add(new Object[]{new TestParams("dokuwiki-2015-08-10a", "Release 2015-08-10a \"Detritus\"", 9, 2)});
result.add(new Object[]{new TestParams("dokuwiki-2016-06-26", "Release 2016-06-26 \"Elenor of Tsort\"", 10, 2)});
+ result.add(new Object[]{new TestParams("dokuwiki-2017-02-19", "Release 2017-02-19 \"Frusterick Manners\"", 10, 2)});
return result;
}
}
=====================================
src/test/java/dw/xmlrpc/itest/Test_XmlRpcQueries.java
=====================================
@@ -461,4 +461,11 @@ public class Test_XmlRpcQueries extends TestHelper {
}
assertTrue(actuallyLogoff);
}
+
+ @org.junit.Test
+ public void putCDataEndingTag() throws Exception {
+ String data = "<code> <![CDATA[ ]]> </code>";
+ _client.putPage("dummy", data);
+ assertEquals(data, _client.getPage("dummy"));
+ }
}
=====================================
src/test/resources/installTestEnvironment.sh
=====================================
@@ -8,7 +8,7 @@ serverFileSystemOwner=www-data
baseUrl=http://localhost
dirNamePrefix=dokuwikiITestsForXmlRpcClient_
-dwVersions="dokuwiki-2013-05-10 dokuwiki-2012-10-13 dokuwiki-2012-01-25b dokuwiki-2013-12-08 dokuwiki-2014-05-05 dokuwiki-2014-09-29a dokuwiki-2015-08-10a dokuwiki-2016-06-26"
+dwVersions="dokuwiki-2013-05-10 dokuwiki-2012-10-13 dokuwiki-2012-01-25b dokuwiki-2013-12-08 dokuwiki-2014-05-05 dokuwiki-2014-09-29a dokuwiki-2015-08-10a dokuwiki-2016-06-26 dokuwiki-2017-02-19"
installDir=tmpForInstallation
relativeTestFileDir=testEnvironment
View it on GitLab: https://salsa.debian.org/java-team/dokujclient/-/compare/1749a4d4c66a95ee35cd045a197bbfac4b8dbc73...d540271e09508c2b752e6399aefe222ec03da38d
--
View it on GitLab: https://salsa.debian.org/java-team/dokujclient/-/compare/1749a4d4c66a95ee35cd045a197bbfac4b8dbc73...d540271e09508c2b752e6399aefe222ec03da38d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20210118/1f49c335/attachment.html>
More information about the pkg-java-commits
mailing list