f480333d31
Branch in question is 'env' branch from git://git.springsource.org/sandbox/cbeams.git; merged into
git-svn repository with:
git merge -s recursive -Xtheirs --no-commit env
No merge conflicts, but did need to
git rm spring-build
prior to committing.
With this change, Spring 3.1.0 development is now happening on SVN
trunk. Further commits to the 3.0.x line will happen in an as-yet
uncreated SVN branch. 3.1.0 snapshots will be available
per the usual nightly CI build from trunk.
25 lines
893 B
XML
25 lines
893 B
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
|
<modelVersion>4.0.0</modelVersion>
|
|
<groupId>org.springframework</groupId>
|
|
<artifactId>spring-instrument-tomcat</artifactId>
|
|
<packaging>jar</packaging>
|
|
<version>3.1.0.BUILD-SNAPSHOT</version>
|
|
<parent>
|
|
<groupId>org.springframework</groupId>
|
|
<artifactId>spring-parent</artifactId>
|
|
<relativePath>../org.springframework.spring-parent</relativePath>
|
|
<version>3.1.0.BUILD-SNAPSHOT</version>
|
|
</parent>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>org.apache.tomcat</groupId>
|
|
<artifactId>catalina</artifactId>
|
|
<version>6.0.16</version>
|
|
<scope>provided</scope>
|
|
</dependency>
|
|
</dependencies>
|
|
|
|
</project>
|