Adam Cozzette
6 years ago
committed by
GitHub
commit
7e276a3293
33 changed files with 210 additions and 198 deletions
@ -1,139 +1,139 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
||||||
<modelVersion>4.0.0</modelVersion> |
<modelVersion>4.0.0</modelVersion> |
||||||
<parent> |
<parent> |
||||||
<groupId>com.google.protobuf</groupId> |
<groupId>com.google.protobuf</groupId> |
||||||
<artifactId>protobuf-parent</artifactId> |
<artifactId>protobuf-parent</artifactId> |
||||||
<version>3.8.0</version> |
<version>3.9.0-rc-1</version> |
||||||
</parent> |
</parent> |
||||||
|
|
||||||
<artifactId>protobuf-java-util</artifactId> |
<artifactId>protobuf-java-util</artifactId> |
||||||
<packaging>bundle</packaging> |
<packaging>bundle</packaging> |
||||||
|
|
||||||
<name>Protocol Buffers [Util]</name> |
<name>Protocol Buffers [Util]</name> |
||||||
<description>Utilities for Protocol Buffers</description> |
<description>Utilities for Protocol Buffers</description> |
||||||
|
|
||||||
<dependencies> |
<dependencies> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>${project.groupId}</groupId> |
<groupId>${project.groupId}</groupId> |
||||||
<artifactId>protobuf-java</artifactId> |
<artifactId>protobuf-java</artifactId> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>com.google.guava</groupId> |
<groupId>com.google.guava</groupId> |
||||||
<artifactId>guava</artifactId> |
<artifactId>guava</artifactId> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>com.google.errorprone</groupId> |
<groupId>com.google.errorprone</groupId> |
||||||
<artifactId>error_prone_annotations</artifactId> |
<artifactId>error_prone_annotations</artifactId> |
||||||
<version>2.3.2</version> |
<version>2.3.2</version> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>com.google.guava</groupId> |
<groupId>com.google.guava</groupId> |
||||||
<artifactId>guava-testlib</artifactId> |
<artifactId>guava-testlib</artifactId> |
||||||
<scope>test</scope> |
<scope>test</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>com.google.code.gson</groupId> |
<groupId>com.google.code.gson</groupId> |
||||||
<artifactId>gson</artifactId> |
<artifactId>gson</artifactId> |
||||||
<version>2.8.5</version> |
<version>2.7</version> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>junit</groupId> |
<groupId>junit</groupId> |
||||||
<artifactId>junit</artifactId> |
<artifactId>junit</artifactId> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.easymock</groupId> |
<groupId>org.easymock</groupId> |
||||||
<artifactId>easymock</artifactId> |
<artifactId>easymock</artifactId> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.easymock</groupId> |
<groupId>org.easymock</groupId> |
||||||
<artifactId>easymockclassextension</artifactId> |
<artifactId>easymockclassextension</artifactId> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>com.google.truth</groupId> |
<groupId>com.google.truth</groupId> |
||||||
<artifactId>truth</artifactId> |
<artifactId>truth</artifactId> |
||||||
<scope>test</scope> |
<scope>test</scope> |
||||||
</dependency> |
</dependency> |
||||||
</dependencies> |
</dependencies> |
||||||
|
|
||||||
<properties> |
<properties> |
||||||
<!-- Use the core proto dir so that we can call the core generation script --> |
<!-- Use the core proto dir so that we can call the core generation script --> |
||||||
<test.proto.dir>../core/src/test/proto</test.proto.dir> |
<test.proto.dir>../core/src/test/proto</test.proto.dir> |
||||||
</properties> |
</properties> |
||||||
|
|
||||||
<build> |
<build> |
||||||
<plugins> |
<plugins> |
||||||
<plugin> |
<plugin> |
||||||
<artifactId>maven-antrun-plugin</artifactId> |
<artifactId>maven-antrun-plugin</artifactId> |
||||||
<executions> |
<executions> |
||||||
<!-- Generate the test protos --> |
<!-- Generate the test protos --> |
||||||
<execution> |
<execution> |
||||||
<id>generate-test-sources</id> |
<id>generate-test-sources</id> |
||||||
<phase>generate-test-sources</phase> |
<phase>generate-test-sources</phase> |
||||||
<configuration> |
<configuration> |
||||||
<target> |
<target> |
||||||
<!-- Generate all of the test protos from the core module --> |
<!-- Generate all of the test protos from the core module --> |
||||||
<ant antfile="../core/generate-test-sources-build.xml"/> |
<ant antfile="../core/generate-test-sources-build.xml"/> |
||||||
|
|
||||||
<!-- Generate additional test protos for this module --> |
<!-- Generate additional test protos for this module --> |
||||||
<exec executable="${protoc}"> |
<exec executable="${protoc}"> |
||||||
<arg value="--java_out=${generated.testsources.dir}"/> |
<arg value="--java_out=${generated.testsources.dir}"/> |
||||||
<arg value="--proto_path=${protobuf.source.dir}"/> |
<arg value="--proto_path=${protobuf.source.dir}"/> |
||||||
<arg value="--proto_path=src/test/proto"/> |
<arg value="--proto_path=src/test/proto"/> |
||||||
<arg value="src/test/proto/com/google/protobuf/util/json_test.proto"/> |
<arg value="src/test/proto/com/google/protobuf/util/json_test.proto"/> |
||||||
</exec> |
</exec> |
||||||
</target> |
</target> |
||||||
</configuration> |
</configuration> |
||||||
<goals> |
<goals> |
||||||
<goal>run</goal> |
<goal>run</goal> |
||||||
</goals> |
</goals> |
||||||
</execution> |
</execution> |
||||||
</executions> |
</executions> |
||||||
</plugin> |
</plugin> |
||||||
|
|
||||||
<!-- Add the generated test sources to the build --> |
<!-- Add the generated test sources to the build --> |
||||||
<plugin> |
<plugin> |
||||||
<groupId>org.codehaus.mojo</groupId> |
<groupId>org.codehaus.mojo</groupId> |
||||||
<artifactId>build-helper-maven-plugin</artifactId> |
<artifactId>build-helper-maven-plugin</artifactId> |
||||||
<executions> |
<executions> |
||||||
<execution> |
<execution> |
||||||
<id>add-generated-test-sources</id> |
<id>add-generated-test-sources</id> |
||||||
<phase>generate-test-sources</phase> |
<phase>generate-test-sources</phase> |
||||||
<goals> |
<goals> |
||||||
<goal>add-test-source</goal> |
<goal>add-test-source</goal> |
||||||
</goals> |
</goals> |
||||||
<configuration> |
<configuration> |
||||||
<sources> |
<sources> |
||||||
<source>${generated.testsources.dir}</source> |
<source>${generated.testsources.dir}</source> |
||||||
</sources> |
</sources> |
||||||
</configuration> |
</configuration> |
||||||
</execution> |
</execution> |
||||||
</executions> |
</executions> |
||||||
</plugin> |
</plugin> |
||||||
|
|
||||||
<!-- Configure the OSGI bundle --> |
<!-- Configure the OSGI bundle --> |
||||||
<plugin> |
<plugin> |
||||||
<groupId>org.apache.felix</groupId> |
<groupId>org.apache.felix</groupId> |
||||||
<artifactId>maven-bundle-plugin</artifactId> |
<artifactId>maven-bundle-plugin</artifactId> |
||||||
<extensions>true</extensions> |
<extensions>true</extensions> |
||||||
<configuration> |
<configuration> |
||||||
<instructions> |
<instructions> |
||||||
<Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL> |
<Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL> |
||||||
<Bundle-SymbolicName>com.google.protobuf.util</Bundle-SymbolicName> |
<Bundle-SymbolicName>com.google.protobuf.util</Bundle-SymbolicName> |
||||||
<Export-Package>com.google.protobuf.util;version=${project.version}</Export-Package> |
<Export-Package>com.google.protobuf.util;version=${project.version}</Export-Package> |
||||||
</instructions> |
</instructions> |
||||||
</configuration> |
</configuration> |
||||||
</plugin> |
</plugin> |
||||||
|
|
||||||
<!-- Configure the fat jar to include all dependencies --> |
<!-- Configure the fat jar to include all dependencies --> |
||||||
<plugin> |
<plugin> |
||||||
<artifactId>maven-assembly-plugin</artifactId> |
<artifactId>maven-assembly-plugin</artifactId> |
||||||
<configuration> |
<configuration> |
||||||
<descriptorRefs> |
<descriptorRefs> |
||||||
<descriptorRef>jar-with-dependencies</descriptorRef> |
<descriptorRef>jar-with-dependencies</descriptorRef> |
||||||
</descriptorRefs> |
</descriptorRefs> |
||||||
</configuration> |
</configuration> |
||||||
</plugin> |
</plugin> |
||||||
</plugins> |
</plugins> |
||||||
</build> |
</build> |
||||||
</project> |
</project> |
||||||
|
|||||||
Loading…
Reference in new issue