You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2018/09/17 20:43:56 UTC
[jspwiki] 01/03: 2.11.0-M1: minimum required to build/run is now
Java 8 / Maven 3.5.0
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 6093f0b18568f4c2d30a6c940effd5893002b83f
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Sep 14 17:43:27 2018 +0200
2.11.0-M1: minimum required to build/run is now Java 8 / Maven 3.5.0
---
jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-cma/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-custom/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-selenium-tests/pom.xml | 2 +-
jspwiki-it-tests/pom.xml | 2 +-
jspwiki-markdown/pom.xml | 2 +-
jspwiki-portable/pom.xml | 2 +-
jspwiki-war/pom.xml | 2 +-
jspwiki-wikipages/de/pom.xml | 2 +-
jspwiki-wikipages/en/pom.xml | 2 +-
jspwiki-wikipages/es/pom.xml | 2 +-
jspwiki-wikipages/fi/pom.xml | 2 +-
jspwiki-wikipages/fr/pom.xml | 2 +-
jspwiki-wikipages/it/pom.xml | 2 +-
jspwiki-wikipages/nl/pom.xml | 2 +-
jspwiki-wikipages/pom.xml | 2 +-
jspwiki-wikipages/pt_BR/pom.xml | 2 +-
jspwiki-wikipages/ru/pom.xml | 2 +-
jspwiki-wikipages/zh_CN/pom.xml | 2 +-
pom.xml | 6 +++---
22 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml b/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml
index 21814bf..4a15eb8 100644
--- a/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml
@@ -22,7 +22,7 @@
<parent> <!-- this enables tests reuse [1/3] -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<!-- Container Managed Authentication using JDBC instead of XML files for user and group info -->
diff --git a/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml b/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml
index 02845f7..8dbbe04 100644
--- a/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml
@@ -22,7 +22,7 @@
<parent> <!-- this enables tests reuse [1/3] -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<!-- Container Managed Authentication -->
diff --git a/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml b/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
index e08a323..45f588f 100644
--- a/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
@@ -22,7 +22,7 @@
<parent> <!-- this enables tests reuse [1/3] -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-it-test-custom-absolute-urls</artifactId>
diff --git a/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml b/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
index f87fdd9..ac347e2 100644
--- a/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
@@ -22,7 +22,7 @@
<parent> <!-- this enables tests reuse [1/3] -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-it-test-custom-jdbc</artifactId>
diff --git a/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml b/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
index 86f7d94..1a0789f 100644
--- a/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
@@ -24,7 +24,7 @@
<parent> <!-- this enables tests reuse [1/3] -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-it-test-custom</artifactId>
diff --git a/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml b/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
index 1318c04..49c2e4d 100644
--- a/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
+++ b/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/jspwiki-it-tests/pom.xml b/jspwiki-it-tests/pom.xml
index 131f0f1..2449b96 100644
--- a/jspwiki-it-tests/pom.xml
+++ b/jspwiki-it-tests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<groupId>org.apache.jspwiki.it</groupId>
diff --git a/jspwiki-markdown/pom.xml b/jspwiki-markdown/pom.xml
index 1f8cd69..65b1702 100755
--- a/jspwiki-markdown/pom.xml
+++ b/jspwiki-markdown/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-markdown</artifactId>
diff --git a/jspwiki-portable/pom.xml b/jspwiki-portable/pom.xml
index 528fce1..a92570e 100644
--- a/jspwiki-portable/pom.xml
+++ b/jspwiki-portable/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-war/pom.xml b/jspwiki-war/pom.xml
index 0524f8a..96442f3 100644
--- a/jspwiki-war/pom.xml
+++ b/jspwiki-war/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/de/pom.xml b/jspwiki-wikipages/de/pom.xml
index b864ec8..41c1999 100644
--- a/jspwiki-wikipages/de/pom.xml
+++ b/jspwiki-wikipages/de/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/en/pom.xml b/jspwiki-wikipages/en/pom.xml
index 47c9ff3..1cd0661 100644
--- a/jspwiki-wikipages/en/pom.xml
+++ b/jspwiki-wikipages/en/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/es/pom.xml b/jspwiki-wikipages/es/pom.xml
index 12f0c0c..c988490 100644
--- a/jspwiki-wikipages/es/pom.xml
+++ b/jspwiki-wikipages/es/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/fi/pom.xml b/jspwiki-wikipages/fi/pom.xml
index 3c6c617..44efb44 100644
--- a/jspwiki-wikipages/fi/pom.xml
+++ b/jspwiki-wikipages/fi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/fr/pom.xml b/jspwiki-wikipages/fr/pom.xml
index 2cab167..8cd3d24 100644
--- a/jspwiki-wikipages/fr/pom.xml
+++ b/jspwiki-wikipages/fr/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/it/pom.xml b/jspwiki-wikipages/it/pom.xml
index 48121e9..364c5ca 100644
--- a/jspwiki-wikipages/it/pom.xml
+++ b/jspwiki-wikipages/it/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/nl/pom.xml b/jspwiki-wikipages/nl/pom.xml
index ed9487f..eb9ea61 100644
--- a/jspwiki-wikipages/nl/pom.xml
+++ b/jspwiki-wikipages/nl/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/pom.xml b/jspwiki-wikipages/pom.xml
index 91f1275..9c169ff 100644
--- a/jspwiki-wikipages/pom.xml
+++ b/jspwiki-wikipages/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/pt_BR/pom.xml b/jspwiki-wikipages/pt_BR/pom.xml
index 8c1285e..582d8ec 100644
--- a/jspwiki-wikipages/pt_BR/pom.xml
+++ b/jspwiki-wikipages/pt_BR/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/ru/pom.xml b/jspwiki-wikipages/ru/pom.xml
index f8fff14..268dcf4 100644
--- a/jspwiki-wikipages/ru/pom.xml
+++ b/jspwiki-wikipages/ru/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/zh_CN/pom.xml b/jspwiki-wikipages/zh_CN/pom.xml
index 710532a..e6c84a7 100644
--- a/jspwiki-wikipages/zh_CN/pom.xml
+++ b/jspwiki-wikipages/zh_CN/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index db5e28c..2ed3d93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>jspwiki-builder</artifactId>
<modelVersion>4.0.0</modelVersion>
<name>Apache JSPWiki</name>
- <version>2.10.6-SNAPSHOT</version>
+ <version>2.11.0.M1-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Apache JSPWiki is a leading open source WikiWiki engine, feature-rich
and built around standard J2EE components (Java, servlets, JSP).</description>
@@ -40,7 +40,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<flexmark.version>0.34.22</flexmark.version>
- <jdk.version>1.6</jdk.version>
+ <jdk.version>1.8</jdk.version>
<maven.compiler.source>${jdk}</maven.compiler.source> <!-- override values from parent pom -->
<maven.compiler.target>${jdk}</maven.compiler.target>
<lucene.version>4.7.0</lucene.version>
@@ -51,7 +51,7 @@
</properties>
<prerequisites>
- <maven>3.0.4</maven>
+ <maven>3.5.0</maven>
</prerequisites>
<scm>