Skip to content

Commit

Permalink
Dependency updates per versions-maven-plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
Edwin Shin committed Jun 18, 2013
1 parent 9a069c1 commit d0aaf0b
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 30 deletions.
8 changes: 0 additions & 8 deletions fcrepo-http-api/pom.xml
View file
Expand Up @@ -147,14 +147,6 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
<version>4.2.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

Expand Down
1 change: 0 additions & 1 deletion fcrepo-http-commons/pom.xml
View file
Expand Up @@ -116,7 +116,6 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.2.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
12 changes: 0 additions & 12 deletions fcrepo-kernel/pom.xml
View file
Expand Up @@ -53,18 +53,6 @@
<groupId>org.apache.jena</groupId>
<artifactId>apache-jena-libs</artifactId>
<type>pom</type>
<version>2.10.0</version>

<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Logging: we'll use LogBack (which implements the SLF4J API); ModeShape
Expand Down
1 change: 0 additions & 1 deletion fcrepo-metrics/pom.xml
View file
Expand Up @@ -42,7 +42,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
61 changes: 53 additions & 8 deletions pom.xml
View file
Expand Up @@ -25,15 +25,17 @@

<!-- Dependency version properties -->
<activemq.version>5.7.0</activemq.version>
<jersey.version>1.17.1</jersey.version>
<enunciate.version>1.26.2</enunciate.version>
<httpcomponents.version>4.2.5</httpcomponents.version>
<infinispan.version>5.3.0.CR1</infinispan.version>
<jersey.version>1.17.1</jersey.version>
<jgroups.version>3.3.1.Final</jgroups.version>
<metrics.version>3.0.0</metrics.version>
<modeshape.version>3.3.0.Final</modeshape.version>
<sesame.version>2.7.0</sesame.version>
<sesame.version>2.7.2</sesame.version>
<slf4j.version>1.7.5</slf4j.version>
<spring.version>3.2.0.RELEASE</spring.version>
<metrics.version>3.0.0</metrics.version>
<spring.version>3.2.3.RELEASE</spring.version>

<grizzly.version>2.2.21</grizzly.version>

<!-- https://github.com/github/maven-plugins/blob/master/README.md -->
Expand Down Expand Up @@ -86,6 +88,11 @@
<artifactId>jcr</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
Expand All @@ -96,6 +103,22 @@
<artifactId>guava</artifactId>
<version>14.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>apache-jena-libs</artifactId>
<version>2.10.0</version>
<type>pom</type>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
Expand Down Expand Up @@ -289,10 +312,15 @@
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.2.4</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.2.3</version>
<version>${httpcomponents.version}</version>
<!-- commented out since fcrepo-webhooks uses httpclient at compile time -->
<!-- <scope>test</scope> -->
<exclusions>
Expand All @@ -302,6 +330,18 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
<version>${httpcomponents.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down Expand Up @@ -496,7 +536,7 @@
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.2</version>
<version>2.3</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
Expand Down Expand Up @@ -526,6 +566,11 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.1</version>
</plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
Expand Down Expand Up @@ -600,7 +645,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.6.2.201302030002</version>
<version>0.6.3.201306030806</version>
<executions>
<execution>
<id>pre-unit-test</id>
Expand Down Expand Up @@ -731,7 +776,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.0</version>
<version>2.1</version>
<reportSets>
<reportSet>
<reports>
Expand Down

0 comments on commit d0aaf0b

Please sign in to comment.