diff options
| author | Jisi Liu <liujisi@google.com> | 2016-04-01 17:22:58 -0700 |
|---|---|---|
| committer | Jisi Liu <liujisi@google.com> | 2016-04-01 17:22:58 -0700 |
| commit | aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5 (patch) | |
| tree | f7ce45e0922c46eecd01a36afb6d8ec5a71c8155 /java/pom.xml | |
| parent | 452e2b2c5c607ab5d63cd813793f1aa960f19d1c (diff) | |
| parent | 7630a83767dcee42d12bac68021f53aeb3d288f8 (diff) | |
| download | protobuf-aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5.tar.gz protobuf-aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5.tar.bz2 protobuf-aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5.zip | |
Merge pull request #1381 from pherl/internal-merge
Merge Google internal changes to an internal branch
Diffstat (limited to 'java/pom.xml')
| -rw-r--r-- | java/pom.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/pom.xml b/java/pom.xml index d5719edf..787bc534 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -64,7 +64,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.4</version> + <version>4.12</version> <scope>test</scope> </dependency> <dependency> |