Merge pull request #703 from windauer/develop

* fixed installer/scripts/build.sh (wrong ant-launcher and junit vers…

Former-commit-id: 6ba629e

Author: windauer

.gitignore

@@ -23,7 +23,6 @@ extensions/security/openid/lib/
 installer/apps/
 installer/eXist-db-setup-*.jar
 installer/install.xml
-installer/scripts/
 lib/extensions/
 lib/user/icu4j*.jar
 lib/user/je*.jar

conf.xml.tmpl

@@ -611,6 +611,7 @@
         -->
 
         <!--
+                temporally disabled in eXistdb 3.0
         <custom-filter class="org.exist.versioning.VersioningFilter"/>
         -->
     </serializer>
@@ -797,8 +798,9 @@
             <!-- JSONP module -->
             <module uri="http://www.jsonp.org" src="resource:org/exist/xquery/lib/jsonp.xq" />
 
-            <!-- Versioning -->
+            <!-- Versioning - temporally disabled in eXistdb 3.0
             <module uri="http://exist-db.org/versioning" src="resource:org/exist/versioning/xquery/versioning.xqm" />
+            -->
 
             <!-- Test module -->
             <module uri="http://exist-db.org/xquery/testing" src="resource:org/exist/xquery/lib/test.xq" />

extensions/build.properties

@@ -51,7 +51,7 @@ include.feature.metadata.sleepycat = false
 # via REST
 include.feature.netedit = false
 
-# Security ActiveDirectory extension for eXist (requires LDAP extension) 
+# Security ActiveDirectory extension for eXist (requires LDAP extension)
 include.feature.security.activedirectory = false
 
 # Security LDAP extension for eXist
@@ -70,7 +70,8 @@ include.feature.svn = false
 include.feature.tomcat-realm = true
 
 # Versioning extensions for eXist
-include.feature.versioning = true
+# temporally disabled in eXistdb 3.0
+# include.feature.versioning = true
 
 # WebDAV extension based on Milton
 include.feature.webdav = true