[Git][java-team/dokujclient][upstream] New upstream version 3.9.1
Emmanuel Bourg
gitlab at salsa.debian.org
Mon Jan 18 14:52:56 GMT 2021
Emmanuel Bourg pushed to branch upstream at Debian Java Maintainers / dokujclient
Commits:
d00a2948 by Emmanuel Bourg at 2021-01-18T15:29:18+01:00
New upstream version 3.9.1
- - - - -
10 changed files:
- Changelog
- README.md
- 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>
```
=====================================
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/-/commit/d00a2948575ce68c0741a1fc586a527ad8d80bad
--
View it on GitLab: https://salsa.debian.org/java-team/dokujclient/-/commit/d00a2948575ce68c0741a1fc586a527ad8d80bad
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/3ebf3e8e/attachment.html>
More information about the pkg-java-commits
mailing list