diff options
Diffstat (limited to 'java')
4 files changed, 19 insertions, 2 deletions
diff --git a/java/core/pom.xml b/java/core/pom.xml index 0c0fd8ff..9dbaff15 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -34,6 +34,11 @@ <artifactId>easymockclassextension</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> @@ -57,6 +62,15 @@ </includes> </resource> </resources> + <testResources> + <testResource> + <directory>${protobuf.source.dir}</directory> + <includes> + <include>google/protobuf/testdata/golden_message_oneof_implemented</include> + <include>google/protobuf/testdata/golden_packed_fields_message</include> + </includes> + </testResource> + </testResources> <plugins> <!-- Use Antrun plugin to generate sources with protoc --> diff --git a/java/core/src/test/proto/com/google/protobuf/map_lite_test.proto b/java/core/src/test/proto/com/google/protobuf/map_lite_test.proto index bc2105e5..c04f5d57 100644 --- a/java/core/src/test/proto/com/google/protobuf/map_lite_test.proto +++ b/java/core/src/test/proto/com/google/protobuf/map_lite_test.proto @@ -30,9 +30,10 @@ syntax = "proto3"; -package map_test; +package map_lite_test; -option java_package = "map_test"; +option optimize_for = LITE_RUNTIME; +option java_package = "map_lite_test"; option java_outer_classname = "MapTestProto"; message TestMap { diff --git a/java/core/src/test/proto/com/google/protobuf/nested_extension_lite.proto b/java/core/src/test/proto/com/google/protobuf/nested_extension_lite.proto index 6793d6b7..a95c38b2 100644 --- a/java/core/src/test/proto/com/google/protobuf/nested_extension_lite.proto +++ b/java/core/src/test/proto/com/google/protobuf/nested_extension_lite.proto @@ -38,6 +38,7 @@ syntax = "proto2"; package protobuf_unittest; +option optimize_for = LITE_RUNTIME; import "com/google/protobuf/non_nested_extension_lite.proto"; diff --git a/java/core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto b/java/core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto index e42faaa8..37c369ed 100644 --- a/java/core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto +++ b/java/core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto @@ -36,6 +36,7 @@ syntax = "proto2"; package protobuf_unittest; +option optimize_for = LITE_RUNTIME; message MessageLiteToBeExtended { extensions 1 to max; |