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/05/28 22:05:49 UTC
[jspwiki] 01/02: JSPWIKI-1070: Support JDK 10 builds
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 33f90091ac59f872ab2e1d836ac6202febffbcdd
Author: juanpablo <ju...@apache.org>
AuthorDate: Tue May 29 00:04:35 2018 +0200
JSPWIKI-1070: Support JDK 10 builds
---
ChangeLog | 6 ++++++
jspwiki-war/src/main/java/org/apache/wiki/Release.java | 6 +++---
pom.xml | 13 ++++++++++---
3 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dd17202..5d61674 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-27 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+ * 2.10.5-git-01
+
+ * JSPWIKI-1070: Support JDK 10 builds
+
2018-04-29 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.4-git-10 Bugfix in AddCSS.JS related to url() parsing
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index 44021bd..b4b525d 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -52,7 +52,7 @@ public final class Release {
* <p>
* If the POSTFIX is empty, it is not added to the version string.
*/
- private static final String POSTFIX = "";
+ private static final String POSTFIX = "git";
/** The JSPWiki major version. */
public static final int VERSION = 2;
@@ -61,7 +61,7 @@ public final class Release {
public static final int REVISION = 10;
/** The minor revision. */
- public static final int MINORREVISION = 4;
+ public static final int MINORREVISION = 5;
/** The build number/identifier. This is a String as opposed to an integer, just so that people can add
* other identifiers to it. The build number is incremented every time a committer checks in code, and reset
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "";
+ public static final String BUILD = "1";
/**
* This is the generic version string you should use when printing out the version. It is of
diff --git a/pom.xml b/pom.xml
index bdf6b6d..37f63ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -335,6 +335,13 @@
<source>${jdk.version}</source>
<target>${jdk.version}</target>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>6.1.1</version> <!-- MCOMPILER-332 -->
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
@@ -371,7 +378,7 @@
<fail>true</fail>
<rules>
<requireJavaVersion>
- <message>MUST USE JDK 1.6</message>
+ <message>MUST USE JDK ${jdk.version}</message>
<version>${jdk.version}</version>
</requireJavaVersion>
<requireMavenVersion>
@@ -479,12 +486,12 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20.1</version>
+ <version>2.21.0</version>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.20.1</version>
+ <version>2.21.0</version>
</plugin>
<plugin>
--
To stop receiving notification emails like this one, please contact
juanpablo@apache.org.