Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
af81dcfc
Commit
af81dcfc
authored
Dec 21, 2015
by
Feng Xiao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Java travis tests.
parent
d2178084
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
pom.xml
java/pom.xml
+2
-2
pom.xml
java/util/pom.xml
+3
-3
travis.sh
travis.sh
+3
-1
No files found.
java/pom.xml
View file @
af81dcfc
...
...
@@ -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>
...
...
java/util/pom.xml
View file @
af81dcfc
...
...
@@ -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>
...
...
travis.sh
View file @
af81dcfc
...
...
@@ -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
..
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment