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/08/31 16:37:58 UTC
[jspwiki] branch master updated (3c952f3 -> 1d781de)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git.
from 3c952f3 Merge pull request #2 from sgoeschl/JSPWIKI-1073
new 3a4ed82 2.10.5-git-09
new 464abdb add license to mvn_cheat-sheet.md
new ca4254a update flexmark to 0.34.22 and ASF parent pom to 21
new 1d781de preparing 2.10.5 release
The 4 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.
Summary of changes:
ChangeLog | 10 ++++++++++
.../src/main/java/org/apache/wiki/Release.java | 4 ++--
mvn_cheat-sheet.md | 19 ++++++++++++++++++-
pom.xml | 12 ++++++------
4 files changed, 36 insertions(+), 9 deletions(-)
[jspwiki] 01/04: 2.10.5-git-09
Posted by ju...@apache.org.
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 3a4ed8209c8f074ccf8e5c5761af2a9f2552ba77
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Aug 31 17:36:56 2018 +0200
2.10.5-git-09
---
ChangeLog | 4 ++++
jspwiki-war/src/main/java/org/apache/wiki/Release.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 8c09361..ad8d94e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-31 Siegfried Goeschl (sgoeschl@apache.org)
+
+ * 2.10.5-git-09 : JSPWIKI-1073 Upgrade the jspwiki-portable build
+
2018-07-08 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.10.5-git-08 : update flexmark to 0.34.6 and slf4j to 1.7.25
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 fa6d270..0662e20 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "8";
+ public static final String BUILD = "9";
/**
* This is the generic version string you should use when printing out the version. It is of
[jspwiki] 02/04: add license to mvn_cheat-sheet.md
Posted by ju...@apache.org.
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 464abdbc19c24aebb8b1107f27ddb8eedee7c8b2
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Aug 31 18:15:00 2018 +0200
add license to mvn_cheat-sheet.md
---
mvn_cheat-sheet.md | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/mvn_cheat-sheet.md b/mvn_cheat-sheet.md
index 83452ef..226e27a 100644
--- a/mvn_cheat-sheet.md
+++ b/mvn_cheat-sheet.md
@@ -1,4 +1,21 @@
-
+```
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+```
# 1. IDE Specific
[jspwiki] 04/04: preparing 2.10.5 release
Posted by ju...@apache.org.
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 1d781de7b1de429e3ab31066ec4c5ff2c82ea6b2
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Aug 31 18:37:20 2018 +0200
preparing 2.10.5 release
---
ChangeLog | 6 ++++++
jspwiki-war/src/main/java/org/apache/wiki/Release.java | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ad8d94e..756022e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-31 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+ * update flexmark to 0.34.22 and ASF parent pom to 21
+
+ * prepare release for 2.10.5
+
2018-08-31 Siegfried Goeschl (sgoeschl@apache.org)
* 2.10.5-git-09 : JSPWIKI-1073 Upgrade the jspwiki-portable build
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 0662e20..3db1eae 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 = "git";
+ private static final String POSTFIX = "";
/** The JSPWiki major version. */
public static final int VERSION = 2;
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "9";
+ public static final String BUILD = "";
/**
* This is the generic version string you should use when printing out the version. It is of
[jspwiki] 03/04: update flexmark to 0.34.22 and ASF parent pom to 21
Posted by ju...@apache.org.
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 ca4254a2b5f8d4b2dd262e867937e2c9bfd0906c
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Aug 31 18:36:00 2018 +0200
update flexmark to 0.34.22 and ASF parent pom to 21
---
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 661256d..24a5e47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>19</version>
+ <version>21</version>
</parent>
<groupId>org.apache.jspwiki</groupId>
@@ -39,8 +39,10 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <flexmark.version>0.34.6</flexmark.version>
+ <flexmark.version>0.34.22</flexmark.version>
<jdk.version>1.6</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>
<selenium.version>2.42.0</selenium.version>
<slf4j.version>1.7.25</slf4j.version>
@@ -529,7 +531,7 @@
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
- <version>1.6</version>
+ <version>1.7</version>
<executions>
<execution>
<goals>
@@ -539,7 +541,6 @@
</executions>
<configuration>
<algorithms>
- <algorithm>SHA-1</algorithm>
<algorithm>SHA-512</algorithm>
</algorithms>
</configuration>
@@ -577,8 +578,7 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
- <exclude>mvn_cheat-sheet.md</exclude> <!-- handy list of maven commands; will be moved to site once we've switched to Maven -->
- <exclude>.gitignore</exclude> <!-- git exclusions -->
+ <exclude>.gitignore</exclude> <!-- git exclusions -->
<exclude>**/src/main/config/doc/LICENSE.*</exclude> <!-- 3rd party License files -->
<exclude>**/src/main/config/wikipages/**</exclude> <!-- Default wikipages -->
<exclude>**/src/main/config/dev/OldChangeLog</exclude> <!-- ChangeLog excluded by default, this is, well, an old ChangeLog -->