pom updates

This commit is contained in:
Mark Fisher
2009-08-21 16:46:03 +00:00
parent f5208c8eb2
commit 3be8f7b46d
16 changed files with 116 additions and 321 deletions

View File

@@ -31,28 +31,5 @@
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<testResources>
<testResource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</testResource>
<testResource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
<testResource>
<directory>../org.springframework.integration/src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
</testResources>
</build>
</project>
</project>

View File

@@ -31,27 +31,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<testResources>
<testResource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</testResource>
<testResource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
<testResource>
<directory>../org.springframework.integration/src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
</testResources>
</build>
</project>
</project>

View File

@@ -61,27 +61,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<testResources>
<testResource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</testResource>
<testResource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
<testResource>
<directory>../org.springframework.integration/src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
</testResources>
</build>
</project>
</project>

View File

@@ -67,27 +67,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<testResources>
<testResource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</testResource>
<testResource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
<testResource>
<directory>../org.springframework.integration/src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
</testResources>
</build>
</project>
</project>

View File

@@ -55,27 +55,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<testResources>
<testResource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</testResource>
<testResource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
<testResource>
<directory>../org.springframework.integration/src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
</testResources>
</build>
</project>
</project>

View File

@@ -42,6 +42,12 @@
<version>${spring.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
@@ -55,27 +61,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<testResources>
<testResource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</testResource>
<testResource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
<testResource>
<directory>../org.springframework.integration/src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
</testResources>
</build>
</project>
</project>

View File

@@ -73,27 +73,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<testResources>
<testResource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</testResource>
<testResource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
<testResource>
<directory>../org.springframework.integration/src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
</testResources>
</build>
</project>
</project>

View File

@@ -49,27 +49,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<testResources>
<testResource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</testResource>
<testResource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
<testResource>
<directory>../org.springframework.integration/src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
</testResources>
</build>
</project>
</project>

View File

@@ -55,27 +55,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<testResources>
<testResource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</testResource>
<testResource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
<testResource>
<directory>../org.springframework.integration/src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
</testResources>
</build>
</project>
</project>

View File

@@ -37,27 +37,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<testResources>
<testResource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</testResource>
<testResource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
<testResource>
<directory>../org.springframework.integration/src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
</testResources>
</build>
</project>
</project>

View File

@@ -12,6 +12,23 @@
<relativePath>../spring-integration-parent</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
@@ -37,27 +54,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<testResources>
<testResource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</testResource>
<testResource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
<testResource>
<directory>../org.springframework.integration/src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
</testResources>
</build>
</project>
</project>

View File

@@ -37,9 +37,9 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.ws</groupId>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
<version>1.5.5</version>
<version>${spring.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -54,6 +54,13 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>${spring.version}</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
@@ -73,27 +80,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<testResources>
<testResource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</testResource>
<testResource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
<testResource>
<directory>../org.springframework.integration/src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
</testResources>
</build>
</project>
</project>

View File

@@ -82,29 +82,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<testResources>
<testResource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.xsl</include>
<include>**/*.xsd</include>
</includes>
</testResource>
<testResource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
<testResource>
<directory>../org.springframework.integration/src/main/java</directory>
<includes>
<include>**/*.xsd</include>
</includes>
</testResource>
</testResources>
</build>
</project>
</project>

View File

@@ -30,6 +30,20 @@
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.6.5</version>
<scope>test</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.6.5</version>
<scope>test</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
@@ -58,4 +72,4 @@
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>

27
pom.xml Normal file
View File

@@ -0,0 +1,27 @@
<?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.integration</groupId>
<artifactId>spring-integration</artifactId>
<name>Spring Integration</name>
<version>2.0.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>spring-integration-parent</module>
<module>org.springframework.integration</module>
<module>org.springframework.integration.adapter</module>
<module>org.springframework.integration.event</module>
<module>org.springframework.integration.file</module>
<module>org.springframework.integration.http</module>
<module>org.springframework.integration.httpinvoker</module>
<module>org.springframework.integration.jms</module>
<module>org.springframework.integration.mail</module>
<module>org.springframework.integration.rmi</module>
<module>org.springframework.integration.security</module>
<module>org.springframework.integration.stream</module>
<module>org.springframework.integration.ws</module>
<module>org.springframework.integration.xml</module>
<module>org.springframework.integration.test</module>
</modules>
</project>

View File

@@ -14,6 +14,7 @@
<org.eclipse.jdt.core.version>3.4.2.v_883_R34x</org.eclipse.jdt.core.version>
<junit.version>4.6</junit.version>
<spring.version>3.0.0.M4</spring.version>
<maven.test.failure.ignore>true</maven.test.failure.ignore>
</properties>
<profiles>
<profile>
@@ -66,23 +67,47 @@
</profile>
</profiles>
<build>
<resources>
<resource>
<directory>${project.basedir}/src/main/java
</directory>
<includes>
<include>**/*</include>
</includes>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
<resource>
<directory>${project.basedir}/src/main/resources
</directory>
<includes>
<include>**/*</include>
</includes>
</resource>
</resources>
<testResources>
<testResource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
<include>**/*</include>
</includes>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</testResource>
<testResource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xsd</include>
<include>**/*</include>
</includes>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>