Skip to content

Commit

Permalink
Cleaning up dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@cbeer
cbeer committed Sep 24, 2014
1 parent 8c0f022 commit 46c1cb1
Show file tree
Hide file tree
Showing 18 changed files with 37 additions and 192 deletions.
10 changes: 5 additions & 5 deletions fcrepo-audit/pom.xml
View file
Expand Up @@ -17,9 +17,13 @@
<dependencies>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel-impl</artifactId>
<artifactId>fcrepo-kernel</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
Expand All @@ -28,10 +32,6 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down
18 changes: 0 additions & 18 deletions fcrepo-connector-file/pom.xml
View file
Expand Up @@ -21,29 +21,11 @@
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-http-commons</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-http-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>javax.inject</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion ...connector-file/src/test/java/org/fcrepo/connector/file/FedoraFileSystemConnectorTest.java
View file
Expand Up @@ -17,7 +17,6 @@

import static java.nio.file.Files.createTempDirectory;
import static java.nio.file.Files.createTempFile;
import static org.fcrepo.http.commons.test.util.TestHelpers.setField;
import static org.fcrepo.jcr.FedoraJcrTypes.CONTENT_DIGEST;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
Expand All @@ -35,6 +34,7 @@
import static org.modeshape.jcr.api.JcrConstants.NT_FILE;
import static org.modeshape.jcr.api.JcrConstants.NT_RESOURCE;
import static org.slf4j.LoggerFactory.getLogger;
import static org.springframework.test.util.ReflectionTestUtils.setField;

import java.io.File;
import java.io.FileOutputStream;
Expand Down Expand Up @@ -252,4 +252,5 @@ public void testStoreDocument() {
spy.storeDocument(spy.getDocumentById(id));
verify(spy).touchParent(id);
}

}
2 changes: 0 additions & 2 deletions fcrepo-connector-file/src/test/resources/spring-test/repo.xml
View file
Expand Up @@ -12,8 +12,6 @@

<context:component-scan base-package="org.fcrepo"/>

<bean class="org.fcrepo.http.commons.session.SessionFactory"/>

<bean name="modeshapeRepofactory"
class="org.fcrepo.kernel.impl.spring.ModeShapeRepositoryFactoryBean"
p:repositoryConfiguration="${fcrepo.modeshape.configuration:/config/testing/repository.json}"/>
Expand Down
22 changes: 0 additions & 22 deletions fcrepo-generator-dc/pom.xml
View file
Expand Up @@ -39,18 +39,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel-impl</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-leveldb</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
Expand Down Expand Up @@ -144,16 +132,6 @@
<scope>test</scope>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion fcrepo-generator-dc/src/test/java/org/fcrepo/generator/DublinCoreGeneratorTest.java
View file
Expand Up @@ -18,12 +18,12 @@
import static java.util.Arrays.asList;
import static org.fcrepo.http.commons.test.util.PathSegmentImpl.createPathList;
import static org.fcrepo.http.commons.test.util.TestHelpers.mockSession;
import static org.fcrepo.http.commons.test.util.TestHelpers.setField;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.MockitoAnnotations.initMocks;
import static org.springframework.test.util.ReflectionTestUtils.setField;

import java.io.InputStream;
import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion fcrepo-generator-dc/src/test/resources/spring-test/repo.xml
View file
Expand Up @@ -23,7 +23,7 @@

<bean name="modeshapeRepofactory"
class="org.fcrepo.kernel.impl.spring.ModeShapeRepositoryFactoryBean"
p:repositoryConfiguration="${fcrepo.modeshape.configuration:/config/minimal-default/repository.json}"/>
p:repositoryConfiguration="${fcrepo.modeshape.configuration:/config/minimal/repository.json}"/>

<bean class="org.modeshape.jcr.ModeShapeEngine" init-method="start"/>

Expand Down
31 changes: 1 addition & 30 deletions fcrepo-http-api/pom.xml
View file
Expand Up @@ -96,8 +96,8 @@
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel-impl</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
Expand All @@ -118,11 +118,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -154,30 +149,6 @@
<version>1.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<scope>test</scope>
<version>${htmlunit.version}</version>

<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit-core-js</artifactId>
<scope>test</scope>
<version>${htmlunit.version}</version>
</dependency>
<!-- This dependency is for compile-time: it keeps this module independent
of any given choice of JAX-RS implementation. It must be _after_ the test
gear. Otherwise it will get loaded during test phase, but because this is
Expand Down
2 changes: 1 addition & 1 deletion fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraBatchTest.java
View file
Expand Up @@ -26,7 +26,6 @@
import static org.fcrepo.http.commons.test.util.TestHelpers.getUriInfoImpl;
import static org.fcrepo.http.commons.test.util.TestHelpers.mockDatastream;
import static org.fcrepo.http.commons.test.util.TestHelpers.mockSession;
import static org.fcrepo.http.commons.test.util.TestHelpers.setField;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
Expand All @@ -38,6 +37,7 @@
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.mock;
import static org.mockito.MockitoAnnotations.initMocks;
import static org.springframework.test.util.ReflectionTestUtils.setField;

import java.io.IOException;
import java.io.InputStream;
Expand Down
24 changes: 9 additions & 15 deletions fcrepo-http-commons/pom.xml
View file
Expand Up @@ -22,6 +22,15 @@
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-metrics</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
<dependency>
<groupId>org.gagravarr</groupId>
<artifactId>vorbis-java-tika</artifactId>
Expand Down Expand Up @@ -223,12 +232,6 @@
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
</exclusion>
<!-- modeshape-web-cmis brings in antlr:2.7.7, whereas
velocity-tools is bringing in 2.7.2 -->
<exclusion>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand All @@ -252,15 +255,6 @@
</exclusion>
</exclusions>
</dependency>

<!-- antlr-2.7.7 is explicitly added here because of a dependency convergence
issue between modeshape-web-cmis and velocity-tools. If/when the two get in
line, the exclusion on velocity-tools and this explicit dependency may be removed -->
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>2.7.7</version>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-jcr</artifactId>
Expand Down
29 changes: 5 additions & 24 deletions fcrepo-jms/pom.xml
View file
Expand Up @@ -11,28 +11,16 @@
<packaging>bundle</packaging>

<dependencies>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.7</version>
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel-impl</artifactId>
<artifactId>fcrepo-kernel</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-kernel-impl</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-http-commons</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
Expand All @@ -53,6 +41,10 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>

<dependency>
<groupId>org.apache.activemq</groupId>
Expand Down Expand Up @@ -86,17 +78,6 @@
<artifactId>gson</artifactId>
<version>2.3</version>
</dependency>
<!-- axiom-api is a dependency of abdera-parser. It is only explicitly declared
here because abdera-parser depends on an older version of jaxen (1.1.1) than axiom-api.
If/when abdera-parser catches up, we can remove this explicit dependency on axiom-api -->
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
</dependency>
<dependency>
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion fcrepo-jms/src/test/java/org/fcrepo/jms/observer/JMSTopicPublisherTest.java
View file
Expand Up @@ -16,13 +16,13 @@
package org.fcrepo.jms.observer;

import static javax.jms.Session.AUTO_ACKNOWLEDGE;
import static org.fcrepo.kernel.impl.utils.TestHelpers.setField;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.MockitoAnnotations.initMocks;
import static org.springframework.test.util.ReflectionTestUtils.setField;

import java.io.IOException;

Expand Down
4 changes: 0 additions & 4 deletions fcrepo-kernel/pom.xml
View file
Expand Up @@ -76,10 +76,6 @@
<groupId>org.modeshape</groupId>
<artifactId>modeshape-jcr-api</artifactId>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>

<dependency>
<groupId>javax</groupId>
Expand Down
19 changes: 0 additions & 19 deletions fcrepo-metrics/pom.xml
View file
Expand Up @@ -34,11 +34,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-servlets</artifactId>
Expand All @@ -59,25 +54,11 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down

0 comments on commit 46c1cb1

Please sign in to comment.