svn commit: r1839488 - in /velocity/engine/branches/1.7.x: build/build.properties pom.xml src/test/org/apache/velocity/test/issues/VelTools66TestCase.java src/test/org/apache/velocity/test/sql/HsqlDataSource.java

[mkienenb]

Author: mkienenb
Date: Tue Aug 28 17:37:46 2018
New Revision: 1839488

URL: http://svn.apache.org/viewvc?rev=1839488&view=rev
Log:
VELOCITY-899: Fix build process.
    Update Velocity version to 1.7.1.
    Update required java version to 1.8.
    Update javadocs location.
    Change dependency jar location URL from "mirrors" to "maven".
    Add hsqldb DataSource getParentLogger() API method.
    Backport fix to exclude VelTools66TestCase.java when using java 1.8 or 
greater.

Modified:
    velocity/engine/branches/1.7.x/build/build.properties
    velocity/engine/branches/1.7.x/pom.xml
    
velocity/engine/branches/1.7.x/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java
    
velocity/engine/branches/1.7.x/src/test/org/apache/velocity/test/sql/HsqlDataSource.java

Modified: velocity/engine/branches/1.7.x/build/build.properties
URL: 
http://svn.apache.org/viewvc/velocity/engine/branches/1.7.x/build/build.properties?rev=1839488&r1=1839487&r2=1839488&view=diff
==============================================================================
--- velocity/engine/branches/1.7.x/build/build.properties (original)
+++ velocity/engine/branches/1.7.x/build/build.properties Tue Aug 28 17:37:46 
2018
@@ -22,7 +22,7 @@
 # Global defaults
 name=       Velocity
 project=    velocity
-version=    1.7
+version=    1.7.1
 final.name= ${project}-${version}
 
 # compile switches
@@ -87,14 +87,14 @@ publish.dir=~/public_html/velocity/engin
 
 # required Java version for building the distribution (with "ant release")
 # should be major distribution (e.g. 1.4) will match property 
${ant.java.version}
-dist.required.java.version = 1.4
+dist.required.java.version = 1.8
 
 # Set to "project.xml" for distribution and "project-website.xml"
 # when building docs for web site
 docs.project= project.xml
 
 # Set to Sun Javadocs
-javadocs.ref.jsdk= http://java.sun.com/j2se/1.4.2/docs/api/
+javadocs.ref.jsdk= https://docs.oracle.com/javase/8/docs/api/
 
 # #######################################################################
 #
@@ -119,8 +119,8 @@ proxy.port= 80
 
 #
 # We download directly from the ibiblio maven repository
-repo.m1.url= http://mirrors.ibiblio.org/maven2
-repo.m2.url=http://mirrors.ibiblio.org/maven2
+repo.m1.url= http://maven.ibiblio.org/maven2
+repo.m2.url=http://maven.ibiblio.org/maven2
 #
 # Jars to be downloaded
 jar.antlr.version= 2.7.5
@@ -161,8 +161,8 @@ jar.commons-lang.dir= ${build.lib}
 #
 ########################################################################
 
-javac.target=1.4
-javac.source=1.4
+javac.target=1.8
+javac.source=1.8
 
 ########################################################################
 # OSGi stuff

Modified: velocity/engine/branches/1.7.x/pom.xml
URL: 
http://svn.apache.org/viewvc/velocity/engine/branches/1.7.x/pom.xml?rev=1839488&r1=1839487&r2=1839488&view=diff
==============================================================================
--- velocity/engine/branches/1.7.x/pom.xml (original)
+++ velocity/engine/branches/1.7.x/pom.xml Tue Aug 28 17:37:46 2018
@@ -321,8 +321,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
     </plugins>

Modified: 
velocity/engine/branches/1.7.x/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/branches/1.7.x/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java?rev=1839488&r1=1839487&r2=1839488&view=diff
==============================================================================
--- 
velocity/engine/branches/1.7.x/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java
 (original)
+++ 
velocity/engine/branches/1.7.x/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java
 Tue Aug 28 17:37:46 2018
@@ -79,6 +79,15 @@ public class VelTools66TestCase
     public void testVelTools66()
             throws Exception
     {
+       /* the testcase is obsolete in JDK 8, as 
SystemManager.checkMemberAccess is not anymore called
+        * by Class.getMethods() */
+
+        int javaVersion = 
Integer.parseInt(System.getProperty("java.version").split("\\.")[1]);
+        if (javaVersion >= 8)
+        {
+            return;
+        }
+
         Method verifyMethod = TestInterface.class.getMethod("getTestValue", 
new Class[0]);
 
 

Modified: 
velocity/engine/branches/1.7.x/src/test/org/apache/velocity/test/sql/HsqlDataSource.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/branches/1.7.x/src/test/org/apache/velocity/test/sql/HsqlDataSource.java?rev=1839488&r1=1839487&r2=1839488&view=diff
==============================================================================
--- 
velocity/engine/branches/1.7.x/src/test/org/apache/velocity/test/sql/HsqlDataSource.java
 (original)
+++ 
velocity/engine/branches/1.7.x/src/test/org/apache/velocity/test/sql/HsqlDataSource.java
 Tue Aug 28 17:37:46 2018
@@ -23,6 +23,8 @@ import java.io.PrintWriter;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
 
 import javax.sql.DataSource;
 
@@ -74,4 +76,7 @@ public class HsqlDataSource implements D
        throw new SQLException("Not implemented");
     }
 
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+        throw new SQLFeatureNotSupportedException("Not implemented");
+    }
 }