Author: cbrisson
Date: Mon Mar 11 12:39:36 2019
New Revision: 1855224
URL: http://svn.apache.org/viewvc?rev=1855224&view=rev
Log:
[tools/generic] Fix XmlTool testcase
Modified:
velocity/tools/trunk/pom.xml
velocity/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/XmlToolTests.java
Modified: velocity/tools/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/pom.xml?rev=1855224&r1=1855223&r2=1855224&view=diff
==============================================================================
--- velocity/tools/trunk/pom.xml (original)
+++ velocity/tools/trunk/pom.xml Mon Mar 11 12:39:36 2019
@@ -45,6 +45,8 @@
<properties>
<slf4j.version>1.7.25</slf4j.version>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<modules>
@@ -197,12 +199,25 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <showDeprecation>true</showDeprecation>
+ <showWarning>true</showWarning>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.1.0</version>
<configuration>
<excludePackageNames>org.apache.velocity.tools.examples</excludePackageNames>
- <additionalparam>${javadoc.opts}</additionalparam>
<detectLinks />
+ <!-- full checking is left disabled
+ <doclint>html,missing,reference,syntax</doclint>
+ -->
+ <doclint>none</doclint>
</configuration>
<executions>
<execution>
@@ -218,17 +233,4 @@
</plugin>
</plugins>
</build>
-
- <!-- java 8 doclint checks are too strict for our current javadoc state...
-->
- <profiles>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <properties>
- <javadoc.opts>-Xdoclint:none</javadoc.opts>
- </properties>
- </profile>
- </profiles>
</project>
Modified:
velocity/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/XmlToolTests.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/XmlToolTests.java?rev=1855224&r1=1855223&r2=1855224&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/XmlToolTests.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/XmlToolTests.java
Mon Mar 11 12:39:36 2019
@@ -137,7 +137,7 @@ public class XmlToolTests {
public @Test void methodConfigure_ValueParser() throws Exception
{
XmlTool xml = new XmlTool();
- Map<String,String> params = new HashMap<String,String>();
+ Map<String,Object> params = new HashMap<String,Object>();
assertEquals("resource", ImportSupport.RESOURCE_KEY);
params.put(ImportSupport.RESOURCE_KEY, XML_FILE);
xml.configure(params);
@@ -315,4 +315,4 @@ public class XmlToolTests {
}
-
\ No newline at end of file
+
