Author: khmarbaise
Date: Sat Apr 2 21:59:59 2016
New Revision: 1737533
URL: http://svn.apache.org/viewvc?rev=1737533&view=rev
Log:
[MWAR-396] Upgrade to XStream 1.4.9
o I had to add two ignoreClasses for maven-enforcer-plugin
(enforceBytecodeVersion) check cause two classes are using
JDK 8 code. Otherwise the whole check would have failed.
Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml
Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1737533&r1=1737532&r2=1737533&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Sat Apr 2 21:59:59 2016
@@ -19,7 +19,9 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
@@ -120,7 +122,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.4.7</version>
+ <version>1.4.9</version>
</dependency>
<dependency>
@@ -166,6 +168,35 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-bytecode-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <enforceBytecodeVersion combine.children="append">
+ <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
+ <ignoreClasses>
+ <!--
+ ! MWAR-369:
+ ! Added the following two ignores cause those classes
+ ! are JDK 8 classes.
+ -->
+
<ignoreClass>com.thoughtworks.xstream.mapper.LambdaMapper</ignoreClass>
+
<ignoreClass>com.thoughtworks.xstream.converters.reflection.LambdaConverter</ignoreClass>
+ </ignoreClasses>
+ </enforceBytecodeVersion>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
