diff options
author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2008-09-24 20:31:01 +0000 |
---|---|---|
committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2008-09-24 20:31:01 +0000 |
commit | 24bf56fb3a2fab42d355b15de11782c3144b9e80 (patch) | |
tree | cf9cfeb512a4aa1b01ba85506e9f0a68f8817f12 /java/pom.xml | |
parent | 3121a56ab46ecc7cd9cb135693ebe221b051029e (diff) | |
download | protobuf-24bf56fb3a2fab42d355b15de11782c3144b9e80.tar.gz protobuf-24bf56fb3a2fab42d355b15de11782c3144b9e80.tar.bz2 protobuf-24bf56fb3a2fab42d355b15de11782c3144b9e80.zip |
Integrate changes from internal Google-internal branch.
General
* License changed from Apache 2.0 to New BSD.
* It is now possible to define custom "options", which are basically
annotations which may be placed on definitions in a .proto file.
For example, you might define a field option called "foo" like so:
import "google/protobuf/descriptor.proto"
extend google.protobuf.FieldOptions {
optional string foo = 12345;
}
Then you annotate a field using the "foo" option:
message MyMessage {
optional int32 some_field = 1 [(foo) = "bar"]
}
The value of this option is then visible via the message's
Descriptor:
const FieldDescriptor* field =
MyMessage::descriptor()->FindFieldByName("some_field");
assert(field->options().GetExtension(foo) == "bar");
This feature has been implemented and tested in C++ and Java.
Other languages may or may not need to do extra work to support
custom options, depending on how they construct descriptors.
C++
* Fixed some GCC warnings that only occur when using -pedantic.
* Improved static initialization code, making ordering more
predictable among other things.
* TextFormat will no longer accept messages which contain multiple
instances of a singular field. Previously, the latter instance
would overwrite the former.
* Now works on systems that don't have hash_map.
Python
* Strings now use the "unicode" type rather than the "str" type.
String fields may still be assigned ASCII "str" values; they will
automatically be converted.
* Adding a property to an object representing a repeated field now
raises an exception. For example:
# No longer works (and never should have).
message.some_repeated_field.foo = 1
Diffstat (limited to 'java/pom.xml')
-rw-r--r-- | java/pom.xml | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/java/pom.xml b/java/pom.xml index de27241f..eb1b31b5 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -3,11 +3,12 @@ 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> + <!-- remove the reference to the parent until the google repo is synced with central --> + <!--<parent> <groupId>com.google</groupId> <artifactId>google</artifactId> <version>1</version> - </parent> + </parent>--> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> <version>2.0.2-SNAPSHOT</version> @@ -21,8 +22,8 @@ <url>http://code.google.com/p/protobuf</url> <licenses> <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>New BSD license</name> + <url>http://www.opensource.org/licenses/bsd-license.php</url> <distribution>repo</distribution> </license> </licenses> @@ -32,6 +33,20 @@ scm:svn:http://protobuf.googlecode.com/svn/trunk/ </connection> </scm> + <!-- this is temporarily copied from the parent pom. remove this section when that is used --> + <distributionManagement> + <repository> + <id>google-maven-repository</id> + <name>Google Maven Repository</name> + <url>https://google-maven-repository.googlecode.com/svn/trunk/repository/</url> + </repository> + <snapshotRepository> + <id>google-maven-snapshot-repository</id> + <name>Google Maven Snapshot Repository</name> + <url>https://google-maven-repository.googlecode.com/svn/trunk/snapshot-repository/</url> + <uniqueVersion>true</uniqueVersion> + </snapshotRepository> + </distributionManagement> <dependencies> <dependency> <groupId>junit</groupId> @@ -107,6 +122,8 @@ value="src/test/java/com/google/protobuf/multiple_files_test.proto" /> <arg value="../src/google/protobuf/unittest_optimize_for.proto" /> + <arg + value="../src/google/protobuf/unittest_custom_options.proto" /> </exec> </tasks> <testSourceRoot>target/generated-test-sources</testSourceRoot> |