summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@tavianator.com>2015-05-08 20:14:09 -0400
committerTavian Barnes <tavianator@tavianator.com>2015-05-08 20:14:09 -0400
commite6abcbca2da316f1d0c40a08313e477ad7cd399a (patch)
treefddd2782e7d46bb49cc70e08db4826ccb3577ec7
parentd08927582d2c36e3da20488df8f262ca03f26c81 (diff)
parente3bbf81d310e2cb98a9be405d6adfa34624ddc9c (diff)
downloadsangria-e6abcbca2da316f1d0c40a08313e477ad7cd399a.tar.xz
Merge branch 'update-dependencies'
-rw-r--r--pom.xml30
-rw-r--r--sangria-log4j/pom.xml4
-rw-r--r--sangria-slf4j/pom.xml4
3 files changed, 19 insertions, 19 deletions
diff --git a/pom.xml b/pom.xml
index 7c971dd..2435993 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,7 +113,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
+ <version>4.12</version>
</dependency>
<dependency>
@@ -125,7 +125,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.8</version>
+ <version>1.10.19</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -136,13 +136,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.6</version>
+ <version>2.6.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
+ <version>3.3</version>
</plugin>
<plugin>
@@ -154,13 +154,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.3.1</version>
+ <version>1.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
</plugin>
<plugin>
@@ -172,19 +172,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.1</version>
+ <version>2.10.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.5</version>
+ <version>2.5.2</version>
</plugin>
<plugin>
@@ -202,13 +202,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
+ <version>2.18.1</version>
</plugin>
<plugin>
@@ -257,9 +257,9 @@
<link>http://slf4j.org/api/</link>
<link>http://logging.apache.org/log4j/2.x/log4j-api/apidocs/</link>
<link>http://jsr-305.googlecode.com/svn/trunk/javadoc/</link>
- <link>http://junit.org/javadoc/4.11/</link>
+ <link>http://junit.org/javadoc/latest/</link>
<link>http://hamcrest.org/JavaHamcrest/javadoc/1.3/</link>
- <link>http://mockito.github.io/mockito/docs/1.10.8/</link>
+ <link>http://mockito.github.io/mockito/docs/1.10.19/</link>
</links>
</configuration>
<executions>
@@ -326,9 +326,9 @@
<link>http://slf4j.org/api/</link>
<link>http://logging.apache.org/log4j/2.x/log4j-api/apidocs/</link>
<link>http://jsr-305.googlecode.com/svn/trunk/javadoc/</link>
- <link>http://junit.org/javadoc/4.11/</link>
+ <link>http://junit.org/javadoc/latest/</link>
<link>http://hamcrest.org/JavaHamcrest/javadoc/1.3/</link>
- <link>http://mockito.github.io/mockito/docs/1.10.8/</link>
+ <link>http://mockito.github.io/mockito/docs/1.10.19/</link>
</links>
</configuration>
<reportSets>
diff --git a/sangria-log4j/pom.xml b/sangria-log4j/pom.xml
index 2b9fe74..e8bfdd5 100644
--- a/sangria-log4j/pom.xml
+++ b/sangria-log4j/pom.xml
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
</dependency>
<dependency>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/sangria-slf4j/pom.xml b/sangria-slf4j/pom.xml
index 41d6647..bb563a1 100644
--- a/sangria-slf4j/pom.xml
+++ b/sangria-slf4j/pom.xml
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.7</version>
+ <version>1.7.12</version>
</dependency>
<dependency>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.7</version>
+ <version>1.7.12</version>
<scope>test</scope>
</dependency>
</dependencies>