| 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</groupId> | 7 <groupId>com.google.protobuf</groupId> |
| 8 <artifactId>google</artifactId> | 8 <artifactId>protobuf-parent</artifactId> |
| 9 <version>1</version> | 9 <version>3.0.0-beta-3</version> |
| 10 </parent> | 10 </parent> |
| 11 <groupId>com.google.protobuf</groupId> | 11 |
| 12 <artifactId>protobuf-java-util</artifactId> | 12 <artifactId>protobuf-java-util</artifactId> |
| 13 <version>3.0.0-beta-2</version> | |
| 14 <packaging>bundle</packaging> | 13 <packaging>bundle</packaging> |
| 15 <name>Protocol Buffer Java API</name> | 14 |
| 16 <description> | 15 <name>Protocol Buffers [Util]</name> |
| 17 Protocol Buffers are a way of encoding structured data in an efficient yet | 16 <description>Utilities for Protocol Buffers</description> |
| 18 extensible format. | 17 |
| 19 </description> | |
| 20 <inceptionYear>2008</inceptionYear> | |
| 21 <url>https://developers.google.com/protocol-buffers/</url> | |
| 22 <licenses> | |
| 23 <license> | |
| 24 <name>New BSD license</name> | |
| 25 <url>http://www.opensource.org/licenses/bsd-license.php</url> | |
| 26 <distribution>repo</distribution> | |
| 27 </license> | |
| 28 </licenses> | |
| 29 <scm> | |
| 30 <url>https://github.com/google/protobuf</url> | |
| 31 <connection> | |
| 32 scm:git:https://github.com/google/protobuf.git | |
| 33 </connection> | |
| 34 </scm> | |
| 35 <dependencies> | 18 <dependencies> |
| 36 <dependency> | 19 <dependency> |
| 37 <groupId>com.google.protobuf</groupId> | 20 <groupId>${project.groupId}</groupId> |
| 38 <artifactId>protobuf-java</artifactId> | 21 <artifactId>protobuf-java</artifactId> |
| 39 <version>3.0.0-beta-2</version> | 22 <version>${project.version}</version> |
| 40 <scope>compile</scope> | |
| 41 </dependency> | 23 </dependency> |
| 42 <dependency> | 24 <dependency> |
| 43 <groupId>com.google.guava</groupId> | 25 <groupId>com.google.guava</groupId> |
| 44 <artifactId>guava</artifactId> | 26 <artifactId>guava</artifactId> |
| 45 <version>18.0</version> | |
| 46 <scope>compile</scope> | |
| 47 </dependency> | 27 </dependency> |
| 48 <dependency> | 28 <dependency> |
| 49 <groupId>com.google.code.gson</groupId> | 29 <groupId>com.google.code.gson</groupId> |
| 50 <artifactId>gson</artifactId> | 30 <artifactId>gson</artifactId> |
| 51 <version>2.3</version> | 31 <version>2.3</version> |
| 52 <scope>compile</scope> | |
| 53 </dependency> | 32 </dependency> |
| 54 <dependency> | 33 <dependency> |
| 55 <groupId>junit</groupId> | 34 <groupId>junit</groupId> |
| 56 <artifactId>junit</artifactId> | 35 <artifactId>junit</artifactId> |
| 57 <version>4.4</version> | |
| 58 <scope>test</scope> | |
| 59 </dependency> | 36 </dependency> |
| 60 <dependency> | 37 <dependency> |
| 61 <groupId>org.easymock</groupId> | 38 <groupId>org.easymock</groupId> |
| 62 <artifactId>easymock</artifactId> | 39 <artifactId>easymock</artifactId> |
| 63 <version>2.2</version> | |
| 64 <scope>test</scope> | |
| 65 </dependency> | 40 </dependency> |
| 66 <dependency> | 41 <dependency> |
| 67 <groupId>org.easymock</groupId> | 42 <groupId>org.easymock</groupId> |
| 68 <artifactId>easymockclassextension</artifactId> | 43 <artifactId>easymockclassextension</artifactId> |
| 69 <version>2.2.1</version> | |
| 70 <scope>test</scope> | |
| 71 </dependency> | 44 </dependency> |
| 72 </dependencies> | 45 </dependencies> |
| 46 |
| 47 <properties> |
| 48 <!-- Use the core proto dir so that we can call the core generation script -
-> |
| 49 <test.proto.dir>../core/src/test/proto</test.proto.dir> |
| 50 </properties> |
| 51 |
| 73 <build> | 52 <build> |
| 74 <plugins> | 53 <plugins> |
| 75 <plugin> | 54 <plugin> |
| 76 <artifactId>maven-compiler-plugin</artifactId> | |
| 77 <configuration> | |
| 78 <source>1.5</source> | |
| 79 <target>1.5</target> | |
| 80 </configuration> | |
| 81 </plugin> | |
| 82 <plugin> | |
| 83 <artifactId>maven-surefire-plugin</artifactId> | |
| 84 <configuration> | |
| 85 <includes> | |
| 86 <include>**/*Test.java</include> | |
| 87 <include>../src/main/java/com/google/protobuf/TestUtil.java</include
> | |
| 88 </includes> | |
| 89 </configuration> | |
| 90 </plugin> | |
| 91 <plugin> | |
| 92 <artifactId>maven-antrun-plugin</artifactId> | 55 <artifactId>maven-antrun-plugin</artifactId> |
| 93 <executions> | 56 <executions> |
| 57 <!-- Generate the test protos --> |
| 94 <execution> | 58 <execution> |
| 95 <id>generate-test-sources</id> | 59 <id>generate-test-sources</id> |
| 96 <phase>generate-test-sources</phase> | 60 <phase>generate-test-sources</phase> |
| 97 <configuration> | 61 <configuration> |
| 98 <tasks> | 62 <target> |
| 99 <mkdir dir="target/generated-test-sources" /> | 63 <!-- Generate all of the test protos from the core module --> |
| 100 <exec executable="../../src/protoc"> | 64 <ant antfile="../core/generate-test-sources-build.xml"/> |
| 101 <arg value="--java_out=target/generated-test-sources" /> | 65 |
| 102 <arg value="--proto_path=../../src" /> | 66 <!-- Generate additional test protos for this module --> |
| 103 <arg value="--proto_path=src/test/java" /> | 67 <exec executable="${protoc}"> |
| 104 <arg value="../../src/google/protobuf/unittest.proto" /> | 68 <arg value="--java_out=${generated.testsources.dir}" /> |
| 105 <arg value="../../src/google/protobuf/unittest_import.proto" /
> | 69 <arg value="--proto_path=${protobuf.source.dir}" /> |
| 106 <arg value="../../src/google/protobuf/unittest_import_public.p
roto" /> | 70 <arg value="--proto_path=src/test/proto" /> |
| 107 <arg value="src/test/java/com/google/protobuf/util/json_test.p
roto" /> | 71 <arg value="src/test/proto/com/google/protobuf/util/json_test.
proto" /> |
| 108 </exec> | 72 </exec> |
| 109 </tasks> | 73 </target> |
| 110 <testSourceRoot>target/generated-test-sources</testSourceRoot> | |
| 111 </configuration> | 74 </configuration> |
| 112 <goals> | 75 <goals> |
| 113 <goal>run</goal> | 76 <goal>run</goal> |
| 114 </goals> | 77 </goals> |
| 115 </execution> | 78 </execution> |
| 116 </executions> | 79 </executions> |
| 117 </plugin> | 80 </plugin> |
| 81 |
| 82 <plugin> |
| 83 <artifactId>maven-compiler-plugin</artifactId> |
| 84 <configuration> |
| 85 <!-- Add the generated test sources to the build --> |
| 86 <generatedTestSourcesDirectory>${generated.testsources.dir}</generated
TestSourcesDirectory> |
| 87 </configuration> |
| 88 </plugin> |
| 89 |
| 90 <!-- Configure the OSGI bundle --> |
| 118 <plugin> | 91 <plugin> |
| 119 <groupId>org.apache.felix</groupId> | 92 <groupId>org.apache.felix</groupId> |
| 120 <artifactId>maven-bundle-plugin</artifactId> | 93 <artifactId>maven-bundle-plugin</artifactId> |
| 121 <extensions>true</extensions> | 94 <extensions>true</extensions> |
| 122 <configuration> | 95 <configuration> |
| 123 <instructions> | 96 <instructions> |
| 124 <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bund
le-DocURL> | 97 <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bund
le-DocURL> |
| 125 <Bundle-SymbolicName>com.google.protobuf.util</Bundle-SymbolicName> | 98 <Bundle-SymbolicName>com.google.protobuf.util</Bundle-SymbolicName> |
| 126 <Export-Package>com.google.protobuf.util;version=3.0.0-beta-2</Expor
t-Package> | 99 <Export-Package>com.google.protobuf.util;version=${project.version}<
/Export-Package> |
| 127 </instructions> | 100 </instructions> |
| 128 </configuration> | 101 </configuration> |
| 129 </plugin> | 102 </plugin> |
| 103 |
| 104 <!-- Configure the fat jar to include all dependencies --> |
| 130 <plugin> | 105 <plugin> |
| 131 <artifactId>maven-assembly-plugin</artifactId> | 106 <artifactId>maven-assembly-plugin</artifactId> |
| 132 <configuration> | 107 <configuration> |
| 133 <descriptorRefs> | 108 <descriptorRefs> |
| 134 <descriptorRef>jar-with-dependencies</descriptorRef> | 109 <descriptorRef>jar-with-dependencies</descriptorRef> |
| 135 </descriptorRefs> | 110 </descriptorRefs> |
| 136 </configuration> | 111 </configuration> |
| 137 </plugin> | 112 </plugin> |
| 138 </plugins> | 113 </plugins> |
| 139 </build> | 114 </build> |
| 140 <profiles> | |
| 141 <profile> | |
| 142 <id>release</id> | |
| 143 <distributionManagement> | |
| 144 <snapshotRepository> | |
| 145 <id>sonatype-nexus-staging</id> | |
| 146 <url>https://oss.sonatype.org/content/repositories/snapshots</url> | |
| 147 </snapshotRepository> | |
| 148 <repository> | |
| 149 <id>sonatype-nexus-staging</id> | |
| 150 <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</ur
l> | |
| 151 </repository> | |
| 152 </distributionManagement> | |
| 153 <build> | |
| 154 <plugins> | |
| 155 <plugin> | |
| 156 <groupId>org.apache.maven.plugins</groupId> | |
| 157 <artifactId>maven-source-plugin</artifactId> | |
| 158 <version>2.2.1</version> | |
| 159 <executions> | |
| 160 <execution> | |
| 161 <id>attach-sources</id> | |
| 162 <goals> | |
| 163 <goal>jar-no-fork</goal> | |
| 164 </goals> | |
| 165 </execution> | |
| 166 </executions> | |
| 167 </plugin> | |
| 168 <plugin> | |
| 169 <groupId>org.apache.maven.plugins</groupId> | |
| 170 <artifactId>maven-javadoc-plugin</artifactId> | |
| 171 <version>2.9.1</version> | |
| 172 <executions> | |
| 173 <execution> | |
| 174 <id>attach-javadocs</id> | |
| 175 <goals> | |
| 176 <goal>jar</goal> | |
| 177 </goals> | |
| 178 </execution> | |
| 179 </executions> | |
| 180 </plugin> | |
| 181 <plugin> | |
| 182 <groupId>org.apache.maven.plugins</groupId> | |
| 183 <artifactId>maven-gpg-plugin</artifactId> | |
| 184 <version>1.5</version> | |
| 185 <executions> | |
| 186 <execution> | |
| 187 <id>sign-artifacts</id> | |
| 188 <phase>verify</phase> | |
| 189 <goals> | |
| 190 <goal>sign</goal> | |
| 191 </goals> | |
| 192 </execution> | |
| 193 </executions> | |
| 194 </plugin> | |
| 195 <plugin> | |
| 196 <groupId>org.sonatype.plugins</groupId> | |
| 197 <artifactId>nexus-staging-maven-plugin</artifactId> | |
| 198 <version>1.6.3</version> | |
| 199 <extensions>true</extensions> | |
| 200 <configuration> | |
| 201 <serverId>sonatype-nexus-staging</serverId> | |
| 202 <nexusUrl>https://oss.sonatype.org/</nexusUrl> | |
| 203 <autoReleaseAfterClose>false</autoReleaseAfterClose> | |
| 204 </configuration> | |
| 205 </plugin> | |
| 206 </plugins> | |
| 207 </build> | |
| 208 </profile> | |
| 209 </profiles> | |
| 210 </project> | 115 </project> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1983203003:
Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master