Hi, out of curiosity, what has to be modified on tomcat/conf/web.xml? 2.11.0.M1 should be running at least under Java 8 / Tomcat 8.5 (f.ex., the portable build right now bundles with tomcat 8.5.34). Also, according to https://tomcat.apache.org/whichversion.html tomcat 8.5 needs at least Java 1.7 :-?
thx, juan pablo On Mon, Dec 24, 2018 at 12:30 AM <brus...@apache.org> wrote: > This is an automated email from the ASF dual-hosted git repository. > > brushed 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 8409e38 2.11.0-M1-git-13: AJAX based search results are not > shown. > 8409e38 is described below > > commit 8409e389ca90640f7f066624317ef30fcd9aaf7f > Author: brushed <dirk.frederi...@gmail.com> > AuthorDate: Mon Dec 24 00:29:52 2018 +0100 > > 2.11.0-M1-git-13: AJAX based search results are not shown. > > The java '<>' diamond operator is not allowed for source level below > 1.7. > --- > ChangeLog | 6 ++++++ > jspwiki-main/src/main/java/org/apache/wiki/Release.java | 2 +- > jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp | 5 ++++- > 3 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/ChangeLog b/ChangeLog > index 1e6f212..cb66b75 100644 > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,3 +1,9 @@ > +2018-12-24 Dirk Frederickx (brushed AT apache DOT org) > + > + * 2.11.0-M1-git-13: AJAX based search results are not shown. > + Fixing AJAXSearch.jsp. > + The java '<>' diamond operator is not allowed for source level > below 1.7. > + > 2018-12-15 Dirk Frederickx (brushed AT apache DOT org) > > * 2.11.0-M1-git-12: fixing bugs related to the new default > template. > 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 155e26a..27b3193 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 { > * <p> > * If the build identifier is empty, it is not added. > */ > - public static final String BUILD = "12"; > + public static final String BUILD = "13"; > > /** > * This is the generic version string you should use when printing > out the version. It is of > diff --git a/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp > b/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp > index 2f5831e..0667096 100644 > --- a/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp > +++ b/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp > @@ -61,7 +61,10 @@ > // Filter down to only those that we actually have a permission to > view > AuthorizationManager mgr = wiki.getAuthorizationManager(); > > - ArrayList< SearchResult > items = new ArrayList<>(); > + //ArrayList< SearchResult > items = new ArrayList<>(); > + //"The '<>' Diamond operator is not allowed for source level below > 1.7" > + //The compiler that eg. tomcat is running is older than 1.7. -- > need mod to tomcat/conf/web.xml > + ArrayList< SearchResult > items = new ArrayList< SearchResult >(); > > for( Iterator< SearchResult > i = list.iterator(); i.hasNext(); ) > { > >
