organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fix Java travis tests.

Browse source
This commit is contained in:
Feng Xiao 2015-12-21 03:25:59 -08:00
parent d217808417
commit af81dcfc2c
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/pom.xml
View file

@ -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>

6
java/util/pom.xml
View file

@ -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>

4
travis.sh
View file

@ -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 ..
}