Skip to content

Commit

Permalink
fixed some versions in dependency management, bumped guava version to 14
Browse files Browse the repository at this point in the history
  • Loading branch information
@fasseg
fasseg committed Apr 18, 2013
1 parent d49a167 commit 01dfdf0
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 54 deletions.
10 changes: 1 addition & 9 deletions fcrepo-webapp/pom.xml
View file
Expand Up @@ -59,14 +59,10 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-spring</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-web-jcr-rest</artifactId>
Expand All @@ -83,10 +79,6 @@
<artifactId>junit</artifactId>
</dependency>

<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-spring</artifactId>
</dependency>
<!-- test gear -->
<dependency>
<groupId>org.springframework</groupId>
Expand Down
75 changes: 30 additions & 45 deletions pom.xml
View file
Expand Up @@ -25,18 +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>
<infinispan.version>5.2.1.Final</infinispan.version>
<jgroups.version>3.2.6.Final</jgroups.version>
<modeshape.version>3.2-SNAPSHOT</modeshape.version>
<slf4j.version>1.7.2</slf4j.version>
<spring.version>3.2.0.RELEASE</spring.version>
<jersey.version>1.17.1</jersey.version>
<powermock.version>1.5</powermock.version>


<!-- https://github.com/github/maven-plugins/blob/master/README.md -->
<github.global.server>github</github.global.server>

<powermock.version>1.5</powermock.version>
</properties>

<modules>
Expand All @@ -56,11 +55,10 @@

<dependencyManagement>
<dependencies>
<!-- Import the ModeShape BOM for embedded usage. This adds to the
"dependenciesManagement" section defaults for all of the modules we might
need, but we still have to include in the "dependencies" section the modules
we DO need. The benefit is that we don't have to specify the versions of
any of those modules. -->
<!-- Import the ModeShape BOM for embedded usage. This adds to the "dependenciesManagement"
section defaults for all of the modules we might need, but we still have to include
in the "dependencies" section the modules we DO need. The benefit is that we don't
have to specify the versions of any of those modules. -->
<dependency>
<groupId>org.modeshape.bom</groupId>
<artifactId>modeshape-bom-embedded</artifactId>
Expand Down Expand Up @@ -165,6 +163,21 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4.4</version>
</dependency>
<dependency>
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-servlet-webserver</artifactId>
<version>1.9.57</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-grizzly</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
Expand All @@ -176,6 +189,7 @@
<version>${jersey.version}</version>
</dependency>


<!-- test gear -->
<dependency>
<groupId>junit</groupId>
Expand All @@ -187,9 +201,8 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.2.3</version>
<!-- commented out since fcrepo-webhooks uses httpclient at compile
time -->
<!-- <scope>test</scope> -->
<!-- commented out since fcrepo-webhooks uses httpclient at compile time -->
<!-- <scope>test</scope> -->
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Expand Down Expand Up @@ -225,35 +238,10 @@
<artifactId>powermock-api-mockito</artifactId>
<version>${powermock.version}</version>
</dependency>
<dependency>
<groupId>com.sun.grizzly</groupId>
<artifactId>grizzly-servlet-webserver</artifactId>
<version>1.9.57</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-grizzly</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-spring</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>
Expand All @@ -266,10 +254,8 @@
<artifactId>site-maven-plugin</artifactId>
<version>0.7</version>
<configuration>
<message>Creating site for ${project.artifactId},
${project.version}</message>
<!-- this does the trick to place every module in the correct
subfolder -->
<message>Creating site for ${project.artifactId}, ${project.version}</message>
<!-- this does the trick to place every module in the correct subfolder -->
<path>${project.distributionManagement.site.url}</path>
<merge>true</merge>
</configuration>
Expand Down Expand Up @@ -397,8 +383,8 @@
</configuration>
<dependencies>
<dependency>
<!-- allows markdown syntax for site generation. To use it
place files below src/site/markdown/[filename].md -->
<!-- allows markdown syntax for site generation. To use it place files
below src/site/markdown/[filename].md -->
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-markdown</artifactId>
<version>1.3</version>
Expand All @@ -425,8 +411,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<!-- reserve a port under the property ${test.port} for integration
tests -->
<!-- reserve a port under the property ${test.port} for integration tests -->
<configuration>
<portNames>
<portName>test.port</portName>
Expand Down

0 comments on commit 01dfdf0

Please sign in to comment.