Skip to content

Commit

Permalink
Dependency cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Edwin Shin committed Jun 20, 2013
1 parent a2476be commit 0119330
Showing 1 changed file with 96 additions and 30 deletions.
126 changes: 96 additions & 30 deletions pom.xml
View file
Expand Up @@ -12,7 +12,7 @@
<description>fcrepo-kitchen-sink</description>
<properties>
<project_name>fcrepo-kitchen-sink</project_name>
<opencmis.version>0.7.0</opencmis.version>
<opencmis.version>0.9.0-beta-1</opencmis.version>

<!-- integration test properties -->
<test.context.path>/</test.context.path>
Expand All @@ -26,30 +26,37 @@
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-rss</artifactId>
<artifactId>fcrepo-webapp</artifactId>
<version>${project.version}</version>
<type>jar</type>
<classifier>classes</classifier>
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-metrics</artifactId>
<artifactId>fcrepo-rss</artifactId>
<version>${project.version}</version>
</dependency>

<!-- If legacy-api is removed, the exclusion on jaxb-api on
modeshape-web-cmis should be removed -->
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-legacy-api</artifactId>
<version>${project.version}</version>
<exclusions>
<!-- Dependency convergence: fcrepo-legacy-api (via velocity) depends on
commons-lang:2.4, but chemistry-opencmis-server-bindings brings 2.6 -->
<exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-webhooks</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-graphite</artifactId>
<version>${metrics.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
Expand All @@ -64,17 +71,18 @@
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-bagit-object-serialization</artifactId>
<version>${project.version}</version>
<exclusions>
<!-- Dependency convergence: fcrepo-jms depends on commons-net:3.1,
but bagit brings in 2.0 -->
<exclusion>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
Expand All @@ -96,20 +104,57 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<!-- Dependency convergence: modeshape-web-cmis depends on jaxb-api:2.1,
but jersey-json (in fcrepo-legacy-api) on 2.2.2 -->
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
<!-- Dependency convergence: modeshape-web-cmis depends on mimepull:1.3,
but jersey-multipart brings in 1.6 -->
<exclusion>
<groupId>org.jvnet</groupId>
<artifactId>mimepull</artifactId>
</exclusion>
<!-- Dependency convergence: modeshape-web-cmis depends on both
javax.xml.stream:stax-api:1.0 and javax.xml.stream:stax-api:1.0-2.
fcrepo-legacy-api already brings in stax-api:1.0-2, so just excluding
stax-api altogether here-->
<exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<!-- Dependency convergence -->
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
<!-- Dependency convergence: modeshape-web-cmis depends on
jaxb-impl:2.1.11, but fcrepo-legacy-api (via jersey-json) brings
jaxb-impl:2.2.3-1 -->
<exclusion>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- streambuffer-0.9 is a transitive dependency of modeshape-web-cmis
that itself depends on stax-ex-RELEASE (which isn't even available in
Maven Central). This conflicts with another version of streambuffer that is
also pulled in via modeshape-web-cmis -->
<dependency>
<groupId>org.apache.chemistry.opencmis</groupId>
<artifactId>chemistry-opencmis-server-jcr</artifactId>
<version>${opencmis.version}</version>
<classifier>classes</classifier>
<groupId>com.sun.xml.stream.buffer</groupId>
<artifactId>streambuffer</artifactId>
<version>0.9</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.chemistry.opencmis</groupId>
<artifactId>chemistry-opencmis-server-bindings</artifactId>
Expand All @@ -122,19 +167,20 @@
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.chemistry.opencmis</groupId>
<artifactId>chemistry-opencmis-client-impl</artifactId>
<artifactId>chemistry-opencmis-server-bindings</artifactId>
<version>${opencmis.version}</version>
<scope>test</scope>
<type>war</type>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-sequencer-images</artifactId>
Expand All @@ -149,20 +195,27 @@

<!-- Test dependencies -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<groupId>org.apache.chemistry.opencmis</groupId>
<artifactId>chemistry-opencmis-client-impl</artifactId>
<version>${opencmis.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.fcrepo.fixity</groupId>
<artifactId>fcrepo-fixity-corrupter</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-http-commons</artifactId>
Expand All @@ -177,12 +230,22 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>

<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand All @@ -192,6 +255,9 @@
<overlay>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-webapp</artifactId>
<excludes>
<exclude>WEB-INF/lib/*.jar</exclude>
</excludes>
</overlay>
</overlays>
</configuration>
Expand Down

0 comments on commit 0119330

Please sign in to comment.