Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6268 from haon4/java_gson_update
Update GSON version to 3.8.5
- Loading branch information
Showing
1 changed file
with
134 additions
and
134 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,139 +1,139 @@ | ||
<?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"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<groupId>com.google.protobuf</groupId> | ||
<artifactId>protobuf-parent</artifactId> | ||
<version>3.8.0</version> | ||
</parent> | ||
|
||
<artifactId>protobuf-java-util</artifactId> | ||
<packaging>bundle</packaging> | ||
|
||
<name>Protocol Buffers [Util]</name> | ||
<description>Utilities for Protocol Buffers</description> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>${project.groupId}</groupId> | ||
<artifactId>protobuf-java</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.google.guava</groupId> | ||
<artifactId>guava</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.google.errorprone</groupId> | ||
<artifactId>error_prone_annotations</artifactId> | ||
<version>2.3.2</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.google.guava</groupId> | ||
<artifactId>guava-testlib</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.google.code.gson</groupId> | ||
<artifactId>gson</artifactId> | ||
<version>2.7</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>junit</groupId> | ||
<artifactId>junit</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.easymock</groupId> | ||
<artifactId>easymock</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.easymock</groupId> | ||
<artifactId>easymockclassextension</artifactId> | ||
</dependency> | ||
<?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"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<groupId>com.google.protobuf</groupId> | ||
<artifactId>protobuf-parent</artifactId> | ||
<version>3.8.0</version> | ||
</parent> | ||
|
||
<artifactId>protobuf-java-util</artifactId> | ||
<packaging>bundle</packaging> | ||
|
||
<name>Protocol Buffers [Util]</name> | ||
<description>Utilities for Protocol Buffers</description> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>${project.groupId}</groupId> | ||
<artifactId>protobuf-java</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.google.guava</groupId> | ||
<artifactId>guava</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.google.errorprone</groupId> | ||
<artifactId>error_prone_annotations</artifactId> | ||
<version>2.3.2</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.google.guava</groupId> | ||
<artifactId>guava-testlib</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.google.code.gson</groupId> | ||
<artifactId>gson</artifactId> | ||
<version>2.8.5</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>junit</groupId> | ||
<artifactId>junit</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.easymock</groupId> | ||
<artifactId>easymock</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.easymock</groupId> | ||
<artifactId>easymockclassextension</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.google.truth</groupId> | ||
<artifactId>truth</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
</dependencies> | ||
|
||
<properties> | ||
<!-- Use the core proto dir so that we can call the core generation script --> | ||
<test.proto.dir>../core/src/test/proto</test.proto.dir> | ||
</properties> | ||
|
||
<build> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-antrun-plugin</artifactId> | ||
<executions> | ||
<!-- Generate the test protos --> | ||
<execution> | ||
<id>generate-test-sources</id> | ||
<phase>generate-test-sources</phase> | ||
<configuration> | ||
<target> | ||
<!-- Generate all of the test protos from the core module --> | ||
<ant antfile="../core/generate-test-sources-build.xml"/> | ||
|
||
<!-- Generate additional test protos for this module --> | ||
<exec executable="${protoc}"> | ||
<arg value="--java_out=${generated.testsources.dir}"/> | ||
<arg value="--proto_path=${protobuf.source.dir}"/> | ||
<arg value="--proto_path=src/test/proto"/> | ||
<arg value="src/test/proto/com/google/protobuf/util/json_test.proto"/> | ||
</exec> | ||
</target> | ||
</configuration> | ||
<goals> | ||
<goal>run</goal> | ||
</goals> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
|
||
<!-- Add the generated test sources to the build --> | ||
<plugin> | ||
<groupId>org.codehaus.mojo</groupId> | ||
<artifactId>build-helper-maven-plugin</artifactId> | ||
<executions> | ||
<execution> | ||
<id>add-generated-test-sources</id> | ||
<phase>generate-test-sources</phase> | ||
<goals> | ||
<goal>add-test-source</goal> | ||
</goals> | ||
<configuration> | ||
<sources> | ||
<source>${generated.testsources.dir}</source> | ||
</sources> | ||
</configuration> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
|
||
<!-- Configure the OSGI bundle --> | ||
<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.util</Bundle-SymbolicName> | ||
<Export-Package>com.google.protobuf.util;version=${project.version}</Export-Package> | ||
</instructions> | ||
</configuration> | ||
</plugin> | ||
|
||
<!-- Configure the fat jar to include all dependencies --> | ||
<plugin> | ||
<artifactId>maven-assembly-plugin</artifactId> | ||
<configuration> | ||
<descriptorRefs> | ||
<descriptorRef>jar-with-dependencies</descriptorRef> | ||
</descriptorRefs> | ||
</configuration> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</project> | ||
</dependencies> | ||
|
||
<properties> | ||
<!-- Use the core proto dir so that we can call the core generation script --> | ||
<test.proto.dir>../core/src/test/proto</test.proto.dir> | ||
</properties> | ||
|
||
<build> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-antrun-plugin</artifactId> | ||
<executions> | ||
<!-- Generate the test protos --> | ||
<execution> | ||
<id>generate-test-sources</id> | ||
<phase>generate-test-sources</phase> | ||
<configuration> | ||
<target> | ||
<!-- Generate all of the test protos from the core module --> | ||
<ant antfile="../core/generate-test-sources-build.xml"/> | ||
|
||
<!-- Generate additional test protos for this module --> | ||
<exec executable="${protoc}"> | ||
<arg value="--java_out=${generated.testsources.dir}"/> | ||
<arg value="--proto_path=${protobuf.source.dir}"/> | ||
<arg value="--proto_path=src/test/proto"/> | ||
<arg value="src/test/proto/com/google/protobuf/util/json_test.proto"/> | ||
</exec> | ||
</target> | ||
</configuration> | ||
<goals> | ||
<goal>run</goal> | ||
</goals> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
|
||
<!-- Add the generated test sources to the build --> | ||
<plugin> | ||
<groupId>org.codehaus.mojo</groupId> | ||
<artifactId>build-helper-maven-plugin</artifactId> | ||
<executions> | ||
<execution> | ||
<id>add-generated-test-sources</id> | ||
<phase>generate-test-sources</phase> | ||
<goals> | ||
<goal>add-test-source</goal> | ||
</goals> | ||
<configuration> | ||
<sources> | ||
<source>${generated.testsources.dir}</source> | ||
</sources> | ||
</configuration> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
|
||
<!-- Configure the OSGI bundle --> | ||
<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.util</Bundle-SymbolicName> | ||
<Export-Package>com.google.protobuf.util;version=${project.version}</Export-Package> | ||
</instructions> | ||
</configuration> | ||
</plugin> | ||
|
||
<!-- Configure the fat jar to include all dependencies --> | ||
<plugin> | ||
<artifactId>maven-assembly-plugin</artifactId> | ||
<configuration> | ||
<descriptorRefs> | ||
<descriptorRef>jar-with-dependencies</descriptorRef> | ||
</descriptorRefs> | ||
</configuration> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</project> |