Skip to content
Browse files

pom cleanup

  • Loading branch information...
1 parent c055133 commit d9ff4c60e8f3f61fa064d19b30f04fb7efac517b @barmintor barmintor committed
Showing with 40 additions and 14 deletions.
  1. +1 −0 .gitignore
  2. +0 −5 fcrepo-common/pom.xml
  3. +29 −5 fcrepo-server/pom.xml
  4. +10 −4 pom.xml
View
1 .gitignore
@@ -3,6 +3,7 @@ build
stubwrappers
activemq-data
derby.log
+fcrepo-server/bin
fcrepo-server/test
.classpath
.project
View
5 fcrepo-common/pom.xml
@@ -127,11 +127,6 @@
<dependencies>
- <dependency>
- <groupId>org.fcrepo</groupId>
- <artifactId>fcrepo-generate</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>commons-codec</groupId>
View
34 fcrepo-server/pom.xml
@@ -587,26 +587,51 @@
<dependency>
<groupId>org.akubraproject</groupId>
<artifactId>akubra-core</artifactId>
- <version>0.3</version>
+ <version>${akubra.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.akubraproject</groupId>
<artifactId>akubra-fs</artifactId>
- <version>0.3</version>
+ <version>${akubra.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.akubraproject</groupId>
<artifactId>akubra-map</artifactId>
- <version>0.3</version>
+ <version>${akubra.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.akubraproject</groupId>
<artifactId>akubra-mem</artifactId>
- <version>0.3</version>
+ <version>${akubra.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>GroboTestingJUnit-core</artifactId>
@@ -629,7 +654,6 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle</artifactId>
- <version>${cxf.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
View
14 pom.xml
@@ -123,10 +123,12 @@
<timestamp>${maven.build.timestamp}</timestamp>
<abdera.version>1.1.2</abdera.version>
<activemq.version>5.5.0</activemq.version>
+ <akubra.version>0.3</akubra.version>
<axiom.version>1.2.10</axiom.version>
<cxf.version>2.4.0</cxf.version>
<derby.version>10.7.1.1</derby.version>
<jersey.version>1.8</jersey.version>
+ <slf4j.version>1.5.11</slf4j.version>
<spring.version>3.0.5.RELEASE</spring.version>
<trippi.version>1.5.5</trippi.version>
</properties>
@@ -389,24 +391,24 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.11</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.11</version>
+ <version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.5.11</version>
+ <version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
- <version>1.5.11</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -500,6 +502,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>

0 comments on commit d9ff4c6

Please sign in to comment.
Something went wrong with that request. Please try again.