diff options
Diffstat (limited to 'java/pom.xml')
| -rw-r--r-- | java/pom.xml | 70 |
1 files changed, 57 insertions, 13 deletions
diff --git a/java/pom.xml b/java/pom.xml index d263bec..f73e874 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -10,15 +10,15 @@ </parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>2.3.0</version> - <packaging>jar</packaging> + <version>2.6.1</version> + <packaging>bundle</packaging> <name>Protocol Buffer Java API</name> <description> Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. </description> <inceptionYear>2008</inceptionYear> - <url>http://code.google.com/p/protobuf</url> + <url>https://developers.google.com/protocol-buffers/</url> <licenses> <license> <name>New BSD license</name> @@ -27,9 +27,9 @@ </license> </licenses> <scm> - <url>http://code.google.com/p/protobuf/source/browse</url> + <url>https://github.com/google/protobuf</url> <connection> - scm:svn:http://protobuf.googlecode.com/svn/trunk/ + scm:git:https://github.com/google/protobuf.git </connection> </scm> <dependencies> @@ -96,23 +96,37 @@ <configuration> <tasks> <mkdir dir="target/generated-test-sources" /> - <!--mkdir dir="target/generated-test-sources/opt-space" /--> - <!--mkdir dir="target/generated-test-sources/opt-speed" /--> <exec executable="../src/protoc"> <arg value="--java_out=target/generated-test-sources" /> <arg value="--proto_path=../src" /> <arg value="--proto_path=src/test/java" /> <arg value="../src/google/protobuf/unittest.proto" /> <arg value="../src/google/protobuf/unittest_import.proto" /> + <arg value="../src/google/protobuf/unittest_import_public.proto" /> <arg value="../src/google/protobuf/unittest_mset.proto" /> + <arg value="src/test/java/com/google/protobuf/lazy_fields_lite.proto" /> + <arg value="src/test/java/com/google/protobuf/lite_equals_and_hash.proto" /> <arg value="src/test/java/com/google/protobuf/multiple_files_test.proto" /> + <arg value="src/test/java/com/google/protobuf/nested_builders_test.proto" /> + <arg value="src/test/java/com/google/protobuf/nested_extension.proto" /> + <arg value="src/test/java/com/google/protobuf/nested_extension_lite.proto" /> + <arg value="src/test/java/com/google/protobuf/non_nested_extension.proto" /> + <arg value="src/test/java/com/google/protobuf/non_nested_extension_lite.proto" /> + <arg value="src/test/java/com/google/protobuf/outer_class_name_test.proto" /> + <arg value="src/test/java/com/google/protobuf/outer_class_name_test2.proto" /> + <arg value="src/test/java/com/google/protobuf/outer_class_name_test3.proto" /> + <arg value="src/test/java/com/google/protobuf/test_bad_identifiers.proto" /> + <arg value="src/test/java/com/google/protobuf/test_check_utf8.proto" /> + <arg value="src/test/java/com/google/protobuf/test_check_utf8_size.proto" /> + <arg value="src/test/java/com/google/protobuf/test_custom_options.proto" /> <arg value="../src/google/protobuf/unittest_optimize_for.proto" /> <arg value="../src/google/protobuf/unittest_custom_options.proto" /> <arg value="../src/google/protobuf/unittest_lite.proto" /> <arg value="../src/google/protobuf/unittest_import_lite.proto" /> + <arg value="../src/google/protobuf/unittest_import_public_lite.proto" /> <arg value="../src/google/protobuf/unittest_lite_imports_nonlite.proto" /> <arg value="../src/google/protobuf/unittest_enormous_descriptor.proto" /> <arg value="../src/google/protobuf/unittest_no_generic_services.proto" /> @@ -152,19 +166,19 @@ <arg value="../src/google/protobuf/unittest_repeated_merge_nano.proto" /> </exec> <exec executable="../src/protoc"> - <arg value="--javanano_out=store_unknown_fields=true,generate_equals=true:target/generated-test-sources" /> + <arg value="--javanano_out=store_unknown_fields=true,generate_equals=true,generate_clone=true:target/generated-test-sources" /> <arg value="--proto_path=../src" /> <arg value="--proto_path=src/test/java" /> <arg value="../src/google/protobuf/unittest_extension_nano.proto" /> </exec> <exec executable="../src/protoc"> - <arg value="--javanano_out=store_unknown_fields=true,generate_equals=true:target/generated-test-sources" /> + <arg value="--javanano_out=store_unknown_fields=true,generate_equals=true,generate_clone=true:target/generated-test-sources" /> <arg value="--proto_path=../src" /> <arg value="--proto_path=src/test/java" /> <arg value="../src/google/protobuf/unittest_extension_singular_nano.proto" /> </exec> <exec executable="../src/protoc"> - <arg value="--javanano_out=store_unknown_fields=true,generate_equals=true:target/generated-test-sources" /> + <arg value="--javanano_out=store_unknown_fields=true,generate_equals=true,generate_clone=true:target/generated-test-sources" /> <arg value="--proto_path=../src" /> <arg value="--proto_path=src/test/java" /> <arg value="../src/google/protobuf/unittest_extension_repeated_nano.proto" /> @@ -211,10 +225,14 @@ <arg value="--proto_path=src/test/java" /> <arg value="../src/google/protobuf/unittest_reference_types_nano.proto" /> </exec> + <exec executable="../src/protoc"> + <arg value="--javanano_out=optional_field_style=reftypes_compat_mode,generate_equals=true,java_outer_classname=google/protobuf/unittest_reference_types_nano.proto|NanoReferenceTypesCompat:target/generated-test-sources" /> + <arg value="--proto_path=../src" /> + <arg value="--proto_path=src/test/java" /> + <arg value="../src/google/protobuf/unittest_reference_types_nano.proto" /> + </exec> </tasks> <testSourceRoot>target/generated-test-sources</testSourceRoot> - <!--testSourceRoot>target/generated-test-sources/opt-space</testSourceRoot--> - <!--testSourceRoot>target/generated-test-sources/opt-speed</testSourceRoot--> </configuration> <goals> <goal>run</goal> @@ -222,6 +240,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL> + <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName> + <Export-Package>com.google.protobuf;version=2.6.1</Export-Package> + </instructions> + </configuration> + </plugin> </plugins> </build> <profiles> @@ -240,11 +270,25 @@ <include>**/ExtensionRegistryLite.java</include> <include>**/FieldSet.java</include> <include>**/GeneratedMessageLite.java</include> - <include>**/InvalidProtocolBufferException.java</include> <include>**/Internal.java</include> + <include>**/InvalidProtocolBufferException.java</include> + <include>**/LazyStringArrayList.java</include> + <include>**/LazyStringList.java</include> <include>**/MessageLite.java</include> + <include>**/MessageLiteOrBuilder.java</include> + <include>**/SmallSortedMap.java</include> <include>**/UninitializedMessageException.java</include> + <include>**/UnmodifiableLazyStringList.java</include> <include>**/WireFormat.java</include> + <include>**/Parser.java</include> + <include>**/AbstractParser.java</include> + <include>**/BoundedByteString.java</include> + <include>**/LiteralByteString.java</include> + <include>**/RopeByteString.java</include> + <include>**/Utf8.java</include> + <include>**/LazyField.java</include> + <include>**/LazyFieldLite.java</include> + <include>**/ProtocolStringList.java</include> </includes> <testIncludes> <testInclude>**/LiteTest.java</testInclude> |