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 2019/09/12 22:22:04 UTC
[jspwiki] branch master updated (ae51f76 -> c4f0424)
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 ae51f76 2.11.0-M5-git-19 : Fix javascript build error, and some favicon errors.
new 348dac8 poms back to M5-SNAPSHOT
new c4f0424 regenerate portable launchers, as per https://jspwiki-wiki.apache.org/Wiki.jsp?page=PortableBinaries#section-PortableBinaries-CreatingTheNativeLaunchers
The 2 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:
jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-cma/pom.xml | 2 +-
.../jspwiki-it-test-custom-absolute-urls/pom.xml | 2 +-
.../jspwiki-it-test-custom-jdbc/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-custom/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-selenide-tests/pom.xml | 2 +-
jspwiki-it-tests/pom.xml | 2 +-
jspwiki-main/pom.xml | 2 +-
jspwiki-markdown/pom.xml | 2 +-
jspwiki-portable/pom.xml | 2 +-
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 34990 -> 35109 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49336 -> 49935 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3423516 -> 3459557 bytes
jspwiki-tika-searchprovider/pom.xml | 2 +-
jspwiki-util/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 | 2 +-
28 files changed, 25 insertions(+), 25 deletions(-)
[jspwiki] 01/02: poms back to M5-SNAPSHOT
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 348dac875f4d918e3f67147ee3dc72f6c8f7fe5f
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Sep 13 00:15:10 2019 +0200
poms back to M5-SNAPSHOT
---
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-selenide-tests/pom.xml | 2 +-
jspwiki-it-tests/pom.xml | 2 +-
jspwiki-main/pom.xml | 2 +-
jspwiki-markdown/pom.xml | 2 +-
jspwiki-portable/pom.xml | 2 +-
jspwiki-tika-searchprovider/pom.xml | 2 +-
jspwiki-util/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 | 2 +-
25 files changed, 25 insertions(+), 25 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 6ec71c5..a81611e 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> <!-- tests reuse [1/3]: reads common configuration for ITs and brings jspwiki-war as dependency -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-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 c4cd7c9..d2267bb 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> <!-- tests reuse [1/3]: reads common configuration for ITs and brings jspwiki-war as dependency -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-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 9a1ea61..6901411 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> <!-- tests reuse [1/3]: reads common configuration for ITs and brings jspwiki-war as dependency -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-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 f5da659..23d005b 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> <!-- tests reuse [1/3]: reads common configuration for ITs and brings jspwiki-war as dependency -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-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 714b019..67bb8c7 100644
--- a/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
@@ -22,7 +22,7 @@
<parent> <!-- tests reuse [1/3]: reads common configuration for ITs and brings jspwiki-war as dependency -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-it-test-custom</artifactId>
diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/pom.xml b/jspwiki-it-tests/jspwiki-selenide-tests/pom.xml
index 7aae390..1d6dfc8 100644
--- a/jspwiki-it-tests/jspwiki-selenide-tests/pom.xml
+++ b/jspwiki-it-tests/jspwiki-selenide-tests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/jspwiki-it-tests/pom.xml b/jspwiki-it-tests/pom.xml
index 061c6ae..1d25a31 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.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
</parent>
<groupId>org.apache.jspwiki.it</groupId>
diff --git a/jspwiki-main/pom.xml b/jspwiki-main/pom.xml
index e739cb0..01169ff 100644
--- a/jspwiki-main/pom.xml
+++ b/jspwiki-main/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-markdown/pom.xml b/jspwiki-markdown/pom.xml
index 2e2158d..9d89b7e 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.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-markdown</artifactId>
diff --git a/jspwiki-portable/pom.xml b/jspwiki-portable/pom.xml
index f64ac01..2d55c56 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.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-tika-searchprovider/pom.xml b/jspwiki-tika-searchprovider/pom.xml
index 214b59b..4f8a10c 100644
--- a/jspwiki-tika-searchprovider/pom.xml
+++ b/jspwiki-tika-searchprovider/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-tika-searchprovider</artifactId>
diff --git a/jspwiki-util/pom.xml b/jspwiki-util/pom.xml
index 48477e2..b30b9c9 100644
--- a/jspwiki-util/pom.xml
+++ b/jspwiki-util/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-war/pom.xml b/jspwiki-war/pom.xml
index 53aa26e..1b4db16 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.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/de/pom.xml b/jspwiki-wikipages/de/pom.xml
index 55ab4bb..4f4dab7 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.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/en/pom.xml b/jspwiki-wikipages/en/pom.xml
index cf50fd1..bbb92fc 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.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/es/pom.xml b/jspwiki-wikipages/es/pom.xml
index b6a655c..98c9a7e 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.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/fi/pom.xml b/jspwiki-wikipages/fi/pom.xml
index be19362..2bb5c66 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.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/fr/pom.xml b/jspwiki-wikipages/fr/pom.xml
index 3364e97..473f804 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.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/it/pom.xml b/jspwiki-wikipages/it/pom.xml
index ee90f55..c83d3bf 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.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/nl/pom.xml b/jspwiki-wikipages/nl/pom.xml
index 47bb056..c78ade9 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.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/pom.xml b/jspwiki-wikipages/pom.xml
index 94ded56..87d2518 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.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-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 c22f802..59ad280 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.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/ru/pom.xml b/jspwiki-wikipages/ru/pom.xml
index a0301be..9c9baec 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.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-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 e8f2bc0..92350a8 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.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 4d623d0..72d2968 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.11.0.M6-SNAPSHOT</version>
+ <version>2.11.0.M5-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Apache JSPWiki is a leading open source WikiWiki engine, feature-rich
and built around standard JEE components (Java, servlets, JSP).</description>
[jspwiki] 02/02: regenerate portable launchers, as per
https://jspwiki-wiki.apache.org/Wiki.jsp?page=PortableBinaries#section-PortableBinaries-CreatingTheNativeLaunchers
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 c4f0424ad6216a34efab4e48e0b5000822e63071
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Sep 13 00:21:24 2019 +0200
regenerate portable launchers, as per https://jspwiki-wiki.apache.org/Wiki.jsp?page=PortableBinaries#section-PortableBinaries-CreatingTheNativeLaunchers
---
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 34990 -> 35109 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49336 -> 49935 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3423516 -> 3459557 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar
index 8c32be6..e722aa6 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar differ
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar
index d04d917..509cded 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar differ
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe
index f9f2564..fb7f5e2 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ