Index: third_party/protobuf/java/pom.xml |
diff --git a/third_party/protobuf/java/pom.xml b/third_party/protobuf/java/pom.xml |
index 3eab00ad91febe81b39f83d0497171251723c40f..7a1a91f8737e5d44b3be45f6194faad1f6df3d00 100644 |
--- a/third_party/protobuf/java/pom.xml |
+++ b/third_party/protobuf/java/pom.xml |
@@ -8,17 +8,35 @@ |
<artifactId>google</artifactId> |
<version>1</version> |
</parent> |
+ |
<groupId>com.google.protobuf</groupId> |
- <artifactId>protobuf-java</artifactId> |
- <version>3.0.0-beta-2</version> |
- <packaging>bundle</packaging> |
- <name>Protocol Buffer Java API</name> |
+ <artifactId>protobuf-parent</artifactId> |
+ <version>3.0.0-beta-3</version> |
+ <packaging>pom</packaging> |
+ |
+ <name>Protocol Buffers [Parent]</name> |
+ <inceptionYear>2008</inceptionYear> |
+ <url>https://developers.google.com/protocol-buffers/</url> |
<description> |
Protocol Buffers are a way of encoding structured data in an efficient yet |
extensible format. |
</description> |
- <inceptionYear>2008</inceptionYear> |
- <url>https://developers.google.com/protocol-buffers/</url> |
+ |
+ <properties> |
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> |
+ |
+ <!-- These are relative to the submodules --> |
+ <protobuf.basedir>${project.basedir}/../..</protobuf.basedir> |
+ <protobuf.source.dir>${protobuf.basedir}/src</protobuf.source.dir> |
+ <protoc>${protobuf.source.dir}/protoc</protoc> |
+ <test.proto.dir>src/test/proto</test.proto.dir> |
+ <generated.sources.dir>${project.build.directory}/generated-sources</generated.sources.dir> |
+ <generated.testsources.dir>${project.build.directory}/generated-test-sources</generated.testsources.dir> |
+ <generated.sources.lite.dir>${project.build.directory}/generated-sources-lite</generated.sources.lite.dir> |
+ <generated.testsources.lite.dir>${project.build.directory}/generated-test-sources-lite</generated.testsources.lite.dir> |
+ </properties> |
+ |
<licenses> |
<license> |
<name>New BSD license</name> |
@@ -26,217 +44,116 @@ |
<distribution>repo</distribution> |
</license> |
</licenses> |
+ |
<scm> |
<url>https://github.com/google/protobuf</url> |
- <connection> |
- scm:git:https://github.com/google/protobuf.git |
- </connection> |
+ <connection>scm:git:https://github.com/google/protobuf.git</connection> |
</scm> |
- <dependencies> |
- <dependency> |
- <groupId>junit</groupId> |
- <artifactId>junit</artifactId> |
- <version>4.4</version> |
- <scope>test</scope> |
- </dependency> |
- <dependency> |
- <groupId>org.easymock</groupId> |
- <artifactId>easymock</artifactId> |
- <version>2.2</version> |
- <scope>test</scope> |
- </dependency> |
- <dependency> |
- <groupId>org.easymock</groupId> |
- <artifactId>easymockclassextension</artifactId> |
- <version>2.2.1</version> |
- <scope>test</scope> |
- </dependency> |
- </dependencies> |
+ |
+ <distributionManagement> |
+ <snapshotRepository> |
+ <id>sonatype-nexus-staging</id> |
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url> |
+ </snapshotRepository> |
+ <repository> |
+ <id>sonatype-nexus-staging</id> |
+ <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url> |
+ </repository> |
+ </distributionManagement> |
+ |
+ <dependencyManagement> |
+ <dependencies> |
+ <dependency> |
+ <groupId>junit</groupId> |
+ <artifactId>junit</artifactId> |
+ <version>4.12</version> |
+ <scope>test</scope> |
+ </dependency> |
+ <dependency> |
+ <groupId>org.easymock</groupId> |
+ <artifactId>easymock</artifactId> |
+ <version>2.2</version> |
+ <scope>test</scope> |
+ </dependency> |
+ <dependency> |
+ <groupId>org.easymock</groupId> |
+ <artifactId>easymockclassextension</artifactId> |
+ <version>2.2.1</version> |
+ <scope>test</scope> |
+ </dependency> |
+ <dependency> |
+ <groupId>com.google.guava</groupId> |
+ <artifactId>guava</artifactId> |
+ <version>18.0</version> |
+ </dependency> |
+ </dependencies> |
+ </dependencyManagement> |
+ |
<build> |
- <plugins> |
- <plugin> |
- <artifactId>maven-compiler-plugin</artifactId> |
- <configuration> |
- <source>1.5</source> |
- <target>1.5</target> |
- </configuration> |
- </plugin> |
- <plugin> |
- <artifactId>maven-surefire-plugin</artifactId> |
- <configuration> |
- <includes> |
- <include>**/*Test.java</include> |
- </includes> |
- </configuration> |
- </plugin> |
- <plugin> |
- <artifactId>maven-antrun-plugin</artifactId> |
- <executions> |
- <execution> |
- <id>generate-sources</id> |
- <phase>generate-sources</phase> |
- <configuration> |
- <tasks> |
- <mkdir dir="target/generated-sources" /> |
- <exec executable="../src/protoc"> |
- <arg value="--java_out=target/generated-sources" /> |
- <arg value="--proto_path=../src" /> |
- <arg value="../src/google/protobuf/any.proto" /> |
- <arg value="../src/google/protobuf/api.proto" /> |
- <arg value="../src/google/protobuf/descriptor.proto" /> |
- <arg value="../src/google/protobuf/duration.proto" /> |
- <arg value="../src/google/protobuf/empty.proto" /> |
- <arg value="../src/google/protobuf/field_mask.proto" /> |
- <arg value="../src/google/protobuf/source_context.proto" /> |
- <arg value="../src/google/protobuf/struct.proto" /> |
- <arg value="../src/google/protobuf/timestamp.proto" /> |
- <arg value="../src/google/protobuf/type.proto" /> |
- <arg value="../src/google/protobuf/wrappers.proto" /> |
- <arg value="../src/google/protobuf/compiler/plugin.proto" /> |
- </exec> |
- </tasks> |
- <sourceRoot>target/generated-sources</sourceRoot> |
- </configuration> |
- <goals> |
- <goal>run</goal> |
- </goals> |
- </execution> |
- <execution> |
- <id>generate-test-sources</id> |
- <phase>generate-test-sources</phase> |
- <configuration> |
- <tasks> |
- <mkdir dir="target/generated-test-sources" /> |
- <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/google/protobuf/unittest_mset_wire_format.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" /> |
- <arg value="../src/google/protobuf/unittest_well_known_types.proto" /> |
- <arg value="src/test/java/com/google/protobuf/any_test.proto" /> |
- <arg value="src/test/java/com/google/protobuf/field_presence_test.proto" /> |
- <arg value="src/test/java/com/google/protobuf/map_for_proto2_lite_test.proto" /> |
- <arg value="src/test/java/com/google/protobuf/map_for_proto2_test.proto" /> |
- <arg value="src/test/java/com/google/protobuf/map_test.proto" /> |
- <arg value="src/test/java/com/google/protobuf/map_initialization_order_test.proto" /> |
- </exec> |
- </tasks> |
- <testSourceRoot>target/generated-test-sources</testSourceRoot> |
- </configuration> |
- <goals> |
- <goal>run</goal> |
- </goals> |
- </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=3.0.0-beta-2</Export-Package> |
- </instructions> |
- </configuration> |
- </plugin> |
- </plugins> |
- <resources> |
- <resource> |
- <directory>../src</directory> |
- <includes> |
- <include>google/protobuf/any.proto</include> |
- <include>google/protobuf/api.proto</include> |
- <include>google/protobuf/descriptor.proto</include> |
- <include>google/protobuf/duration.proto</include> |
- <include>google/protobuf/empty.proto</include> |
- <include>google/protobuf/field_mask.proto</include> |
- <include>google/protobuf/source_context.proto</include> |
- <include>google/protobuf/struct.proto</include> |
- <include>google/protobuf/timestamp.proto</include> |
- <include>google/protobuf/type.proto</include> |
- <include>google/protobuf/wrappers.proto</include> |
- <include>google/protobuf/compiler/plugin.proto</include> |
- </includes> |
- </resource> |
- </resources> |
+ <pluginManagement> |
+ <plugins> |
+ <plugin> |
+ <artifactId>maven-compiler-plugin</artifactId> |
+ <version>3.3</version> |
+ <configuration> |
+ <source>1.6</source> |
+ <target>1.6</target> |
+ </configuration> |
+ </plugin> |
+ <plugin> |
+ <artifactId>maven-source-plugin</artifactId> |
+ <version>2.4</version> |
+ <executions> |
+ <execution> |
+ <id>attach-sources</id> |
+ <goals> |
+ <goal>jar-no-fork</goal> |
+ </goals> |
+ </execution> |
+ </executions> |
+ </plugin> |
+ <plugin> |
+ <artifactId>maven-javadoc-plugin</artifactId> |
+ <version>2.10.3</version> |
+ <executions> |
+ <execution> |
+ <id>attach-javadocs</id> |
+ <goals> |
+ <goal>jar</goal> |
+ </goals> |
+ </execution> |
+ </executions> |
+ </plugin> |
+ <plugin> |
+ <artifactId>maven-jar-plugin</artifactId> |
+ <version>2.6</version> |
+ </plugin> |
+ <plugin> |
+ <groupId>org.codehaus.mojo</groupId> |
+ <artifactId>build-helper-maven-plugin</artifactId> |
+ <version>1.10</version> |
+ </plugin> |
+ <plugin> |
+ <groupId>org.apache.felix</groupId> |
+ <artifactId>maven-bundle-plugin</artifactId> |
+ <version>3.0.1</version> |
+ </plugin> |
+ <plugin> |
+ <artifactId>maven-antrun-plugin</artifactId> |
+ <version>1.8</version> |
+ </plugin> |
+ </plugins> |
+ </pluginManagement> |
</build> |
+ |
<profiles> |
<profile> |
<id>release</id> |
- <distributionManagement> |
- <snapshotRepository> |
- <id>sonatype-nexus-staging</id> |
- <url>https://oss.sonatype.org/content/repositories/snapshots</url> |
- </snapshotRepository> |
- <repository> |
- <id>sonatype-nexus-staging</id> |
- <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url> |
- </repository> |
- </distributionManagement> |
<build> |
<plugins> |
<plugin> |
- <groupId>org.apache.maven.plugins</groupId> |
- <artifactId>maven-source-plugin</artifactId> |
- <version>2.2.1</version> |
- <executions> |
- <execution> |
- <id>attach-sources</id> |
- <goals> |
- <goal>jar-no-fork</goal> |
- </goals> |
- </execution> |
- </executions> |
- </plugin> |
- <plugin> |
- <groupId>org.apache.maven.plugins</groupId> |
- <artifactId>maven-javadoc-plugin</artifactId> |
- <version>2.9.1</version> |
- <executions> |
- <execution> |
- <id>attach-javadocs</id> |
- <goals> |
- <goal>jar</goal> |
- </goals> |
- </execution> |
- </executions> |
- </plugin> |
- <plugin> |
- <groupId>org.apache.maven.plugins</groupId> |
<artifactId>maven-gpg-plugin</artifactId> |
- <version>1.5</version> |
+ <version>1.6</version> |
<executions> |
<execution> |
<id>sign-artifacts</id> |
@@ -250,98 +167,23 @@ |
<plugin> |
<groupId>org.sonatype.plugins</groupId> |
<artifactId>nexus-staging-maven-plugin</artifactId> |
- <version>1.6.3</version> |
+ <version>1.6.6</version> |
<extensions>true</extensions> |
<configuration> |
- <serverId>sonatype-nexus-staging</serverId> |
- <nexusUrl>https://oss.sonatype.org/</nexusUrl> |
- <autoReleaseAfterClose>false</autoReleaseAfterClose> |
- </configuration> |
- </plugin> |
- </plugins> |
- </build> |
- </profile> |
- <profile> |
- <id>lite</id> |
- <build> |
- <plugins> |
- <plugin> |
- <artifactId>maven-compiler-plugin</artifactId> |
- <configuration> |
- <includes> |
- <include>**/AbstractMessageLite.java</include> |
- <include>**/AbstractParser.java</include> |
- <include>**/AbstractProtobufList.java</include> |
- <include>**/BoundedByteString.java</include> |
- <include>**/BooleanArrayList.java</include> |
- <include>**/ByteString.java</include> |
- <include>**/CodedInputStream.java</include> |
- <include>**/CodedOutputStream.java</include> |
- <include>**/DoublerrayList.java</include> |
- <include>**/ExtensionLite.java</include> |
- <include>**/ExtensionRegistryLite.java</include> |
- <include>**/FieldSet.java</include> |
- <include>**/FloatArrayList.java</include> |
- <include>**/GeneratedMessageLite.java</include> |
- <include>**/IntArrayList.java</include> |
- <include>**/Internal.java</include> |
- <include>**/InvalidProtocolBufferException.java</include> |
- <include>**/LazyFieldLite.java</include> |
- <include>**/LazyStringArrayList.java</include> |
- <include>**/LazyStringList.java</include> |
- <include>**/LiteralByteString.java</include> |
- <include>**/LongArrayList.java</include> |
- <include>**/MapEntryLite.java</include> |
- <include>**/MapFieldLite.java</include> |
- <include>**/MessageLite.java</include> |
- <include>**/MessageLiteOrBuilder.java</include> |
- <include>**/MessageLiteToString.java</include> |
- <include>**/MutabilityOracle.java</include> |
- <include>**/NioByteString.java</include> |
- <include>**/Parser.java</include> |
- <include>**/ProtobufArrayList.java</include> |
- <include>**/ProtocolStringList.java</include> |
- <include>**/RopeByteString.java</include> |
- <include>**/SmallSortedMap.java</include> |
- <include>**/TextFormatEscaper.java</include> |
- <include>**/UninitializedMessageException.java</include> |
- <include>**/UnknownFieldSetLite.java</include> |
- <include>**/UnmodifiableLazyStringList.java</include> |
- <include>**/UnsafeByteStrings.java</include> |
- <include>**/Utf8.java</include> |
- <include>**/WireFormat.java</include> |
- </includes> |
- <testIncludes> |
- <testInclude>**/*Lite.java</testInclude> |
- <testInclude>**/BooleanArrayListTest.java</testInclude> |
- <testInclude>**/DoubleArrayListTest.java</testInclude> |
- <testInclude>**/FloatArrayListTest.java</testInclude> |
- <testInclude>**/IntArrayListTest.java</testInclude> |
- <testInclude>**/LazyMessageLiteTest.java</testInclude> |
- <testInclude>**/LiteTest.java</testInclude> |
- <testInclude>**/LongArrayListTest.java</testInclude> |
- <testInclude>**/NioByteStringTest.java</testInclude> |
- <testInclude>**/ProtobufArrayListTest.java</testInclude> |
- <testInclude>**/UnknownFieldSetLiteTest.java</testInclude> |
- </testIncludes> |
- </configuration> |
- </plugin> |
- <plugin> |
- <artifactId>maven-surefire-plugin</artifactId> |
- <configuration> |
- <includes> |
- <include>**/*Test.java</include> |
- </includes> |
- </configuration> |
- </plugin> |
- <plugin> |
- <artifactId>maven-jar-plugin</artifactId> |
- <configuration> |
- <classifier>lite</classifier> |
+ <serverId>sonatype-nexus-staging</serverId> |
+ <nexusUrl>https://oss.sonatype.org/</nexusUrl> |
+ <autoReleaseAfterClose>false</autoReleaseAfterClose> |
</configuration> |
</plugin> |
</plugins> |
</build> |
</profile> |
</profiles> |
+ |
+ <modules> |
+ <module>core</module> |
+ <module>lite</module> |
+ <module>util</module> |
+ </modules> |
+ |
</project> |