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 2019/05/04 16:08:21 UTC

[maven-doxia] 01/02: [DOXIA-591] Update minimum Java version to 7

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

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

commit a1fae90f265ce1db42bc9a73202dc5b12ba37a61
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat May 4 16:29:03 2019 +0200

    [DOXIA-591] Update minimum Java version to 7
---
 doxia-modules/doxia-module-markdown/pom.xml        |  4 ----
 .../doxia-module-markdown/src/site/apt/index.apt   | 24 ----------------------
 pom.xml                                            |  2 +-
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/doxia-modules/doxia-module-markdown/pom.xml b/doxia-modules/doxia-module-markdown/pom.xml
index d138b91..f11d774 100644
--- a/doxia-modules/doxia-module-markdown/pom.xml
+++ b/doxia-modules/doxia-module-markdown/pom.xml
@@ -51,10 +51,6 @@ under the License.
     </contributor>
   </contributors>
 
-  <properties>
-    <maven.compiler.target>1.7</maven.compiler.target><!-- required by flexmark -->
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>com.vladsch.flexmark</groupId>
diff --git a/doxia-modules/doxia-module-markdown/src/site/apt/index.apt b/doxia-modules/doxia-module-markdown/src/site/apt/index.apt
index cf06fa4..b896ffc 100644
--- a/doxia-modules/doxia-module-markdown/src/site/apt/index.apt
+++ b/doxia-modules/doxia-module-markdown/src/site/apt/index.apt
@@ -32,30 +32,6 @@ doxia-module-markdown
   It is supported by a large panel of websites, text editors/IDEs and converter tools.
   Markdown format is only supported as Doxia source format.
 
-* Notice
-
-  This Doxia module requires Java 7 for {{{http://github.com/vsch/flexmark-java}flexmark-java}} parser,
-  unlike other Doxia modules which require only Java 6.
-
-  If your project requires Java 6 to launch Maven, you may consider the use of doxia-module-markdown version 1.7.
-
-+----+
-  <plugin>
-    <groupId>org.apache.maven.plugins</groupId>
-    <artifactId>maven-site-plugin</artifactId>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.maven.doxia</groupId>
-        <artifactId>doxia-module-markdown</artifactId>
-        <version>1.7</version><!-- to keep Java 6 compatibility-->
-      </dependency>
-    </dependencies>
-  </plugin>
-+----+
-  
-  In this situation, you should be aware that Pegdown has known technical issues and that
-  {{{http://pegdown.org}"Pegdown has reached its end of life"}}.
-
 * References
 
    * {{{http://daringfireball.net/projects/markdown}Markdown project website}}
diff --git a/pom.xml b/pom.xml
index 07b4183..73200bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,8 +84,8 @@ under the License.
   </distributionManagement>
 
   <properties>
+    <javaVersion>7</javaVersion><!-- remove when upgrade to maven-parent 34 -->
     <maven.site.path>doxia-archives/doxia-LATEST</maven.site.path>
-    <surefire.version>2.21.0</surefire.version>
     <checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,MethodName,InnerAssignment,MagicNumber</checkstyle.violation.ignore>
   </properties>