diff -Nru logback-0.9.29/logback-classic/pom.xml logback-0.9.29-gil/logback-classic/pom.xml --- logback-0.9.29/logback-classic/pom.xml 2011-06-09 23:51:00.000000000 +0200 +++ logback-0.9.29-gil/logback-classic/pom.xml 2011-08-04 03:22:02.176073643 +0200 @@ -86,12 +86,6 @@ </dependency> <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> <version>5.1.9</version> @@ -114,26 +108,11 @@ <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> + <artifactId>groovy</artifactId> <scope>compile</scope> <optional>true</optional> </dependency> - - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>integration</artifactId> - <version>${slf4j.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> @@ -148,25 +127,6 @@ <optional>true</optional> </dependency> - <dependency> - <groupId>com.icegreen</groupId> - <artifactId>greenmail</artifactId> - <version>1.3</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.subethamail</groupId> - <artifactId>subethasmtp</artifactId> - <version>2.1.0</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>joda-time</groupId> @@ -212,21 +172,6 @@ </plugin> <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>generateStubs</goal> - <goal>compile</goal> - <goal>generateTestStubs</goal> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.scala-tools</groupId> <artifactId>maven-scala-plugin</artifactId> <version>2.14.3</version> @@ -266,57 +211,6 @@ </executions> </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.4</version> - <dependencies> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-junit</artifactId> - <version>1.8.1</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - </dependency> - - </dependencies> - - <executions> - <execution> - <id>ant-osgi-test</id> - <phase>package</phase> - <configuration> - <tasks> - <property name="currentVersion" value="${version}" /> - <property name="slf4j.version" value="${slf4j.version}"/> - <property name="basedir" value="${basedir}"/> - <ant antfile="${basedir}/osgi-build.xml"/> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - <execution> - <id>ant-integration-test</id> - <phase>package</phase> - <configuration> - <tasks> - <property name="slf4j.version" value="${slf4j.version}"/> - <ant antfile="${basedir}/integration.xml"/> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> @@ -377,43 +271,4 @@ </plugins> </build> - <profiles> - - <profile> - <!-- Integration tests require the host-orion profile --> - <id>host-orion</id> - <dependencies> - <!-- locally installed artifact --> - <dependency> - <groupId>com.microsoft.sqlserver</groupId> - <artifactId>sqljdbc4</artifactId> - <version>2.0</version> - <scope>test</scope> - </dependency> - <!-- locally installed artifact --> - <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc14</artifactId> - <version>10.2.0.1</version> - <scope>test</scope> - </dependency> - </dependencies> - - </profile> - - <profile> - <!-- Integration tests require the host-hora profile --> - <id>host-hora</id> - <dependencies> - <!-- locally installed artifact --> - <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc14</artifactId> - <version>10.2.0.1</version> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - </profiles> - </project> diff -Nru logback-0.9.29/logback-core/pom.xml logback-0.9.29-gil/logback-core/pom.xml --- logback-0.9.29/logback-core/pom.xml 2011-06-09 23:51:00.000000000 +0200 +++ logback-0.9.29-gil/logback-core/pom.xml 2011-08-04 02:18:22.176337023 +0200 @@ -46,7 +46,7 @@ <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> + <artifactId>groovy</artifactId> <scope>compile</scope> <optional>true</optional> </dependency> diff -Nru logback-0.9.29/pom.xml logback-0.9.29-gil/pom.xml --- logback-0.9.29/pom.xml 2011-06-09 23:51:00.000000000 +0200 +++ logback-0.9.29-gil/pom.xml 2011-08-04 02:45:20.950225410 +0200 @@ -22,9 +22,6 @@ <modules> <module>logback-core</module> <module>logback-classic</module> - <module>logback-access</module> - <module>logback-site</module> - <module>logback-examples</module> </modules> <properties> @@ -46,12 +43,6 @@ <version>${junit.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.easytesting</groupId> - <artifactId>fest-assert</artifactId> - <version>1.2</version> - <scope>test</scope> - </dependency> </dependencies> @@ -66,23 +57,11 @@ <dependency> <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-access</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> @@ -94,7 +73,7 @@ </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> + <artifactId>groovy</artifactId> <version>${groovy.version}</version> </dependency> <dependency> @@ -118,11 +97,6 @@ <version>1.2.132</version> </dependency> <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.4-701.jdbc4</version> - </dependency> - <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> <version>5.1.9</version> @@ -140,16 +114,6 @@ <version>6.1.1</version> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>7.0.1.v20091125</version> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api-2.5</artifactId> - <version>6.1.1</version> - </dependency> - <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> <version>1.0</version> @@ -219,36 +183,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> - <configuration> - <downloadSources>true</downloadSources> - <downloadJavadocs>true</downloadJavadocs> - <projectnatures> - <projectnature>org.scala-ide.sdt.core.scalanature</projectnature> - <projectnature>org.eclipse.jdt.core.javanature</projectnature> - </projectnatures> - <buildcommands> - <buildcommand>org.scala-ide.sdt.core.scalabuilder</buildcommand> - </buildcommands> -<!-- <classpathContainers> - <classpathContainer>org.scala-ide.sdt.launching.SCALA_CONTAINER</classpathContainer> - <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER - </classpathContainer> - </classpathContainers> - --> -<!-- <excludes> - <exclude>org.scala-lang:scala-library</exclude> - <exclude>org.scala-lang:scala-compiler</exclude> - </excludes> - --> - <sourceIncludes> - <sourceInclude>**/*.scala</sourceInclude> - <sourceInclude>**/*.java</sourceInclude> - </sourceIncludes> - </configuration> - </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId>