Browse Source

Fix Java travis tests.

Feng Xiao 9 năm trước cách đây
mục cha
commit
af81dcfc2c
3 tập tin đã thay đổi với 8 bổ sung6 xóa
  1. 2 2
      java/pom.xml
  2. 3 3
      java/util/pom.xml
  3. 3 1
      travis.sh

+ 2 - 2
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>

+ 3 - 3
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>

+ 3 - 1
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 ..
 }