[COCOON-2347] Merge to trunk from BRANCH_2_2_COCOON-2347 - thanks Gabriel Gruber @ggruber4711
git-svn-id: https://svn.apache.org/repos/asf/cocoon/trunk@1828354 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/blocks/pom.xml b/blocks/pom.xml
index 38674f6..4653bbb 100644
--- a/blocks/pom.xml
+++ b/blocks/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10-COCOON-2347-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<artifactId>cocoon-blocks-modules</artifactId>
diff --git a/commons/pom.xml b/commons/pom.xml
index c399033..442ae9f 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10-COCOON-2347-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<groupId>org.apache.cocoon</groupId>
diff --git a/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml b/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml
index 753ec40..70799da 100644
--- a/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml
+++ b/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>cocoon</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>10-COCOON-2347-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
<artifactId>cocoon-servlet-service-components-sample</artifactId>
diff --git a/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml b/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml
index 658a3eb..5a53637 100644
--- a/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml
+++ b/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>cocoon</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>10-COCOON-2347-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
<artifactId>cocoon-servlet-service-components</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index dc15bcc..7d35bb2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10-COCOON-2347-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/dists/pom.xml b/dists/pom.xml
index ddf836d..1402dc8 100644
--- a/dists/pom.xml
+++ b/dists/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10-COCOON-2347-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<artifactId>cocoon-dists-modules</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 55c8c9f..f8c6b96 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10-COCOON-2347-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<name>Apache Cocoon</name>
<inceptionYear>1999</inceptionYear>
<url>http://cocoon.apache.org</url>
diff --git a/pom.xml b/pom.xml
index a84133e..a28116b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>17</version>
+ <version>19</version>
</parent>
<groupId>org.apache.cocoon</groupId>
@@ -56,13 +56,6 @@
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.10</version>
</plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/site/cocoon-main-site/pom.xml b/site/cocoon-main-site/pom.xml
index 135e44c..59936fd 100644
--- a/site/cocoon-main-site/pom.xml
+++ b/site/cocoon-main-site/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10-COCOON-2347-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<relativePath/>
</parent>
diff --git a/tools/pom.xml b/tools/pom.xml
index d8ff53e..85b243a 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10-COCOON-2347-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<artifactId>cocoon-tools-modules</artifactId>
