blob: ff2ef507ff1d408078581826c0c70c4214f70d1e [file] [log] [blame]
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james.hupa</groupId>
<artifactId>hupa-parent</artifactId>
<<<<<<< HEAD
<version>0.0.3-SNAPSHOT</version>
=======
=======
>>>>>>> first commit
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<<<<<<< HEAD
=======
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
>>>>>>> constantly changed by manolo
=======
>>>>>>> first commit
=======
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
>>>>>>> constantly changed by manolo
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hupa</groupId>
<artifactId>hupa-parent</artifactId>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<version>0.0.2-SNAPSHOT</version>
>>>>>>> first commit
=======
<version>0.0.3-SNAPSHOT</version>
>>>>>>> constantly changed by manolo
=======
<version>0.0.2-SNAPSHOT</version>
>>>>>>> first commit
=======
<version>0.0.3-SNAPSHOT</version>
>>>>>>> constantly changed by manolo
=======
<version>0.0.5-SNAPSHOT</version>
>>>>>>> Set snapshot version higger than the current hupa in svn repo
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hupa-mock</artifactId>
<packaging>jar</packaging>
<name>Apache James Hupa Mock</name>
<description>Mock objects for hupa</description>
<dependencies>
<dependency>
<<<<<<< HEAD
<<<<<<< HEAD
<groupId>${project.groupId}</groupId>
=======
<groupId>org.apache.hupa</groupId>
>>>>>>> first commit
=======
<groupId>org.apache.hupa</groupId>
>>>>>>> first commit
<artifactId>hupa-shared</artifactId>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<exclusions>
<exclusion>
<groupId>logkit</groupId>
<artifactId>logkit</artifactId>
</exclusion>
<exclusion>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
<dependency>
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> first commit
<groupId>net.customware.gwt.dispatch
</groupId>
<artifactId>gwt-dispatch</artifactId>
</dependency>
<dependency>
<<<<<<< HEAD
>>>>>>> first commit
=======
>>>>>>> first commit
=======
>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
<groupId>com.googlecode.gwtupload</groupId>
<artifactId>gwtupload</artifactId>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice-assistedinject</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice-servlet</artifactId>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>