You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/06/12 12:48:08 UTC

[maven-site] branch java8 created (now 1842a63)

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

slachiewicz pushed a change to branch java8
in repository https://gitbox.apache.org/repos/asf/maven-site.git.


      at 1842a63  Sync and enforce Java 8 - adapted to the current Jenkins setup

This branch includes the following new commits:

     new 1842a63  Sync and enforce Java 8 - adapted to the current Jenkins setup

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.



[maven-site] 01/01: Sync and enforce Java 8 - adapted to the current Jenkins setup

Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 1842a6357153f7c7b0d89363aeb9375cff711ffb
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Jun 12 14:47:46 2020 +0200

    Sync and enforce Java 8 - adapted to the current Jenkins setup
---
 pom.xml | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7e32a13..f3a524a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,7 @@
     <fluidoVersion>1.9.1-SNAPSHOT</fluidoVersion><!-- used by src/xdoc/errors/404.xml.vm -->
     <doxiaVersion>1.9.1</doxiaVersion>
     <doxiaToolsVersion>1.9.1</doxiaToolsVersion>
+    <javaVersion>8</javaVersion>
   </properties>
 
   <repositories>
@@ -172,8 +173,23 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
+        <version>3.0.0-M3</version>
         <executions>
           <execution>
+            <id>enforce-java8</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <phase>site</phase>
+            <configuration>
+              <rules>
+                <requireJavaVersion>
+                  <version>1.8</version>
+                </requireJavaVersion>
+              </rules>
+            </configuration>
+          </execution>
+          <execution>
             <id>check-site-inheritance</id>
             <goals>
               <goal>enforce</goal>
@@ -218,6 +234,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>1.10.7</version>
+          </dependency>
+        </dependencies>
         <executions>
           <execution>
             <id>chmod</id>
@@ -378,28 +401,5 @@
         </plugins>
       </reporting>
     </profile>
-    <profile>
-      <id>java8-ant-ln</id>
-      <activation>
-        <jdk>[1.8,)</jdk>
-      </activation>
-      <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-antrun-plugin</artifactId>
-              <dependencies>
-                <dependency>
-                  <groupId>org.apache.ant</groupId>
-                  <artifactId>ant</artifactId>
-                  <version>1.10.3</version><!-- to get symbolic links from Java 7 API instead of "ln" -->
-                </dependency>
-              </dependencies>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-      </build>
-    </profile>
   </profiles>
 </project>