[maven-site-plugin] branch master updated: [MSITE-863] revert ae9c132, not caused by Java 7 but Maven 3.6.0-

[hb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 36b11f4  [MSITE-863] revert ae9c132, not caused by Java 7 but Maven 3.6.0-
36b11f4 is described below

commit 36b11f4455076840df0af3dc51d825358f899198
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Mon Jun 8 21:40:54 2020 +0200

    [MSITE-863] revert ae9c132, not caused by Java 7 but Maven 3.6.0-
---
 src/it/projects/MSITE-512/invoker.properties      | 20 --------------------
 src/it/projects/full-reporting/invoker.properties |  5 +----
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/src/it/projects/MSITE-512/invoker.properties b/src/it/projects/MSITE-512/invoker.properties
deleted file mode 100644
index a67e666..0000000
--- a/src/it/projects/MSITE-512/invoker.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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.
-
-# IT failing with JDK 7 and Maven < 3.6 (Caused by: java.lang.NoSuchMethodError: org.codehaus.plexus.util.xml.Xpp3Dom.getInputLocation()Ljava/lang/Object;)
-# just ignore JDK 7 now...
-invoker.java.version = 8+
diff --git a/src/it/projects/full-reporting/invoker.properties b/src/it/projects/full-reporting/invoker.properties
index 1dae141..84ce062 100644
--- a/src/it/projects/full-reporting/invoker.properties
+++ b/src/it/projects/full-reporting/invoker.properties
@@ -17,7 +17,4 @@
 
 invoker.profiles=reporting
 # see MNG-5140
-invoker.maven.version = 2.2.2+
-# IT failing with JDK 7 and Maven < 3.6 (Caused by: java.lang.NoSuchMethodError: org.codehaus.plexus.util.xml.Xpp3Dom.getInputLocation()Ljava/lang/Object;)
-# just ignore JDK 7 now...
-invoker.java.version = 8+
+invoker.maven.version = 2.2.2+
\ No newline at end of file