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 2021/11/15 14:23:51 UTC

[jspwiki] 01/14: revert to 2.11.0-SNAPSHOT + update cargo-maven2-plugin to cargo-maven3-plugin

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 04fa694ca1cefae74d0a5af24479d0ba0c565b93
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Mon Nov 15 14:22:21 2021 +0100

    revert to 2.11.0-SNAPSHOT + update cargo-maven2-plugin to cargo-maven3-plugin
---
 jspwiki-210-adapters/pom.xml                             |   2 +-
 jspwiki-210-test-adaptees/pom.xml                        |   2 +-
 jspwiki-api/pom.xml                                      |   2 +-
 jspwiki-bootstrap/pom.xml                                |   2 +-
 jspwiki-event/pom.xml                                    |   2 +-
 .../jspwiki_logo_s.png                                   | Bin 5694 -> 0 bytes
 jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml        |   4 ++--
 jspwiki-it-tests/jspwiki-it-test-cma/pom.xml             |   4 ++--
 .../jspwiki_logo_s.png                                   | Bin 5694 -> 0 bytes
 .../jspwiki-it-test-custom-absolute-urls/pom.xml         |   4 ++--
 .../jspwiki_logo_s.png                                   | Bin 5694 -> 0 bytes
 jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml     |   4 ++--
 jspwiki-it-tests/jspwiki-it-test-custom/pom.xml          |   4 ++--
 jspwiki-it-tests/jspwiki-selenide-tests/pom.xml          |   2 +-
 jspwiki-it-tests/pom.xml                                 |   4 ++--
 jspwiki-kendra-searchprovider/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/pt_BR/pom.xml                          |   2 +-
 jspwiki-wikipages/ru/pom.xml                             |   2 +-
 jspwiki-wikipages/zh_CN/pom.xml                          |   2 +-
 pom.xml                                                  |   6 +++---
 33 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/jspwiki-210-adapters/pom.xml b/jspwiki-210-adapters/pom.xml
index a812abf..27edf99 100644
--- a/jspwiki-210-adapters/pom.xml
+++ b/jspwiki-210-adapters/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.jspwiki</groupId>
     <artifactId>jspwiki-builder</artifactId>
-    <version>2.11.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-210-test-adaptees/pom.xml b/jspwiki-210-test-adaptees/pom.xml
index 27a6aaa..2ac8f40 100644
--- a/jspwiki-210-test-adaptees/pom.xml
+++ b/jspwiki-210-test-adaptees/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.jspwiki</groupId>
     <artifactId>jspwiki-builder</artifactId>
-    <version>2.11.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-api/pom.xml b/jspwiki-api/pom.xml
index 06abf14..98acfd3 100644
--- a/jspwiki-api/pom.xml
+++ b/jspwiki-api/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.jspwiki</groupId>
     <artifactId>jspwiki-builder</artifactId>
-    <version>2.11.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-bootstrap/pom.xml b/jspwiki-bootstrap/pom.xml
index 9944206..4f0813c 100644
--- a/jspwiki-bootstrap/pom.xml
+++ b/jspwiki-bootstrap/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.jspwiki</groupId>
     <artifactId>jspwiki-builder</artifactId>
-    <version>2.11.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-event/pom.xml b/jspwiki-event/pom.xml
index 51df204..fde8da0 100644
--- a/jspwiki-event/pom.xml
+++ b/jspwiki-event/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.jspwiki</groupId>
     <artifactId>jspwiki-builder</artifactId>
-    <version>2.11.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/build/downloads/3eee9646-1af7-425e-a117-bd7399416182/jspwiki_logo_s.png b/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/build/downloads/3eee9646-1af7-425e-a117-bd7399416182/jspwiki_logo_s.png
deleted file mode 100755
index df50b59..0000000
Binary files a/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/build/downloads/3eee9646-1af7-425e-a117-bd7399416182/jspwiki_logo_s.png and /dev/null differ
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 1e1ef53..54a715a 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <!-- Container Managed Authentication using JDBC instead of XML files for user and group info -->
@@ -52,7 +52,7 @@
 
       <plugin>
         <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-maven2-plugin</artifactId>
+        <artifactId>cargo-maven3-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
diff --git a/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml b/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml
index 6e1a70b..8b80084 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
   
   <!-- Container Managed Authentication -->
@@ -47,7 +47,7 @@
 
       <plugin>
         <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-maven2-plugin</artifactId>
+        <artifactId>cargo-maven3-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
diff --git a/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/build/downloads/3eeaa04b-0306-4b81-b98a-28e20a23221b/jspwiki_logo_s.png b/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/build/downloads/3eeaa04b-0306-4b81-b98a-28e20a23221b/jspwiki_logo_s.png
deleted file mode 100755
index df50b59..0000000
Binary files a/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/build/downloads/3eeaa04b-0306-4b81-b98a-28e20a23221b/jspwiki_logo_s.png and /dev/null differ
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 43c83b6..4e8420c 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>jspwiki-it-test-custom-absolute-urls</artifactId>
@@ -46,7 +46,7 @@
 
       <plugin>
         <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-maven2-plugin</artifactId>
+        <artifactId>cargo-maven3-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
diff --git a/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/build/downloads/b5b76078-fa77-4aac-bcf6-c4633a2e2bbf/jspwiki_logo_s.png b/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/build/downloads/b5b76078-fa77-4aac-bcf6-c4633a2e2bbf/jspwiki_logo_s.png
deleted file mode 100755
index df50b59..0000000
Binary files a/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/build/downloads/b5b76078-fa77-4aac-bcf6-c4633a2e2bbf/jspwiki_logo_s.png and /dev/null differ
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 a2f7a2e..fe9e90c 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>jspwiki-it-test-custom-jdbc</artifactId>
@@ -51,7 +51,7 @@
 
       <plugin>
         <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-maven2-plugin</artifactId>
+        <artifactId>cargo-maven3-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
diff --git a/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml b/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
index 8ade82e..a6523d6 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>jspwiki-it-test-custom</artifactId>
@@ -46,7 +46,7 @@
 
       <plugin>
         <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-maven2-plugin</artifactId>
+        <artifactId>cargo-maven3-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/pom.xml b/jspwiki-it-tests/jspwiki-selenide-tests/pom.xml
index b5c3b69..9b9ed9c 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/jspwiki-it-tests/pom.xml b/jspwiki-it-tests/pom.xml
index 8645248..6dc678e 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.jspwiki.it</groupId>
@@ -179,7 +179,7 @@
             <!-- Additional Tomcat configuration (JNDI lookups for DB access, tomcat-users.xml file) -->
             <plugin>
               <groupId>org.codehaus.cargo</groupId>
-              <artifactId>cargo-maven2-plugin</artifactId>
+              <artifactId>cargo-maven3-plugin</artifactId>
               <configuration>
                 <configuration>
                   <datasources>
diff --git a/jspwiki-kendra-searchprovider/pom.xml b/jspwiki-kendra-searchprovider/pom.xml
index 8641e8f..39df1e7 100644
--- a/jspwiki-kendra-searchprovider/pom.xml
+++ b/jspwiki-kendra-searchprovider/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.jspwiki</groupId>
     <artifactId>jspwiki-builder</artifactId>
-    <version>2.11.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jspwiki-kendra-searchprovider</artifactId>
diff --git a/jspwiki-main/pom.xml b/jspwiki-main/pom.xml
index 09982a2..911db1d 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-markdown/pom.xml b/jspwiki-markdown/pom.xml
index 6914b46..0bac02b 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jspwiki-markdown</artifactId>
diff --git a/jspwiki-portable/pom.xml b/jspwiki-portable/pom.xml
index c587922..e3cb7b4 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-tika-searchprovider/pom.xml b/jspwiki-tika-searchprovider/pom.xml
index 1ec027e..1512b7e 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jspwiki-tika-searchprovider</artifactId>
diff --git a/jspwiki-util/pom.xml b/jspwiki-util/pom.xml
index c8957f2..7aff849 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-war/pom.xml b/jspwiki-war/pom.xml
index 9cb1ded..a823e6b 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/de/pom.xml b/jspwiki-wikipages/de/pom.xml
index 5fa03cc..0bed17d 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/en/pom.xml b/jspwiki-wikipages/en/pom.xml
index 863d6c3..4f010c9 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/es/pom.xml b/jspwiki-wikipages/es/pom.xml
index 3cb50d1..7ab6b41 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/fi/pom.xml b/jspwiki-wikipages/fi/pom.xml
index 63ff5fe..96efffb 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/fr/pom.xml b/jspwiki-wikipages/fr/pom.xml
index f743faf..b9e18e2 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/it/pom.xml b/jspwiki-wikipages/it/pom.xml
index d3a4725..ad527b7 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/nl/pom.xml b/jspwiki-wikipages/nl/pom.xml
index 99382e0..32c2ba1 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.1-SNAPSHOT</version>
+    <version>2.11.0-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 f2f01ed..9c5b495 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/ru/pom.xml b/jspwiki-wikipages/ru/pom.xml
index 9914769..4a50e69 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.1-SNAPSHOT</version>
+    <version>2.11.0-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 4b7e971..9ec7d54 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.1-SNAPSHOT</version>
+    <version>2.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 9fe62fd..8ef05e3 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.1-SNAPSHOT</version>
+  <version>2.11.0-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>
@@ -104,7 +104,7 @@
     <plugin.jspc.version>3.2.0</plugin.jspc.version>
     <plugin.checksum.version>1.11</plugin.checksum.version>
     <plugin.jslint.version>1.0.1</plugin.jslint.version>
-    <plugin.cargo.version>1.8.5</plugin.cargo.version>
+    <plugin.cargo.version>1.9.8</plugin.cargo.version>
     <plugin.clirr.version>2.8</plugin.clirr.version>
     <plugin.cobertura.version>2.7</plugin.cobertura.version>
     <plugin.sonar.version>3.9.0.2155</plugin.sonar.version>
@@ -757,7 +757,7 @@
 
         <plugin>
           <groupId>org.codehaus.cargo</groupId>
-          <artifactId>cargo-maven2-plugin</artifactId>
+          <artifactId>cargo-maven3-plugin</artifactId>
           <version>${plugin.cargo.version}</version>
           <configuration>
             <container>