update Ant to use Servlet API 3.1.0

Author: Vladimir Kotal

.gitignore

@@ -30,7 +30,7 @@ jdepend/report.xml
 lib/derby.jar
 lib/jrcs.jar
 lib/lucene-*
-lib/servlet-api-*
+lib/javax.servlet-api-*
 lib/bcel-*
 lib/junit-*
 lib/hamcrest-core-*

build.xml

@@ -585,7 +585,7 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
                 <include name="servlet-api-*.jar"/>
             </fileset>
         </delete>
-        <get src="${mvn.repository}/javax/servlet/servlet-api/${servlet-api.version}/${servlet-api.jar}"
+        <get src="${mvn.repository}/javax/servlet/javax.servlet-api/${servlet-api.version}/${servlet-api.jar}"
              dest="lib/${servlet-api.jar}" verbose="true" usetimestamp="true"/>
     </target>
 

nbproject/project.properties

@@ -74,7 +74,7 @@ dist.jar=${dist.dir}/opengrok.jar
 platform.active=default_platform
 build.test.reposroots=${build.dir}/test/reposroots
 annotation.processing.enabled=true
-servlet-api.jar=servlet-api-${servlet-api.version}.jar
+servlet-api.jar=javax.servlet-api-${servlet-api.version}.jar
 main.class=org.opensolaris.opengrok.index.Indexer
 dist.javadoc.dir=${dist.dir}/javadoc
 lucene-suggest.jar=lucene-suggest-${lucene.version}.jar
@@ -113,7 +113,7 @@ annotation.processing.run.all.processors=true
 excludes=
 application.title=OpenGrok
 jnlp.codebase.type=local
-servlet-api.version=2.5
+servlet-api.version=3.1.0
 bcel.version=6.2
 bcel.jar=bcel-${bcel.version}.jar
 file.reference.bcel.jar=lib/${bcel.jar}

opengrok-web-nbproject/nbproject/project.properties

@@ -36,7 +36,7 @@ bcel.version=6.2
 bcel.jar=bcel-${bcel.version}.jar
 file.reference.bcel.jar=../lib/${bcel.jar}
 file.reference.json-simple-1.1.1.jar=../lib/json-simple-1.1.1.jar
-j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.4.2.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar
+j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.6.3.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar
 lucene.version=7.3.1
 lucene-core.jar=lucene-core-${lucene.version}.jar
 lucene-analyzers-common.jar=lucene-analyzers-common-${lucene.version}.jar