maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From khmarba...@apache.org
Subject [maven-help-plugin] branch MPH-148 updated: [MPH-148] - WIP - Upgrade xstream to 1.4.10
Date Sun, 01 Apr 2018 15:23:48 GMT
This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a commit to branch MPH-148
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git


The following commit(s) were added to refs/heads/MPH-148 by this push:
     new d390306  [MPH-148] - WIP - Upgrade xstream to 1.4.10
d390306 is described below

commit d3903068d9768dc3d7110651843e94070c1a7a99
Author: Karl Heinz Marbaise <khmarbaise@apache.org>
AuthorDate: Sun Apr 1 17:23:15 2018 +0200

    [MPH-148] - WIP - Upgrade xstream to 1.4.10
---
 pom.xml | 60 ++++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 44 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index f38e348..fc0e995 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,25 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
 <!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-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
-with the License.  You may obtain a copy of the License at
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  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
+  with the License. You may obtain a copy of the License at
 
   http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
 -->
 
-<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">
+<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>
 
   <parent>
@@ -134,7 +136,7 @@ under the License.
       <artifactId>maven-plugin-annotations</artifactId>
       <scope>provided</scope>
     </dependency>
-    
+
     <!-- shared -->
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
@@ -188,7 +190,7 @@ under the License.
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
-      <version>1.4.10-java7</version>
+      <version>1.4.10</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -243,6 +245,32 @@ under the License.
     </pluginManagement>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-bytecode-version</id>
+            <configuration>
+              <rules>
+                <!--
+                  ! Added the following ignores cause our target is JDK 7 
+                  ! The given classes are JDK 8 compiled.
+                -->
+                <enforceBytecodeVersion
+                  combine.children="append">
+                  <ignoreClasses>
+                    <ignoreClass>com.thoughtworks.xstream.converters.reflection.LambdaConverter</ignoreClass>
+                    <ignoreClass>com.thoughtworks.xstream.mapper.LambdaMapper</ignoreClass>
+                    <ignoreClass>com.thoughtworks.xstream.converters.time.*</ignoreClass>
+                    <ignoreClass>com.thoughtworks.xstream.core.util.ISO8601JavaTimeConverter</ignoreClass>
+                  </ignoreClasses>
+                </enforceBytecodeVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-metadata</artifactId>
         <executions>

-- 
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.

Mime
View raw message