Disabiling blocks and samples with dependencies not available any more
git-svn-id: https://svn.apache.org/repos/asf/cocoon/trunk@1415570 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml b/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml
index 9e605da..a8d8bf5 100644
--- a/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml
+++ b/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-serializers-charsets</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/blocks/pom.xml b/blocks/pom.xml
index 0355cb7..4653bbb 100644
--- a/blocks/pom.xml
+++ b/blocks/pom.xml
@@ -134,8 +134,8 @@
<module>cocoon-bsf/cocoon-bsf-sample</module>
<module>cocoon-captcha/cocoon-captcha-impl</module>
<module>cocoon-captcha/cocoon-captcha-sample</module>
- <module>cocoon-chaperon/cocoon-chaperon-impl</module>
- <module>cocoon-chaperon/cocoon-chaperon-sample</module>
+ <!--<module>cocoon-chaperon/cocoon-chaperon-impl</module>
+ <module>cocoon-chaperon/cocoon-chaperon-sample</module>-->
<module>cocoon-cron/cocoon-cron-impl</module>
<module>cocoon-cron/cocoon-cron-sample</module>
<module>cocoon-databases/cocoon-databases-impl</module>
@@ -147,8 +147,8 @@
<module>cocoon-databases/cocoon-databases-odbc-client</module>
<module>cocoon-databases/cocoon-databases-oracle-client</module>
<module>cocoon-databases/cocoon-databases-postgresql-client</module>
- <module>cocoon-deli/cocoon-deli-impl</module>
- <module>cocoon-deli/cocoon-deli-sample</module>
+ <!--<module>cocoon-deli/cocoon-deli-impl</module>
+ <module>cocoon-deli/cocoon-deli-sample</module>-->
<module>cocoon-eventcache/cocoon-eventcache-impl</module>
<module>cocoon-eventcache/cocoon-eventcache-sample</module>
<module>cocoon-faces/cocoon-faces-impl</module>
@@ -167,8 +167,8 @@
<!--<module>cocoon-javaflow/cocoon-javaflow-impl</module>
<module>cocoon-javaflow/cocoon-javaflow-sample</module>-->
<module>cocoon-jcr</module>
- <module>cocoon-jfor/cocoon-jfor-impl</module>
- <module>cocoon-jfor/cocoon-jfor-sample</module>
+ <!--<module>cocoon-jfor/cocoon-jfor-impl</module>
+ <module>cocoon-jfor/cocoon-jfor-sample</module>-->
<module>cocoon-jms/cocoon-jms-impl</module>
<!--module>cocoon-jms/cocoon-jms-sample</module-->
<module>cocoon-jsp/cocoon-jsp-impl</module>
@@ -203,7 +203,6 @@
<module>cocoon-repository/cocoon-repository-impl</module>
<module>cocoon-scratchpad/cocoon-scratchpad-impl</module>
<module>cocoon-scratchpad/cocoon-scratchpad-sample</module>
- <module>cocoon-serializers/cocoon-serializers-charsets</module>
<module>cocoon-serializers/cocoon-serializers-impl</module>
<module>cocoon-session-fw/cocoon-session-fw-impl</module>
<module>cocoon-session-fw/cocoon-session-fw-sample</module>
@@ -220,8 +219,8 @@
<module>cocoon-velocity</module>
<module>cocoon-web3</module>
<module>cocoon-webdav</module>
- <module>cocoon-xmldb/cocoon-xmldb-impl</module>
- <module>cocoon-xmldb/cocoon-xmldb-sample</module>
+ <!--<module>cocoon-xmldb/cocoon-xmldb-impl</module>-->
+ <!--<module>cocoon-xmldb/cocoon-xmldb-sample</module>-->
<module>cocoon-xsp/cocoon-xsp-impl</module>
<module>cocoon-xsp/cocoon-xsp-sample</module>
</modules>
diff --git a/core/cocoon-webapp/pom.xml b/core/cocoon-webapp/pom.xml
index 866f914..3ca1dad 100644
--- a/core/cocoon-webapp/pom.xml
+++ b/core/cocoon-webapp/pom.xml
@@ -230,10 +230,10 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-captcha-sample</artifactId>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-chaperon-sample</artifactId>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-cron-sample</artifactId>
@@ -242,10 +242,10 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-databases-sample</artifactId>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deli-sample</artifactId>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-eventcache-sample</artifactId>
@@ -294,10 +294,10 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-jcr-sample</artifactId>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-jfor-sample</artifactId>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-jsp-sample</artifactId>
@@ -404,10 +404,10 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-webdav-sample</artifactId>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-xmldb-sample</artifactId>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-xsp-sample</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 485d97f..3861119 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1841,12 +1841,12 @@
<dependency>
<groupId>myfaces</groupId>
<artifactId>myfaces-api</artifactId>
- <version>r233484</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>myfaces</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>r233484</version>
+ <version>1.1.1</version>
</dependency>
<!-- TODO: Next two have same artifactId but different groupId ?? -->
<dependency>
