aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Feng Xiao <xfxyjwf@gmail.com>2015-12-21 03:25:59 -0800
committerGravatar Feng Xiao <xfxyjwf@gmail.com>2015-12-21 03:25:59 -0800
commitaf81dcfc2c23b9a931bee55544e32da30eb4874c (patch)
tree761cab5553356ea2b1617808da95ada68753ae4b
parentd21780841734326d8a7653710f4f23b5366c4447 (diff)
Fix Java travis tests.
-rw-r--r--java/pom.xml4
-rw-r--r--java/util/pom.xml6
-rwxr-xr-xtravis.sh4
3 files changed, 8 insertions, 6 deletions
diff --git a/java/pom.xml b/java/pom.xml
index aa5d30ea..3eab00ad 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -10,7 +10,7 @@
</parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>3.0.0-beta-1</version>
+ <version>3.0.0-beta-2</version>
<packaging>bundle</packaging>
<name>Protocol Buffer Java API</name>
<description>
@@ -167,7 +167,7 @@
<instructions>
<Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
<Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
- <Export-Package>com.google.protobuf;version=3.0.0-beta-1</Export-Package>
+ <Export-Package>com.google.protobuf;version=3.0.0-beta-2</Export-Package>
</instructions>
</configuration>
</plugin>
diff --git a/java/util/pom.xml b/java/util/pom.xml
index d2d08ec0..70401a4b 100644
--- a/java/util/pom.xml
+++ b/java/util/pom.xml
@@ -10,7 +10,7 @@
</parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
- <version>3.0.0-beta-1</version>
+ <version>3.0.0-beta-2</version>
<packaging>bundle</packaging>
<name>Protocol Buffer Java API</name>
<description>
@@ -36,7 +36,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>3.0.0-beta-1</version>
+ <version>3.0.0-beta-2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -123,7 +123,7 @@
<instructions>
<Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
<Bundle-SymbolicName>com.google.protobuf.util</Bundle-SymbolicName>
- <Export-Package>com.google.protobuf.util;version=3.0.0-beta-1</Export-Package>
+ <Export-Package>com.google.protobuf.util;version=3.0.0-beta-2</Export-Package>
</instructions>
</configuration>
</plugin>
diff --git a/travis.sh b/travis.sh
index 317bef4e..b9ff09b7 100755
--- a/travis.sh
+++ b/travis.sh
@@ -100,7 +100,9 @@ use_java() {
build_java() {
# Java build needs `protoc`.
internal_build_cpp
- cd java && mvn test && cd util && mvn test && mvn assembly:single && cd ../..
+ cd java && mvn test && mvn install
+ cd util && mvn test && mvn assembly:single
+ cd ../..
cd conformance && make test_java && cd ..
}