| OLD | NEW |
|---|
| 1 <?xml version="1.0" encoding="UTF-8"?> | 1 <?xml version="1.0" encoding="UTF-8"?> |
| 2 <project xmlns="http://maven.apache.org/POM/4.0.0" | 2 <project xmlns="http://maven.apache.org/POM/4.0.0" |
| 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
| 4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/
maven-v4_0_0.xsd"> | 4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/
maven-v4_0_0.xsd"> |
| 5 <modelVersion>4.0.0</modelVersion> | 5 <modelVersion>4.0.0</modelVersion> |
| 6 <parent> | 6 <parent> |
| 7 <groupId>com.google.protobuf</groupId> | 7 <groupId>com.google.protobuf</groupId> |
| 8 <artifactId>protobuf-parent</artifactId> | 8 <artifactId>protobuf-parent</artifactId> |
| 9 <version>3.0.0-beta-3</version> | 9 <version>3.1.0</version> |
| 10 </parent> | 10 </parent> |
| 11 | 11 |
| 12 <artifactId>protobuf-java-util</artifactId> | 12 <artifactId>protobuf-java-util</artifactId> |
| 13 <packaging>bundle</packaging> | 13 <packaging>bundle</packaging> |
| 14 | 14 |
| 15 <name>Protocol Buffers [Util]</name> | 15 <name>Protocol Buffers [Util]</name> |
| 16 <description>Utilities for Protocol Buffers</description> | 16 <description>Utilities for Protocol Buffers</description> |
| 17 | 17 |
| 18 <dependencies> | 18 <dependencies> |
| 19 <dependency> | 19 <dependency> |
| 20 <groupId>${project.groupId}</groupId> | 20 <groupId>${project.groupId}</groupId> |
| 21 <artifactId>protobuf-java</artifactId> | 21 <artifactId>protobuf-java</artifactId> |
| 22 <version>${project.version}</version> | 22 <version>${project.version}</version> |
| 23 </dependency> | 23 </dependency> |
| 24 <dependency> | 24 <dependency> |
| 25 <groupId>com.google.guava</groupId> | 25 <groupId>com.google.guava</groupId> |
| 26 <artifactId>guava</artifactId> | 26 <artifactId>guava</artifactId> |
| 27 </dependency> | 27 </dependency> |
| 28 <dependency> | 28 <dependency> |
| 29 <groupId>com.google.code.gson</groupId> | 29 <groupId>com.google.code.gson</groupId> |
| 30 <artifactId>gson</artifactId> | 30 <artifactId>gson</artifactId> |
| 31 <version>2.3</version> | 31 <version>2.7</version> |
| 32 </dependency> | 32 </dependency> |
| 33 <dependency> | 33 <dependency> |
| 34 <groupId>junit</groupId> | 34 <groupId>junit</groupId> |
| 35 <artifactId>junit</artifactId> | 35 <artifactId>junit</artifactId> |
| 36 </dependency> | 36 </dependency> |
| 37 <dependency> | 37 <dependency> |
| 38 <groupId>org.easymock</groupId> | 38 <groupId>org.easymock</groupId> |
| 39 <artifactId>easymock</artifactId> | 39 <artifactId>easymock</artifactId> |
| 40 </dependency> | 40 </dependency> |
| 41 <dependency> | 41 <dependency> |
| (...skipping 30 matching lines...) Expand all Loading... |
| 72 </exec> | 72 </exec> |
| 73 </target> | 73 </target> |
| 74 </configuration> | 74 </configuration> |
| 75 <goals> | 75 <goals> |
| 76 <goal>run</goal> | 76 <goal>run</goal> |
| 77 </goals> | 77 </goals> |
| 78 </execution> | 78 </execution> |
| 79 </executions> | 79 </executions> |
| 80 </plugin> | 80 </plugin> |
| 81 | 81 |
| 82 <!-- Add the generated test sources to the build --> |
| 82 <plugin> | 83 <plugin> |
| 83 <artifactId>maven-compiler-plugin</artifactId> | 84 <groupId>org.codehaus.mojo</groupId> |
| 84 <configuration> | 85 <artifactId>build-helper-maven-plugin</artifactId> |
| 85 <!-- Add the generated test sources to the build --> | 86 <executions> |
| 86 <generatedTestSourcesDirectory>${generated.testsources.dir}</generated
TestSourcesDirectory> | 87 <execution> |
| 87 </configuration> | 88 <id>add-generated-test-sources</id> |
| 89 <phase>generate-test-sources</phase> |
| 90 <goals> |
| 91 <goal>add-test-source</goal> |
| 92 </goals> |
| 93 <configuration> |
| 94 <sources> |
| 95 <source>${generated.testsources.dir}</source> |
| 96 </sources> |
| 97 </configuration> |
| 98 </execution> |
| 99 </executions> |
| 88 </plugin> | 100 </plugin> |
| 89 | 101 |
| 90 <!-- Configure the OSGI bundle --> | 102 <!-- Configure the OSGI bundle --> |
| 91 <plugin> | 103 <plugin> |
| 92 <groupId>org.apache.felix</groupId> | 104 <groupId>org.apache.felix</groupId> |
| 93 <artifactId>maven-bundle-plugin</artifactId> | 105 <artifactId>maven-bundle-plugin</artifactId> |
| 94 <extensions>true</extensions> | 106 <extensions>true</extensions> |
| 95 <configuration> | 107 <configuration> |
| 96 <instructions> | 108 <instructions> |
| 97 <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bund
le-DocURL> | 109 <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bund
le-DocURL> |
| 98 <Bundle-SymbolicName>com.google.protobuf.util</Bundle-SymbolicName> | 110 <Bundle-SymbolicName>com.google.protobuf.util</Bundle-SymbolicName> |
| 99 <Export-Package>com.google.protobuf.util;version=${project.version}<
/Export-Package> | 111 <Export-Package>com.google.protobuf.util;version=${project.version}<
/Export-Package> |
| 100 </instructions> | 112 </instructions> |
| 101 </configuration> | 113 </configuration> |
| 102 </plugin> | 114 </plugin> |
| 103 | 115 |
| 104 <!-- Configure the fat jar to include all dependencies --> | 116 <!-- Configure the fat jar to include all dependencies --> |
| 105 <plugin> | 117 <plugin> |
| 106 <artifactId>maven-assembly-plugin</artifactId> | 118 <artifactId>maven-assembly-plugin</artifactId> |
| 107 <configuration> | 119 <configuration> |
| 108 <descriptorRefs> | 120 <descriptorRefs> |
| 109 <descriptorRef>jar-with-dependencies</descriptorRef> | 121 <descriptorRef>jar-with-dependencies</descriptorRef> |
| 110 </descriptorRefs> | 122 </descriptorRefs> |
| 111 </configuration> | 123 </configuration> |
| 112 </plugin> | 124 </plugin> |
| 113 </plugins> | 125 </plugins> |
| 114 </build> | 126 </build> |
| 115 </project> | 127 </project> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2495533002:
third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)
