Author: reinhard
Date: Wed Apr 16 06:56:13 2008
New Revision: 648698
URL: http://svn.apache.org/viewvc?rev=648698&view=rev
Log:
set version of several libraries; add the corona-controller module to the build; use the SNAPSHOT
versions of SSF and Spring Configurator
Modified:
cocoon/whiteboard/corona/trunk/parent/pom.xml
cocoon/whiteboard/corona/trunk/pom.xml
Modified: cocoon/whiteboard/corona/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/parent/pom.xml?rev=648698&r1=648697&r2=648698&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/parent/pom.xml (original)
+++ cocoon/whiteboard/corona/trunk/parent/pom.xml Wed Apr 16 06:56:13 2008
@@ -32,36 +32,19 @@
<dependencyManagement>
<dependencies>
+ <!-- Cocoon subprojects -->
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-servlet-service-impl</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-spring-configurator</artifactId>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.3.02</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <version>1.0.3-SNAPSHOT</version>
</dependency>
+
+ <!-- Spring (+ AOP support)-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
@@ -92,7 +75,6 @@
<artifactId>spring-web</artifactId>
<version>2.5.1</version>
</dependency>
-
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
@@ -102,6 +84,28 @@
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.5.4</version>
+ </dependency>
+
+ <!-- Other libraries -->
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.02</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
</dependency>
<!-- Corona internal dependencies -->
Modified: cocoon/whiteboard/corona/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/pom.xml?rev=648698&r1=648697&r2=648698&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/pom.xml (original)
+++ cocoon/whiteboard/corona/trunk/pom.xml Wed Apr 16 06:56:13 2008
@@ -12,7 +12,7 @@
<modules>
<module>parent</module>
- <!-- core modules -->
+ <module>corona-controller</module>
<module>corona-core</module>
<module>corona-servlet</module>
<module>corona-sitemap</module>
@@ -28,6 +28,12 @@
</build>
<profiles>
+ <profile>
+ <id>samples</id>
+ <modules>
+ <module>corona-webapp-sample</module>
+ </modules>
+ </profile>
<profile>
<id>reports</id>
<reporting>
|