aboutsummaryrefslogtreecommitdiff
path: root/java/pom.xml
diff options
context:
space:
mode:
authorJos Hickson <jos.hickson@gmail.com>2016-05-11 09:23:46 +0100
committerJos Hickson <jos.hickson@gmail.com>2016-05-11 09:23:46 +0100
commit2b22b611a8af9e9d06491de2ebcc5d9b962e544c (patch)
tree1d8b5a7399380da5fb3260e2f8eaa2b8cf31bec2 /java/pom.xml
parent48ebb29a8ec118bf6b9ee39f6be42b57321c099a (diff)
parenta1938b2aa9ca86ce7ce50c27ff9737c1008d2a03 (diff)
downloadprotobuf-2b22b611a8af9e9d06491de2ebcc5d9b962e544c.tar.gz
protobuf-2b22b611a8af9e9d06491de2ebcc5d9b962e544c.tar.bz2
protobuf-2b22b611a8af9e9d06491de2ebcc5d9b962e544c.zip
Merge remote-tracking branch 'refs/remotes/google/master'
Diffstat (limited to 'java/pom.xml')
-rw-r--r--java/pom.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/java/pom.xml b/java/pom.xml
index d5719edf..e8dc5ded 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -33,6 +33,8 @@
<test.proto.dir>src/test/proto</test.proto.dir>
<generated.sources.dir>${project.build.directory}/generated-sources</generated.sources.dir>
<generated.testsources.dir>${project.build.directory}/generated-test-sources</generated.testsources.dir>
+ <generated.sources.lite.dir>${project.build.directory}/generated-sources-lite</generated.sources.lite.dir>
+ <generated.testsources.lite.dir>${project.build.directory}/generated-test-sources-lite</generated.testsources.lite.dir>
</properties>
<licenses>
@@ -64,7 +66,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>