You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by il...@apache.org on 2012/04/19 17:12:18 UTC
svn commit: r1327983 - in /cocoon: subprojects/cocoon-spring-configurator/
subprojects/cocoon-spring-configurator/branches/
subprojects/cocoon-spring-configurator/tags/
subprojects/cocoon-spring-configurator/trunk/ trunk/subprojects/
trunk/subprojects/...
Author: ilgrosso
Date: Thu Apr 19 15:12:18 2012
New Revision: 1327983
URL: http://svn.apache.org/viewvc?rev=1327983&view=rev
Log:
Moving cocoon-spring-configurator to /subprojects
Added:
cocoon/subprojects/cocoon-spring-configurator/
cocoon/subprojects/cocoon-spring-configurator/branches/
cocoon/subprojects/cocoon-spring-configurator/tags/
cocoon/subprojects/cocoon-spring-configurator/trunk/
- copied from r1327965, cocoon/trunk/subprojects/cocoon-configuration/cocoon-spring-configurator/
Removed:
cocoon/trunk/subprojects/cocoon-configuration/
Modified:
cocoon/subprojects/cocoon-spring-configurator/trunk/pom.xml
cocoon/trunk/subprojects/pom.xml
Modified: cocoon/subprojects/cocoon-spring-configurator/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/pom.xml?rev=1327983&r1=1327965&r2=1327983&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/pom.xml (original)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/pom.xml Thu Apr 19 15:12:18 2012
@@ -26,11 +26,11 @@
<parent>
<artifactId>cocoon</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>6-SNAPSHOT</version>
- <relativePath>../../../parent</relativePath>
+ <version>9-SNAPSHOT</version>
+ <relativePath/>
</parent>
<artifactId>cocoon-spring-configurator</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
<name>Cocoon Spring Configurator</name>
<description>
The Cocoon Spring Configurator is an extension for the Spring framework.
@@ -38,6 +38,12 @@
The feature list includes automatic property handling and inclusion of configuration files.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-spring-configurator/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-spring-configurator/trunk</developerConnection>
+ <url>http://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-spring-configurator/trunk</url>
+ </scm>
+
<distributionManagement>
<site>
<id>website</id>
@@ -52,14 +58,6 @@
</properties>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/cocoon/tags/cocoon-configuration/${project.artifactId}</tagBase>
- </configuration>
- </plugin>
- </plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
@@ -95,7 +93,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-configuration-api</artifactId>
- <version>1.0.2</version>
+ <version>1.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -147,29 +145,4 @@
</dependency>
</dependencies>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/</developerConnection>
- <url>http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/</url>
- </scm>
-
- <profiles>
- <profile>
- <id>daisy</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.daisycms</groupId>
- <artifactId>daisy-maven-plugin</artifactId>
- <configuration>
- <navDocId>1305</navDocId>
- <collection>cdocs-spring-configurator</collection>
- <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
Modified: cocoon/trunk/subprojects/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/subprojects/pom.xml?rev=1327983&r1=1327982&r2=1327983&view=diff
==============================================================================
--- cocoon/trunk/subprojects/pom.xml (original)
+++ cocoon/trunk/subprojects/pom.xml Thu Apr 19 15:12:18 2012
@@ -36,8 +36,6 @@
<modules>
<module>cocoon-jnet</module>
<module>cocoon-block-deployment</module>
- <module>cocoon-configuration/cocoon-configuration-api</module>
- <module>cocoon-configuration/cocoon-spring-configurator</module>
<module>cocoon-servlet-service/cocoon-servlet-service-impl</module>
<module>cocoon-servlet-service/cocoon-servlet-service-impl-sample</module>
</modules>