You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/04/01 15:29:20 UTC
[maven-help-plugin] branch MPH-148 updated (d390306 -> 342e3ef)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MPH-148
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git.
discard d390306 [MPH-148] - WIP - Upgrade xstream to 1.4.10
discard 4a99dcb [MPH-148] - WIP - Upgrade xstream to 1.4.10
new 342e3ef [MPH-148] - Upgrade xstream to 1.4.10
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d390306)
\
N -- N -- N refs/heads/MPH-148 (342e3ef)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.
[maven-help-plugin] 01/01: [MPH-148] - Upgrade xstream to 1.4.10
Posted by kh...@apache.org.
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
commit 342e3ef2dfe5fc93fd728f8ea070061a9050914a
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Apr 1 16:57:16 2018 +0200
[MPH-148] - 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 d9204e9..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.7</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.