You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2008/08/06 22:32:00 UTC
svn commit: r683396 - /cocoon/whiteboard/corona/trunk/parent/pom.xml
Author: reinhard
Date: Wed Aug 6 13:31:59 2008
New Revision: 683396
URL: http://svn.apache.org/viewvc?rev=683396&view=rev
Log:
. use (yet still unreleased) Cocoon subprojects
. upgrade to Spring 2.5.5
. add plugins and settings for release
. add versions of corona-stringtemplate & corona-rest
Modified:
cocoon/whiteboard/corona/trunk/parent/pom.xml
Modified: cocoon/whiteboard/corona/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/parent/pom.xml?rev=683396&r1=683395&r2=683396&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/parent/pom.xml (original)
+++ cocoon/whiteboard/corona/trunk/parent/pom.xml Wed Aug 6 13:31:59 2008
@@ -36,54 +36,54 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-servlet-service-impl</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-spring-configurator</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-block-deployment</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-jnet</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<!-- Spring (+ AOP support)-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.5.1</version>
+ <version>2.5.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.5.1</version>
+ <version>2.5.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>2.5.1</version>
+ <version>2.5.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-dao</artifactId>
- <version>2.5.1</version>
+ <version>2.5.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>2.5.1</version>
+ <version>2.5.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>2.5.1</version>
+ <version>2.5.5</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
@@ -103,6 +103,11 @@
<version>2.3</version>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
@@ -123,6 +128,11 @@
<version>1.3.02</version>
</dependency>
<dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>stringtemplate</artifactId>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
@@ -141,6 +151,11 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon.corona</groupId>
+ <artifactId>corona-rest</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.corona</groupId>
<artifactId>corona-servlet</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
@@ -154,6 +169,11 @@
<artifactId>corona-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.corona</groupId>
+ <artifactId>corona-stringtemplate</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
<!-- Test dependencies -->
<dependency>
@@ -213,12 +233,19 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-5</version>
+ <configuration>
+ <tagBase>https://svn.apache.org/repos/asf/cocoon/tags/cocoon-3.0/${project.artifactId}</tagBase>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
- </plugin>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -230,11 +257,11 @@
<plugin>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-maven-plugin</artifactId>
- <version>1.0.0-M2</version>
+ <version>1.0.0-M3</version>
</plugin>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
@@ -276,5 +303,73 @@
</plugins>
</pluginManagement>
</build>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/whiteboard/corona/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/whiteboard/corona/trunk</developerConnection>
+ <url>http://svn.apache.org/repos/asf/cocoon/whiteboard/corona/trunk</url>
+ </scm>
+
+ <distributionManagement>
+ <repository>
+ <id>cocoon-staging-repo</id>
+ <name>staging release repository</name>
+ <!-- available via http: http://people.apache.org/builds/cocoon -->
+ <url>scpexe://people.apache.org/www/people.apache.org/builds/cocoon</url>
+ </repository>
+ </distributionManagement>
-</project>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>true</doCheck>
+ <doUpdate>true</doUpdate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-Build>${buildNumber}</Implementation-Build>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file