[jspwiki-site] branch asf-site updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new ad5e75c Automatic Site Publish by Buildbot
ad5e75c is described below
commit ad5e75c2ba339cd96415a2982c8f73a6b6e72629
Author: jenkins
AuthorDate: Tue Dec 25 23:22:44 2018 +
Automatic Site Publish by Buildbot
---
japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html | 2 +-
japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
index e2a4108..76a0787 100644
--- a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
+++ b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
@@ -131,7 +131,7 @@ ul {
New:/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-main/2.11.0.M1-SNAPSHOT/jspwiki-main-2.11.0.M1-SNAPSHOT.jar
-Created:2018-12-25T23:14:59.612+
+Created:2018-12-25T23:21:31.055+
Access modifier filter:PROTECTED
diff --git a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
index 7b8a820..c386299 100644
--- a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
+++ b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
@@ -131,7 +131,7 @@ ul {
New:/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-markdown/2.11.0.M1-SNAPSHOT/jspwiki-markdown-2.11.0.M1-SNAPSHOT.jar
-Created:2018-12-25T23:14:58.481+
+Created:2018-12-25T23:21:29.930+
Access modifier filter:PROTECTED
[jspwiki-site] branch asf-site updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 4101e83 Automatic Site Publish by Buildbot
4101e83 is described below
commit 4101e83b368c974b5653aad6c79810d09a3d9a3d
Author: jenkins
AuthorDate: Tue Dec 25 23:09:43 2018 +
Automatic Site Publish by Buildbot
---
japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html | 2 +-
japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
index 28df514..1e8fe16 100644
--- a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
+++ b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
@@ -131,7 +131,7 @@ ul {
New:/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-main/2.11.0.M1-SNAPSHOT/jspwiki-main-2.11.0.M1-SNAPSHOT.jar
-Created:2018-12-25T23:02:05.592+
+Created:2018-12-25T23:08:29.962+
Access modifier filter:PROTECTED
diff --git a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
index 52230fa..a42a0aa 100644
--- a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
+++ b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
@@ -131,7 +131,7 @@ ul {
New:/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-markdown/2.11.0.M1-SNAPSHOT/jspwiki-markdown-2.11.0.M1-SNAPSHOT.jar
-Created:2018-12-25T23:02:04.510+
+Created:2018-12-25T23:08:28.814+
Access modifier filter:PROTECTED
[jspwiki] build #16 - SUCCESS
See https://builds.apache.org/job/jspwiki/16/
[jspwiki-site] branch asf-site updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 0ae325c Automatic Site Publish by Buildbot
0ae325c is described below
commit 0ae325c3ff561201c67e5bbf909e2d5ee871e1a3
Author: jenkins
AuthorDate: Tue Dec 25 23:03:18 2018 +
Automatic Site Publish by Buildbot
---
japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html | 2 +-
japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
index 1b1c666..28df514 100644
--- a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
+++ b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
@@ -131,7 +131,7 @@ ul {
New:/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-main/2.11.0.M1-SNAPSHOT/jspwiki-main-2.11.0.M1-SNAPSHOT.jar
-Created:2018-12-25T22:18:29.938+
+Created:2018-12-25T23:02:05.592+
Access modifier filter:PROTECTED
diff --git a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
index 8d6049e..52230fa 100644
--- a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
+++ b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
@@ -131,7 +131,7 @@ ul {
New:/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-markdown/2.11.0.M1-SNAPSHOT/jspwiki-markdown-2.11.0.M1-SNAPSHOT.jar
-Created:2018-12-25T22:18:28.681+
+Created:2018-12-25T23:02:04.510+
Access modifier filter:PROTECTED
[jspwiki-site] branch asf-site updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new c823c0b Automatic Site Publish by Buildbot
c823c0b is described below
commit c823c0bee3d03649e5c650ea895416c1053a3d53
Author: jenkins
AuthorDate: Tue Dec 25 22:19:42 2018 +
Automatic Site Publish by Buildbot
---
japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html | 94 +++---
.../2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html | 2 +-
2 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
index 7c9e7ba..1b1c666 100644
--- a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
+++ b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
@@ -131,7 +131,7 @@ ul {
New:/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-main/2.11.0.M1-SNAPSHOT/jspwiki-main-2.11.0.M1-SNAPSHOT.jar
-Created:2018-12-24T01:07:49.892+
+Created:2018-12-25T22:18:29.938+
Access modifier filter:PROTECTED
@@ -28780,7 +28780,7 @@ ul {
-5151
+5150
@@ -28796,7 +28796,7 @@ ul {
-6161
+6159
@@ -28824,7 +28824,7 @@ ul {
-7474
+7472
@@ -28840,7 +28840,7 @@ ul {
-102102
+102100
@@ -28856,7 +28856,7 @@ ul {
-116116
+116113
@@ -28872,7 +28872,7 @@ ul {
-128128
+128126
@@ -2,7 +2,7 @@ ul {
-149149
+149147
@@ -28904,7 +28904,7 @@ ul {
-172172
+172166
@@ -28920,7 +28920,7 @@ ul {
-184184
+184177
@@ -28936,7 +28936,7 @@ ul {
-197197
+197188
@@ -28952,7 +28952,7 @@ ul {
-210210
+210199
@@ -36322,7 +36322,7 @@ ul {
-265252
+265250
@@ -36338,7 +36338,7 @@ ul {
-282269
+282267
@@ -36354,7 +36354,7 @@ ul {
-215202
+215200
@@ -36370,7 +36370,7 @@ ul {
-177162
+177160
@@ -36386,7 +36386,7 @@ ul {
-197184
+197182
@@ -36418,7 +36418,7 @@ ul {
-348335
+348333
@@ -36556,7 +36556,7 @@ ul {
-363350
+363348
@@ -36572,7 +36572,7 @@ ul {
-363350
+363348
@@ -44110,7 +44110,7 @@ ul {
-9293
+9292
@@ -44151,7 +44151,7 @@ ul {
-203203
+203202
@@ -44180,7 +44180,7 @@ ul {
-599559
+599558
@@ -44209,7 +44209,7 @@ ul {
-619579
+619578
@@ -44225,7 +44225,7 @@ ul {
-308273
+308272
@@ -44241,7 +44241,7 @@ ul {
-335300
+335299
@@ -44257,7 +44257,7 @@ ul {
-192194
+192193
@@ -44273,7 +44273,7 @@ ul {
-735696
+735695
@@ -44305,7 +44305,7 @@ ul {
-138140
+138139
@@ -44334,7 +44334,7 @@ ul {
-450415
+450414
@@ -44350,7 +44350,7 @@ ul {
-513479
+513478
@@ -44366,7 +44366,7 @@ ul {
-566532
+566531
@@ -44382,7 +44382,7 @@ ul {
-387352
+387351
@@ -61339,7 +61339,7 @@ ul {
-737729
+737705
@@ -61355,7 +61355,7 @@ ul {
-251251
+251227
@@ -61371,7 +61371,7 @@ ul {
-306306
+306282
@@ -61387,7 +61387,7 @@ ul {
-334334
+334310
@@ -61403,7 +61403,7 @@ ul {
-658650
+658626
@@ -61419,7 +61419,7 @@ ul {
-854846
+854822
@@ -61435,7 +61435,7 @@ ul {
-797789
+797765
@@ -61451,7 +61451,7 @@ ul {
-819811
+819787
@@ -61467,7 +61467,7 @@ ul {
-447446
+447422
@@ -61483,7 +61483,7 @@ ul {
-404403
+404379
@@ -61499,7 +61499,7 @@ ul {
-483482
+483458
@@ -61515,7 +61515,7 @@ ul {
-567559
+567535
@@ -61531,7 +61531,7 @@ ul {
-845837
+845813
@@ -61547,7 +61547,7 @@ ul {
-162162
+162161
diff --git a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
index 0bbf72e..8d6049e 100644
--- a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
+++ b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
@@ -131,7 +131,7 @@ ul {
New:/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-markdown/2.11.0.M1-SNAPSHOT/jspwiki-markdown-2.11.0.M1-SNAPSHOT.jar
-Created:2018-12-24T01:07:47.738+
+Created:2018-12-25T22:18:28.681+
Access modifier filter:PROTECTED
[jspwiki] build #15 - SUCCESS
See https://builds.apache.org/job/jspwiki/15/
[jspwiki-site] branch asf-site updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 8a3a1e0 Automatic Site Publish by Buildbot
8a3a1e0 is described below
commit 8a3a1e0ba50ac4b697aff04e62cd6de5116621d3
Author: jenkins
AuthorDate: Tue Dec 25 23:16:12 2018 +
Automatic Site Publish by Buildbot
---
japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html | 2 +-
japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
index 1e8fe16..e2a4108 100644
--- a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
+++ b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
@@ -131,7 +131,7 @@ ul {
New:/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-main/2.11.0.M1-SNAPSHOT/jspwiki-main-2.11.0.M1-SNAPSHOT.jar
-Created:2018-12-25T23:08:29.962+
+Created:2018-12-25T23:14:59.612+
Access modifier filter:PROTECTED
diff --git a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
index a42a0aa..7b8a820 100644
--- a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
+++ b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
@@ -131,7 +131,7 @@ ul {
New:/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-markdown/2.11.0.M1-SNAPSHOT/jspwiki-markdown-2.11.0.M1-SNAPSHOT.jar
-Created:2018-12-25T23:08:28.814+
+Created:2018-12-25T23:14:58.481+
Access modifier filter:PROTECTED
[jspwiki] build #18 - SUCCESS
See https://builds.apache.org/job/jspwiki/18/
[jspwiki] branch master updated: remove git site repo from polling to avoid triggering the ci job every time the website is built (as it does a push on the asf-site branch)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 4c15f6b remove git site repo from polling to avoid triggering the ci
job every time the website is built (as it does a push on the asf-site branch)
4c15f6b is described below
commit 4c15f6ba705b363b64c1767be6aabf5a87f153d4
Author: juanpablo
AuthorDate: Wed Dec 26 00:33:07 2018 +0100
remove git site repo from polling to avoid triggering the ci job every time
the website is built (as it does a push on the asf-site branch)
---
Jenkinsfile | 4 ++--
.../src/main/java/org/apache/wiki/search/LuceneSearchProvider.java| 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 1aeb74a..19bcec2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -52,7 +52,7 @@ try {
stage( 'build website' ) {
withEnv( [ "Path+JDK=$JAVA_JDK_8/bin",
"Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_8" ] ) {
dir( jbake ) {
-git branch: jbake, url: siteRepo, credentialsId: creds
+git branch: jbake, url: siteRepo, credentialsId: creds,
poll: false
sh 'mvn clean process-resources'
}
stash name: 'jbake-website'
@@ -66,7 +66,7 @@ try {
cleanWs()
unstash 'jbake-website'
dir( asfsite ) {
-git branch: asfsite, url: siteRepo, credentialsId: creds
+git branch: asfsite, url: siteRepo, credentialsId: creds,
poll: false
sh "cp -rf ../$jbake/target/content/* ./"
timeout( 15 ) { // 15 minutes
sh 'git add .'
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
index a515866..82aff1c 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
@@ -27,11 +27,11 @@ import java.io.StringWriter;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
-import java.util.Vector;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
@@ -119,7 +119,7 @@ public class LuceneSearchProvider implements SearchProvider
{
protected static final String LUCENE_PAGE_NAME = "name";
private String m_luceneDirectory;
-protected Vector m_updates = new Vector<>(); // Vector because
multi-threaded.
+protected List m_updates = Collections.synchronizedList( new
ArrayList<>() );
/** Maximum number of fragments from search matches. */
private static final int MAX_FRAGMENTS = 3;
[jspwiki-site] branch asf-site updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new c4d8142 Automatic Site Publish by Buildbot
c4d8142 is described below
commit c4d81422fab16486f7fe5e5a08773a24a0c3a9ec
Author: jenkins
AuthorDate: Tue Dec 25 23:39:53 2018 +
Automatic Site Publish by Buildbot
---
japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.diff | 4 ++--
japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html | 24 ++
.../2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html | 2 +-
3 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.diff
b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.diff
index 7e260e6..1da561c 100644
--- a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.diff
+++ b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.diff
@@ -2850,11 +2850,11 @@ WARNING: You are using the option
'--ignore-missing-classes', i.e. superclasses
=== UNCHANGED METHOD: PUBLIC void pageRemoved(org.apache.wiki.WikiPage)
=== UNCHANGED METHOD: PUBLIC org.apache.wiki.search.QueryItem[]
parseQuery(java.lang.String)
=== UNCHANGED METHOD: PUBLIC void reindexPage(org.apache.wiki.WikiPage)
-=== UNCHANGED CLASS: PUBLIC org.apache.wiki.search.LuceneSearchProvider (not
serializable)
+***! MODIFIED CLASS: PUBLIC org.apache.wiki.search.LuceneSearchProvider (not
serializable)
***! CLASS FILE FORMAT VERSION: 52.0 <- 50.0
=== UNCHANGED INTERFACE: org.apache.wiki.search.SearchProvider
=== UNCHANGED INTERFACE: org.apache.wiki.WikiProvider
- === UNCHANGED FIELD: PROTECTED java.util.Vector m_updates
+ ***! MODIFIED FIELD: PROTECTED java.util.List (<- java.util.Vector)
m_updates
=== UNCHANGED FIELD: PROTECTED STATIC FINAL org.apache.log4j.Logger log
=== UNCHANGED FIELD: PUBLIC STATIC FINAL java.lang.String[]
SEARCHABLE_FILE_SUFFIXES
=== UNCHANGED FIELD: PROTECTED STATIC FINAL java.lang.String
LUCENE_AUTHOR
diff --git a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
index 76a0787..06daefa 100644
--- a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
+++ b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-main.html
@@ -131,7 +131,7 @@ ul {
New:/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-main/2.11.0.M1-SNAPSHOT/jspwiki-main-2.11.0.M1-SNAPSHOT.jar
-Created:2018-12-25T23:21:31.055+
+Created:2018-12-25T23:38:41.113+
Access modifier filter:PROTECTED
@@ -800,7 +800,7 @@ ul {
UNCHANGEDorg.apache.wiki.search.BasicSearchProvider
-UNCHANGEDorg.apache.wiki.search.LuceneSearchProvider
+MODIFIED(!)org.apache.wiki.search.LuceneSearchProvider
UNCHANGEDorg.apache.wiki.search.QueryItem
@@ -43996,7 +43996,7 @@ ul {
-UNCHANGEDpublicclassorg.apache.wiki.search.LuceneSearchProvidertop
+MODIFIED(!)publicclassorg.apache.wiki.search.LuceneSearchProvidertop
class File Format Version:
@@ -44077,7 +44077,23 @@ ul {
UNCHANGEDprotectedstaticfinaljava.lang.Stringn.a.LUCENE_PAGE_NAME
-UNCHANGEDprotectedjava.util.Vectorn.a.m_updates
+MODIFIED(!)protectedjava.util.List(-java.util.Vector)
+
+ (!)
+
+
+
+
+Change
+
+
+
+
+FIELD_TYPE_CHANGED
+
+
+
+m_updates
UNCHANGEDpublicstaticfinalintn.a.MAX_SEARCH_HITS
diff --git a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
index c386299..81575af 100644
--- a/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
+++ b/japicmp/2.11.0.M1-SNAPSHOT/cmp-jspwiki-markdown.html
@@ -131,7 +131,7 @@ ul {
New:/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-markdown/2.11.0.M1-SNAPSHOT/jspwiki-markdown-2.11.0.M1-SNAPSHOT.jar
-Created:2018-12-25T23:21:29.930+
+Created:2018-12-25T23:38:40.012+
Access modifier filter:PROTECTED
[jspwiki] build #21 - SUCCESS
See https://builds.apache.org/job/jspwiki/21/
[jspwiki] build #14 - FAILURE
See https://builds.apache.org/job/jspwiki/14/
[jspwiki] branch master updated: fix Jenkinsfile typo; there shouldn't be anymore failures now...
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 609c5c4 fix Jenkinsfile typo; there shouldn't be anymore failures
now...
609c5c4 is described below
commit 609c5c4c9533974dfb17bd304c246ca5a9ae81df
Author: juanpablo
AuthorDate: Tue Dec 25 23:13:02 2018 +0100
fix Jenkinsfile typo; there shouldn't be anymore failures now...
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d5bf1dd..1aeb74a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -71,7 +71,7 @@ try {
timeout( 15 ) { // 15 minutes
sh 'git add .'
sh 'git commit -m "Automatic Site Publish by Buildbot"'
-echo "pushing to $repo"
+echo "pushing to $siteRepo"
sh "git push origin asf-site"
}
}
[jspwiki] branch master updated: new maven profile to generate sources and javadocs, so the ci build doesn't complain about being unable to gpg sign artifacts
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new f333843 new maven profile to generate sources and javadocs, so the ci
build doesn't complain about being unable to gpg sign artifacts
f333843 is described below
commit f333843dba0c778da82f3ba25050acba59b9861c
Author: juanpablo
AuthorDate: Tue Dec 25 23:02:03 2018 +0100
new maven profile to generate sources and javadocs, so the ci build doesn't
complain about being unable to gpg sign artifacts
---
Jenkinsfile | 2 +-
pom.xml | 42 ++
2 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b99e950..d5bf1dd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -43,7 +43,7 @@ try {
withEnv( [ "Path+JDK=$JAVA_JDK_8/bin",
"Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_8" ] ) {
withSonarQubeEnv( 'ASF Sonar Analysis' ) {
echo "Will use SonarQube instance at $SONAR_HOST_URL"
-sh "mvn clean
org.jacoco:jacoco-maven-plugin:prepare-agent install -Papache-release
$SONAR_MAVEN_GOAL"
+sh "mvn clean
org.jacoco:jacoco-maven-plugin:prepare-agent install
-Pattach-additional-artifacts $SONAR_MAVEN_GOAL"
}
}
}
diff --git a/pom.xml b/pom.xml
index d469234..30c793e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -848,6 +848,48 @@
+
+
+ attach-additional-artifacts
+
+
+false
+
+ additional_artifacts
+ true
+
+
+
+
+
+
+maven-source-plugin
+
+
+artifact-sources
+package
+
+ jar
+
+
+
+
+
+
+maven-javadoc-plugin
+
+
+artifact-javadocs
+package
+
+ jar
+
+
+
+
+
+
+
[jspwiki] 08/09: remove unneeded @SuppressWarnings; reorder / add missing braces
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit e212d4b5e6ca115ab9404cb92264cfd9ba9f9a62
Author: juanpablo
AuthorDate: Tue Dec 25 21:24:36 2018 +0100
remove unneeded @SuppressWarnings; reorder / add missing braces
---
.../src/main/java/org/apache/wiki/PageSorter.java | 89 ++
1 file changed, 39 insertions(+), 50 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/PageSorter.java
b/jspwiki-main/src/main/java/org/apache/wiki/PageSorter.java
index 3e3fae6..94fe252 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/PageSorter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/PageSorter.java
@@ -35,8 +35,8 @@ import org.apache.wiki.util.comparators.JavaNaturalComparator;
* Note - this class is deliberately not null safe. Never call any of
the
* methods with a null argument!
*/
-public class PageSorter implements Comparator
-{
+public class PageSorter implements Comparator< Object > {
+
private static Logger log = Logger.getLogger( PageSorter.class );
// The name of the property that specifies the desired page name comparator
@@ -47,8 +47,7 @@ public class PageSorter implements Comparator
/**
* Default constructor uses Java "natural" ordering.
*/
-public PageSorter()
-{
+public PageSorter() {
m_comparator = JavaNaturalComparator.DEFAULT_JAVA_COMPARATOR;
}
@@ -57,8 +56,7 @@ public class PageSorter implements Comparator
*
* @param comparator the Comparator to use
*/
-public PageSorter( Comparator comparator )
-{
+public PageSorter( Comparator comparator ) {
m_comparator = comparator;
}
@@ -69,21 +67,22 @@ public class PageSorter implements Comparator
* @throws IllegalArgumentException if incorrect argument types.
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
-public int compare( Object o1, Object o2 )
-{
-if( o1 instanceof String )
-{
-if( o2 instanceof String )
+@Override
+public int compare( Object o1, Object o2 ) {
+if( o1 instanceof String ) {
+if( o2 instanceof String ) {
return m_comparator.compare( (String) o1, (String) o2 );
-if( o2 instanceof WikiPage )
+}
+if( o2 instanceof WikiPage ) {
return m_comparator.compare( (String) o1, ((WikiPage)
o2).getName() );
-}
-else if( o1 instanceof WikiPage )
-{
-if( o2 instanceof WikiPage )
+}
+} else if( o1 instanceof WikiPage ) {
+if( o2 instanceof WikiPage ) {
return m_comparator.compare( ((WikiPage) o1).getName(),
((WikiPage) o2).getName() );
-if( o2 instanceof String )
+}
+if( o2 instanceof String ) {
return m_comparator.compare( ((WikiPage) o1).getName(),
(String) o2 );
+}
}
throw new IllegalArgumentException( "Can only compare String or
WikiPage" );
@@ -97,8 +96,7 @@ public class PageSorter implements Comparator
* @return see java.util.Comparator
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
-public int compare( String pageName1, String pageName2 )
-{
+public int compare( String pageName1, String pageName2 ) {
return m_comparator.compare( pageName1, pageName2 );
}
@@ -111,26 +109,27 @@ public class PageSorter implements Comparator
* @return see java.util.Comparator
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
-public int compare( WikiPage page1, WikiPage page2 )
-{
-if( page1 == page2 )
+public int compare( WikiPage page1, WikiPage page2 ) {
+if( page1 == page2 ) {
return 0; // the same object
+}
int res = m_comparator.compare( page1.getName(), page2.getName() );
-if( res == 0 )
+if( res == 0 ) {
res = page1.getVersion() - page2.getVersion();
+}
return res;
}
@Override
-public boolean equals( Object o )
-{
-if( !(o instanceof PageSorter) )
+public boolean equals( Object o ) {
+if( !(o instanceof PageSorter) ) {
return false; // Definitely not equal
-
+}
PageSorter that = (PageSorter) o;
-if( this == that || m_comparator == that.m_comparator )
+if( this == that || m_comparator == that.m_comparator ) {
return true; // Essentially the same object
+}
return m_comparator.equals( that.m_comparator );
}
@@ -142,22 +141,17 @@ public class PageSorter implements Comparator
*
* @param props this WikiEngine's properties.
*/
-@SuppressWarnings( "unchecked" )
[jspwiki] 02/09: remove inline comment, no longer true
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 9a5e6629cf5cec43ef91a2b501db854b081fab97
Author: juanpablo
AuthorDate: Wed Dec 19 23:08:35 2018 +0100
remove inline comment, no longer true
---
jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java | 2 --
1 file changed, 2 deletions(-)
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java
b/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java
index 139eb24..7bd8843 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java
@@ -112,8 +112,6 @@ public class Preferences
prefs.put("Language", TextUtil.getStringProperty( props,
"jspwiki.defaultprefs.template.language", getLocale( ctx ).toString() ) );
prefs.put("SectionEditing", TextUtil.getStringProperty( props,
"jspwiki.defaultprefs.template.sectionediting", "true" ) );
-// FIXME: "editor" property does not get registered, may be related
with http://bugs.jspwiki.org/show_bug.cgi?id=117
-// disabling it until knowing why it's happening
// FIXME: editormanager reads jspwiki.editor -- which of both
properties should continue
prefs.put("editor", TextUtil.getStringProperty( props,
"jspwiki.defaultprefs.template.editor", "plain" ) );
[jspwiki] 07/09: 2.11.0-M1-git-14
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 1057136227e8aa5bca62cbc5fcab9cedf4f9412b
Author: juanpablo
AuthorDate: Tue Dec 25 20:39:19 2018 +0100
2.11.0-M1-git-14
---
ChangeLog | 12
jspwiki-main/src/main/java/org/apache/wiki/Release.java | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index cb66b75..ed0d7e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2018-12-25 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+ * 2.11.0-M1-git-14: upgrade bundled dependencies
+ - commons-fileupload to 1.3.3
+ - ehcache to 2.10.6
+ - flexmark to 0.35.0
+ - junit to 5.3.2
+ - lucene to 7.6.0
+ - tomcat to 8.5.37
+
+ * escape entities on Captcha.jsp request parameters
+
2018-12-24 Dirk Frederickx (brushed AT apache DOT org)
* 2.11.0-M1-git-13: AJAX based search results are not shown.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/Release.java
b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
index 27b3193..7c25722 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
*
* If the build identifier is empty, it is not added.
*/
-public static final String BUILD = "13";
+public static final String BUILD = "14";
/**
* This is the generic version string you should use when printing out
the version. It is of
[jspwiki] 06/09: Modify Jenkinsfile to build both source and website on one go; jspwiki-site job will run only if called explicitly
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 8c494933d0d70f58f8ba724048f4523a7344a493
Author: juanpablo
AuthorDate: Tue Dec 25 20:38:27 2018 +0100
Modify Jenkinsfile to build both source and website on one go; jspwiki-site
job will run only if called explicitly
---
Jenkinsfile | 63 +++--
1 file changed, 49 insertions(+), 14 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b7cd1c1..b99e950 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,36 +18,71 @@
*/
try {
-def repo = 'https://github.com/apache/jspwiki'
-
+def buildRepo = 'https://github.com/apache/jspwiki'
+def siteRepo = 'https://gitbox.apache.org/repos/asf/jspwiki-site.git'
+def creds = '9b041bd0-aea9-4498-a576-9eeb771411dd'
+
+def asfsite = 'asf-site'
+def build = 'build'
+def jbake = 'jbake'
+
node( 'ubuntu' ) {
def JAVA_JDK_8=tool name: 'JDK 1.8 (latest)', type: 'hudson.model.JDK'
echo "Will use Java $JAVA_JDK_8"
-
+
def MAVEN_3_LATEST=tool name: 'Maven 3 (latest)', type:
'hudson.tasks.Maven$MavenInstallation'
echo "Will use Maven $MAVEN_3_LATEST"
-
-stage( 'checkout' ) {
+
+stage( 'clean ws' ) {
cleanWs()
-git repo
}
-stage( 'build' ) {
+stage( 'build source' ) {
+dir( build ) {
+git url: buildRepo, poll: true
+withEnv( [ "Path+JDK=$JAVA_JDK_8/bin",
"Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_8" ] ) {
+withSonarQubeEnv( 'ASF Sonar Analysis' ) {
+echo "Will use SonarQube instance at $SONAR_HOST_URL"
+sh "mvn clean
org.jacoco:jacoco-maven-plugin:prepare-agent install -Papache-release
$SONAR_MAVEN_GOAL"
+}
+}
+}
+}
+
+stage( 'build website' ) {
withEnv( [ "Path+JDK=$JAVA_JDK_8/bin",
"Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_8" ] ) {
- withSonarQubeEnv( 'ASF Sonar Analysis' ) {
- echo "Will use SonarQube instance at
$SONAR_HOST_URL"
-sh "mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent
package $SONAR_MAVEN_GOAL"
- }
+dir( jbake ) {
+git branch: jbake, url: siteRepo, credentialsId: creds
+sh 'mvn clean process-resources'
+}
+stash name: 'jbake-website'
}
}
}
-
+
+node( 'git-websites' ) {
+stage( 'publish website' ) {
+cleanWs()
+unstash 'jbake-website'
+dir( asfsite ) {
+git branch: asfsite, url: siteRepo, credentialsId: creds
+sh "cp -rf ../$jbake/target/content/* ./"
+timeout( 15 ) { // 15 minutes
+sh 'git add .'
+sh 'git commit -m "Automatic Site Publish by Buildbot"'
+echo "pushing to $repo"
+sh "git push origin asf-site"
+}
+}
+}
+}
+
currentBuild.result = 'SUCCESS'
-
+
} catch( Exception err ) {
currentBuild.result = 'FAILURE'
- echo err.message
+echo err.message
} finally {
node( 'ubuntu' ) {
if( currentBuild.result == null ) {
[jspwiki] 04/09: update lucene to 7.6.0
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit fdc064085f89b0b21e7ee9f92de4d77720d17bfc
Author: juanpablo
AuthorDate: Mon Dec 24 01:33:58 2018 +0100
update lucene to 7.6.0
---
.../apache/wiki/search/LuceneSearchProvider.java| 21 ++---
.../org/apache/wiki/search/SearchManagerTest.java | 2 +-
pom.xml | 2 +-
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
index 5af7573..a515866 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
@@ -64,7 +64,6 @@ import org.apache.lucene.search.highlight.SimpleHTMLFormatter;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.store.SimpleFSDirectory;
-import org.apache.lucene.util.Version;
import org.apache.wiki.InternalWikiException;
import org.apache.wiki.WatchDog;
import org.apache.wiki.WikiBackgroundThread;
@@ -126,7 +125,7 @@ public class LuceneSearchProvider implements SearchProvider
{
private static final int MAX_FRAGMENTS = 3;
/** The maximum number of hits to return from searches. */
-public static final int MAX_SEARCH_HITS = 9;
+public static final int MAX_SEARCH_HITS = 99_999;
private static String c_punctuationSpaces = StringUtils.repeat(" ",
MarkupParser.PUNCTUATION_CHARS_ALLOWED.length() );
@@ -217,7 +216,7 @@ public class LuceneSearchProvider implements SearchProvider
{
log.info("Starting Lucene reindexing, this can take a couple
of minutes...");
-Directory luceneDir = new SimpleFSDirectory(dir, null);
+Directory luceneDir = new SimpleFSDirectory( dir.toPath() );
try( IndexWriter writer = getIndexWriter( luceneDir ) )
{
Collection< WikiPage > allPages =
m_engine.getPageManager().getAllPages();
@@ -359,7 +358,7 @@ public class LuceneSearchProvider implements SearchProvider
{
pageRemoved( page );
// Now add back the new version.
-luceneDir = new SimpleFSDirectory(new File(m_luceneDirectory),
null);
+luceneDir = new SimpleFSDirectory( new File( m_luceneDirectory
).toPath() );
writer = getIndexWriter( luceneDir );
luceneIndexPage( page, text, writer );
@@ -388,8 +387,8 @@ public class LuceneSearchProvider implements SearchProvider
{
try
{
Class< ? > clazz = ClassUtil.findClass( "", m_analyzerClass );
-Constructor< ? > constructor = clazz.getConstructor(
Version.LUCENE_47.getClass() );
-Analyzer analyzer = (Analyzer) constructor.newInstance(
Version.LUCENE_47 );
+Constructor< ? > constructor = clazz.getConstructor();
+Analyzer analyzer = (Analyzer) constructor.newInstance();
return analyzer;
}
catch( Exception e )
@@ -479,7 +478,7 @@ public class LuceneSearchProvider implements SearchProvider
{
IndexWriter writer = null;
try
{
-Directory luceneDir = new SimpleFSDirectory(new
File(m_luceneDirectory), null);
+Directory luceneDir = new SimpleFSDirectory( new File(
m_luceneDirectory ).toPath() );
writer = getIndexWriter( luceneDir );
Query query = new TermQuery( new Term( LUCENE_ID, page.getName() )
);
writer.deleteDocuments( query );
@@ -498,7 +497,7 @@ public class LuceneSearchProvider implements SearchProvider
{
LockObtainFailedException, IOException, ProviderException
{
IndexWriter writer = null;
-IndexWriterConfig writerConfig = new IndexWriterConfig(
Version.LUCENE_47, getLuceneAnalyzer() );
+IndexWriterConfig writerConfig = new IndexWriterConfig(
getLuceneAnalyzer() );
writerConfig.setOpenMode( OpenMode.CREATE_OR_APPEND );
writer = new IndexWriter( luceneDir, writerConfig );
@@ -512,7 +511,7 @@ public class LuceneSearchProvider implements SearchProvider
{
{
if( writer != null )
{
-writer.close( true );
+writer.close();
}
}
catch( IOException e )
@@ -583,7 +582,7 @@ public class LuceneSearchProvider implements SearchProvider
{
try
{
String[] queryfields = { LUCENE_PAGE_CONTENTS, LUCENE_PAGE_NAME,
LUCENE_AUTHOR, LUCENE_ATTACHMENTS };
-QueryParser qp = new MultiFieldQueryParser( Version.LUCENE_47,
queryfields, getLuceneAnalyzer()
[jspwiki] 01/09: update dependencies versions':
This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git commit 4bc7e978153192da706570670c66ecd7811efbd7 Author: juanpablo AuthorDate: Wed Dec 19 23:07:35 2018 +0100 update dependencies versions': commons-fileupload to 1.3.3 ehcache to 2.10.6 flexmark to 0.35.0 junit to 5.3.2 tomcat to 8.5.37 --- pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 7dce9d9..92debe8 100644 --- a/pom.xml +++ b/pom.xml @@ -43,12 +43,12 @@ 3.5 1.02 -1.3 +1.3.3 3.1 2.4 2.6 -2.8.3 -0.34.56 +2.10.6 +0.35.0 0.60 2.3.1 2.3.0 @@ -60,7 +60,7 @@ 2.0.5 8.1.15.v20140411 0.4.2 -5.3.1 +5.3.2 1.2.17 4.7.0 1.9.21 @@ -69,7 +69,7 @@ 2.42.0 1.7.25 1.6.0 -8.5.34 +8.5.37 1.8.0 2.0.1
[jspwiki] branch master updated (8409e38 -> 4dfe163)
This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git. from 8409e38 2.11.0-M1-git-13: AJAX based search results are not shown. new 4bc7e97 update dependencies versions': new 9a5e662 remove inline comment, no longer true new 9f7c530 minor refactor to avoid empty catch on closing inputstream new fdc0640 update lucene to 7.6.0 new 1e994c5 escape entities on Captcha.jsp request parameters new 8c49493 Modify Jenkinsfile to build both source and website on one go; jspwiki-site job will run only if called explicitly new 1057136 2.11.0-M1-git-14 new e212d4b remove unneeded @SuppressWarnings; reorder / add missing braces new 4dfe163 update changelog The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ChangeLog | 16 Jenkinsfile| 63 +++ .../src/main/java/org/apache/wiki/PageSorter.java | 89 ++ .../src/main/java/org/apache/wiki/Release.java | 2 +- .../org/apache/wiki/preferences/Preferences.java | 2 - .../apache/wiki/search/LuceneSearchProvider.java | 21 +++-- .../java/org/apache/wiki/ui/TemplateManager.java | 46 +++ .../org/apache/wiki/search/SearchManagerTest.java | 2 +- jspwiki-war/src/main/webapp/Captcha.jsp| 22 +++--- pom.xml| 12 +-- 10 files changed, 145 insertions(+), 130 deletions(-)
[jspwiki] 09/09: update changelog
This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git commit 4dfe163d05799c0dc02c06f59f866a89a19dcaca Author: juanpablo AuthorDate: Tue Dec 25 21:47:04 2018 +0100 update changelog --- ChangeLog | 4 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index ed0d7e4..a6b0634 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,10 @@ * escape entities on Captcha.jsp request parameters + * Jenkinsfile now builds both source and website, jspwiki-site job can still be triggered manually + + * few more polishing and minor refactors + 2018-12-24 Dirk Frederickx (brushed AT apache DOT org) * 2.11.0-M1-git-13: AJAX based search results are not shown.
[jspwiki] 05/09: escape entities on Captcha.jsp request parameters
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 1e994c5184f3d17cf355983bbe870bcaebab4b9f
Author: juanpablo
AuthorDate: Tue Dec 25 13:07:47 2018 +0100
escape entities on Captcha.jsp request parameters
---
jspwiki-war/src/main/webapp/Captcha.jsp | 22 --
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/jspwiki-war/src/main/webapp/Captcha.jsp
b/jspwiki-war/src/main/webapp/Captcha.jsp
index 6789b2d..d720976 100644
--- a/jspwiki-war/src/main/webapp/Captcha.jsp
+++ b/jspwiki-war/src/main/webapp/Captcha.jsp
@@ -40,11 +40,12 @@
if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
String pagereq = wikiContext.getName();
-String content = request.getParameter("text");
+String reqPage = TextUtil.replaceEntities( request.getParameter( "page" )
);
+String content = TextUtil.replaceEntities( request.getParameter( "text" )
);
if( content != null )
{
-String ticket = request.getParameter("Asirra_Ticket");
+String ticket = TextUtil.replaceEntities( request.getParameter(
"Asirra_Ticket" ) );
HttpClient client = new HttpClient();
HttpMethod method = new
GetMethod("http://challenge.asirra.com/cgi/Asirra?action=ValidateTicket="+ticket);
@@ -53,10 +54,10 @@
if( status == HttpStatus.SC_OK )
{
-if( body.indexOf("Pass") != -1 )
+if( body.indexOf( "Pass" ) != -1 )
{
-session.setAttribute("captcha","ok");
-response.sendRedirect( wikiContext.getURL(WikiContext.EDIT,
request.getParameter("page") ) );
+session.setAttribute( "captcha", "ok" );
+response.sendRedirect( wikiContext.getURL( WikiContext.EDIT,
reqPage ) );
return;
}
}
@@ -65,7 +66,7 @@
}
// Set the content type and include the response content
-response.setContentType("text/html; charset="+wiki.getContentEncoding() );
+response.setContentType( "text/html; charset=" + wiki.getContentEncoding()
);
%>
@@ -106,14 +107,15 @@
-
+
http://challenge.asirra.com/js/AsirraClientSide.js";>
- asirraState.SetEnlargedPosition("right");
- // asirraState.SetCellsPerRow(6);
+ asirraState.SetEnlargedPosition( "right" );
+ // asirraState.SetCellsPerRow( 6 );
"
onclick="javascript:Asirra_CheckIfHuman(HumanCheckComplete)" />
-
\ No newline at end of file
+
+
\ No newline at end of file
[jspwiki] build #12 - FAILURE
See https://builds.apache.org/job/jspwiki/12/
[jspwiki] branch master updated: revert change on PageSorter, breaks build :-/
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 490fe2d revert change on PageSorter, breaks build :-/
490fe2d is described below
commit 490fe2da366273ae5d0ac7854dc422eec59145cb
Author: juanpablo
AuthorDate: Tue Dec 25 22:03:29 2018 +0100
revert change on PageSorter, breaks build :-/
---
jspwiki-main/src/main/java/org/apache/wiki/PageSorter.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/PageSorter.java
b/jspwiki-main/src/main/java/org/apache/wiki/PageSorter.java
index 94fe252..5c1819b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/PageSorter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/PageSorter.java
@@ -141,13 +141,14 @@ public class PageSorter implements Comparator< Object > {
*
* @param props this WikiEngine's properties.
*/
+@SuppressWarnings( "unchecked" )
public void initialize( Properties props ) {
// Default is Java natural order
m_comparator = JavaNaturalComparator.DEFAULT_JAVA_COMPARATOR;
String className = props.getProperty( PROP_PAGE_NAME_COMPARATOR );
if( className != null && className.length() > 0 ) {
try {
-m_comparator = ClassUtil.getMappedObject(
"org.apache.wiki.util.comparators." + className );
+m_comparator = (Comparator) ClassUtil.findClass(
"org.apache.wiki.util.comparators", className ).newInstance();
} catch( Exception e ) {
log.error( "Falling back to default \"natural\" comparator", e
);
}
[jspwiki] build #13 - FAILURE
See https://builds.apache.org/job/jspwiki/13/
