maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfscho...@apache.org
Subject [maven-jxr] branch master updated: [JXR-139] Failing IT for JDK9+
Date Thu, 19 Jul 2018 10:44:01 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new d070493  [JXR-139] Failing IT for JDK9+
d070493 is described below

commit d070493c729a9cce34cffce5c77d038fe5a9f81d
Author: rfscholte <rfscholte@apache.org>
AuthorDate: Thu Jul 19 12:43:55 2018 +0200

    [JXR-139] Failing IT for JDK9+
---
 maven-jxr-plugin/pom.xml                            | 7 +++++++
 maven-jxr-plugin/src/it/aggregate/pom.xml           | 5 ++---
 maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml | 9 ++++-----
 maven-jxr-plugin/src/it/new-site-config/pom.xml     | 4 ++--
 maven-jxr-plugin/src/it/simple-project/pom.xml      | 4 ++--
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/maven-jxr-plugin/pom.xml b/maven-jxr-plugin/pom.xml
index dcbb257..7535bb5 100644
--- a/maven-jxr-plugin/pom.xml
+++ b/maven-jxr-plugin/pom.xml
@@ -185,6 +185,7 @@ under the License.
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
             <configuration>
+              <streamLogs>true</streamLogs><!-- TEMPORARY -->
               <projectsDirectory>src/it</projectsDirectory>
               <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
               <pomIncludes>
@@ -197,6 +198,12 @@ under the License.
                 <goal>site</goal>
               </goals>
               <settingsFile>src/it/settings.xml</settingsFile>
+              <properties>
+                <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
+                <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
+                <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central
-->
+                <https.protocols>${https.protocols}</https.protocols>
+              </properties>
             </configuration>
             <executions>
               <execution>
diff --git a/maven-jxr-plugin/src/it/aggregate/pom.xml b/maven-jxr-plugin/src/it/aggregate/pom.xml
index 47b072f..abfd3b0 100644
--- a/maven-jxr-plugin/src/it/aggregate/pom.xml
+++ b/maven-jxr-plugin/src/it/aggregate/pom.xml
@@ -26,7 +26,6 @@ under the License.
     <name>aggregate</name>
     <url>http://maven.apache.org</url>
     <properties>
-        <jxr-plugin-version>@pom.version@</jxr-plugin-version>
         <site-plugin-version>@sitePluginVersion@</site-plugin-version>
     </properties>
     <dependencies>
@@ -56,7 +55,7 @@ under the License.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jxr-plugin</artifactId>
-                <version>${jxr-plugin-version}</version>
+                <version>@project.version@</version>
                 <reportSets>
                     <reportSet>
                         <id>aggregate</id>
@@ -70,7 +69,7 @@ under the License.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
+                <version>3.0.0</version>
                 <reportSets>
                     <reportSet>
                         <id>aggregate</id>
diff --git a/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml b/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml
index a0fb0bf..b810f0c 100644
--- a/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml
+++ b/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml
@@ -32,7 +32,6 @@ under the License.
   <url>http://maven.apache.org</url>
 
   <properties>
-    <jxr-plugin-version>@pom.version@</jxr-plugin-version>
     <site-plugin-version>@sitePluginVersion@</site-plugin-version>
   </properties>
 
@@ -50,7 +49,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>${jxr-plugin-version}</version>
+        <version>@project.version@</version>
         <executions>
           <execution>
             <id>aggregate</id>
@@ -62,7 +61,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.8</version>
+        <version>3.0.0</version>
         <executions>
           <execution>
             <id>aggregate</id>
@@ -93,12 +92,12 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>${jxr-plugin-version}</version>
+        <version>@project.version@</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.8</version>
+        <version>3.0.0</version>
       </plugin>
     </plugins>
   </reporting>
diff --git a/maven-jxr-plugin/src/it/new-site-config/pom.xml b/maven-jxr-plugin/src/it/new-site-config/pom.xml
index c6a3cbc..8f4572b 100644
--- a/maven-jxr-plugin/src/it/new-site-config/pom.xml
+++ b/maven-jxr-plugin/src/it/new-site-config/pom.xml
@@ -50,12 +50,12 @@ under the License.
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-jxr-plugin</artifactId>
-              <version>@pom.version@</version>
+              <version>@project.version@</version>
             </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-javadoc-plugin</artifactId>
-              <version>2.8</version>
+              <version>3.0.0</version>
             </plugin>
           </reportPlugins>
         </configuration>
diff --git a/maven-jxr-plugin/src/it/simple-project/pom.xml b/maven-jxr-plugin/src/it/simple-project/pom.xml
index ade56d3..3c410d7 100644
--- a/maven-jxr-plugin/src/it/simple-project/pom.xml
+++ b/maven-jxr-plugin/src/it/simple-project/pom.xml
@@ -44,7 +44,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
       </plugin>    
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -60,7 +60,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
       </plugin>
     </plugins>
   </reporting>


Mime
View raw message