Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
updated maven dependencies
  • Loading branch information
Peter committed Feb 25, 2015
1 parent 5b403e3 commit 2dfe864
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 107 deletions.
5 changes: 2 additions & 3 deletions android/pom.xml
Expand Up @@ -84,13 +84,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-android</artifactId>
<version>1.7.7</version>
<version>1.7.10</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.7</version>
<version>1.7.10</version>
</dependency>

<!-- Make sure this is above (!) the android dependencies -->
Expand Down Expand Up @@ -124,7 +124,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<!-- <compilerArgument>-Xlint:unchecked</compilerArgument>
-->
Expand Down
33 changes: 3 additions & 30 deletions core/pom.xml
Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>2.6.0</version>
<version>2.6.1</version>
</dependency>
<dependency>
<groupId>org.openstreetmap.osmosis</groupId>
Expand All @@ -87,6 +87,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<!-- keep oldish version as we want to support 1.5 for a while -->
<version>20140107</version>
<scope>test</scope>
</dependency>
Expand All @@ -99,46 +100,18 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4.1</version>
<configuration>
<!-- for usage on android -->
<descriptors>
<descriptor>src/main/assembly/android.xml</descriptor>
</descriptors>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.4</version>
<configuration>
<reportPlugins>
<plugin>
<!-- either call mvn compile site or mvn findbugs:gui -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.5.2</version>
<configuration>
<!-- <xmlOutput>true</xmlOutput> -->
<!-- Optional directory to put FindBugs xdoc xml report -->
<xmlOutputDirectory>target/site</xmlOutputDirectory>
<threshold>Normal</threshold>
<effort>Default</effort>
<!--
<threshold>High|Normal|Low|Exp|Ignore</threshold>
<effort>Min|Default|Max</effort>
-->
</configuration>
</plugin>
</reportPlugins>
</configuration>
</plugin>
</plugin>

<!-- create jar with test classes to be reused in other projects -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<goals>
Expand Down
28 changes: 21 additions & 7 deletions pom.xml
Expand Up @@ -23,7 +23,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<slf4j.version>1.7.7</slf4j.version>
<slf4j.version>1.7.10</slf4j.version>
<log4j.version>1.2.17</log4j.version>

<!-- netbeans formatting rules -->
Expand Down Expand Up @@ -86,7 +86,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>3.2</version>
<configuration>
<!--
<compilerArgument>-Xlint:unchecked</compilerArgument>
Expand All @@ -104,7 +104,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
<version>2.18.1</version>
<configuration>
<argLine>-Xmx100m -Xms100m</argLine>
</configuration>
Expand All @@ -113,7 +113,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.17</version>
<version>2.18.1</version>
<executions>
<execution>
<goals>
Expand All @@ -132,21 +132,35 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10</version>
<version>2.10.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.3</version>
<version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.5</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
5 changes: 2 additions & 3 deletions tools/pom.xml
Expand Up @@ -41,15 +41,14 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.8.1</version>
<version>1.9</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4.1</version>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<archive>
<manifest>
Expand Down
70 changes: 6 additions & 64 deletions web/pom.xml
Expand Up @@ -28,8 +28,8 @@

<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20140107</version>
<artifactId>json</artifactId>
<version>20140107</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -94,34 +94,22 @@
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<!--
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.2.5</version>
<scope>test</scope>
</dependency>
-->

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
</plugin>
<!-- create a jar file too, so others can use it more easily -->
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<attachClasses>true</attachClasses>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4.1</version>
<configuration>
<archive>
<manifest>
Expand All @@ -144,52 +132,6 @@
</goals>
</execution>
</executions>

<!--
<executions>
<execution>
<id>build-jar</id>
<configuration>
<archive>
<manifest>
<mainClass>com.graphhopper.http.GHServer</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
<execution>
<id>build-zip</id>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/zip.xml</descriptor>
</descriptors>
</configuration>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
-->
<!-- <executions>
<execution>
<id>make-assembly</id> this is used for inheritance merges
<phase>package</phase> bind to the packaging phase
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>-->
</plugin>

</plugins>
Expand Down

0 comments on commit 2dfe864

Please sign in to comment.