velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cbris...@apache.org
Subject svn commit: r1765033 - in /velocity/engine/trunk/velocity-engine-core: ./ src/main/java/org/apache/velocity/runtime/resource/loader/ src/test/java/org/apache/velocity/test/sql/ src/test/resources/ds/
Date Sat, 15 Oct 2016 10:36:33 GMT
Author: cbrisson
Date: Sat Oct 15 10:36:33 2016
New Revision: 1765033

URL: http://svn.apache.org/viewvc?rev=1765033&view=rev
Log:
[engine] more versions updating
 - use latest maven plugins versions
 - factorize junit and slf4j versions in parent pom
 - tests: upgrade hsqldb from 1.7.1 to 2.3.4, and fix subsequent little glitches
 - tests: upgraded commons-io from 2.4 to 2.5


Modified:
    velocity/engine/trunk/velocity-engine-core/pom.xml
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
    velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java
    velocity/engine/trunk/velocity-engine-core/src/test/resources/ds/create-db.sql

Modified: velocity/engine/trunk/velocity-engine-core/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/pom.xml?rev=1765033&r1=1765032&r2=1765033&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-core/pom.xml Sat Oct 15 10:36:33 2016
@@ -42,7 +42,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>3.0.1</version>
         <configuration>
           <useDefaultDelimiters>false</useDefaultDelimiters>
           <delimiters>
@@ -53,7 +53,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>1.4</version>
+        <version>2.4.3</version>
         <executions>
           <execution>
             <id>shade</id>
@@ -89,6 +89,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire.plugin.version}</version>
         <configuration>
           <skip>${maven.test.skip}</skip>
           <systemProperties>
@@ -108,7 +109,7 @@
               <name>org.slf4j.simpleLogger.defaultLogLevel</name>
               <value>warn</value>
             </property>
-          </systemProperties>          
+          </systemProperties>
         </configuration>
         <executions>
           <execution>
@@ -143,7 +144,7 @@
           <debugParser>false</debugParser>
           <debugLookAhead>false</debugLookAhead>
           <debugTokenManager>false</debugTokenManager>
-          <jdkVersion>1.4</jdkVersion>
+          <jdkVersion>1.7</jdkVersion>
           <nodeUsesParser>true</nodeUsesParser>
           <nodePackage>org.apache.velocity.runtime.parser</nodePackage>
           <sourceDirectory>${basedir}/src/main/parser</sourceDirectory>
@@ -153,7 +154,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
+        <version>1.8</version>
         <executions>
           <execution>
             <id>parser-init</id>
@@ -227,30 +228,30 @@ Velocity AST Node classes created to src
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.12</version>
+      <version>${slf4j.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>hsqldb</groupId>
+      <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>1.7.1</version>
+      <version>2.3.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.7.12</version>
+      <version>${slf4j.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -260,7 +261,7 @@ Velocity AST Node classes created to src
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.3.1</version>
+        <version>3.0.4</version>
         <configuration>
           <xmlOutput>true</xmlOutput>
           <threshold>Low</threshold>

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java?rev=1765033&r1=1765032&r2=1765033&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
(original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
Sat Oct 15 10:36:33 2016
@@ -231,7 +231,7 @@ public class DataSourceResourceLoader ex
 
             if (rs.next())
             {
-                InputStream rawStream = rs.getBinaryStream(templateColumn);
+                InputStream rawStream = rs.getAsciiStream(templateColumn);
                 if (rawStream == null)
                 {
                     throw new ResourceNotFoundException("DataSourceResourceLoader: "

Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java?rev=1765033&r1=1765032&r2=1765033&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java
(original)
+++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java
Sat Oct 15 10:36:33 2016
@@ -109,7 +109,7 @@ public class DataSourceResourceLoaderTes
         Velocity.setProperty( "ds.resource.loader.resource.timestampcolumn", "timestamp");
 
         Velocity.setProperty(
-                Velocity.RUNTIME_LOG_INSTANCE, new TestLogger());
+                Velocity.RUNTIME_LOG_INSTANCE, new TestLogger(false, false));
 
         Velocity.init();
     }

Modified: velocity/engine/trunk/velocity-engine-core/src/test/resources/ds/create-db.sql
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/ds/create-db.sql?rev=1765033&r1=1765032&r2=1765033&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/test/resources/ds/create-db.sql (original)
+++ velocity/engine/trunk/velocity-engine-core/src/test/resources/ds/create-db.sql Sat Oct
15 10:36:33 2016
@@ -3,7 +3,7 @@
 -- distributed with this work for additional information
 -- regarding copyright ownership.  The ASF licenses this file
 -- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
+-- "License"). you may not use this file except in compliance
 -- with the License.  You may obtain a copy of the License at
 --
 --   http://www.apache.org/licenses/LICENSE-2.0



Mime
View raw message