Merge pull request #386 from cneijenhuis/uri-reference-cleanup

Consistency: schemaurl uses URI-reference, protobuf uses URI-reference

protobuf-format.md

@@ -78,15 +78,15 @@ The CloudEvents type system MUST be mapped into the fields of
 `CloudEventAny` as follows:
 
 
-| CloudEvents  | CloudEventAny field
-|--------------|-------------------------------------------------------------
-| String       | string_value
-| Binary       | binary_value
-| URI          | string_value (string expression conforming to URI-reference as defined in [RFC 3986 §4.1](https://tools.ietf.org/html/rfc3986#section-4.1))
-| Timestamp    | string_value (string expression as defined in [RFC 3339](https://tools.ietf.org/html/rfc3339))
-| Map          | map_value
-| Integer      | int_value
-| Any          | Not applicable. Any is the enclosing CloudEventAny message itself
+| CloudEvents   | CloudEventAny field
+|---------------|-------------------------------------------------------------
+| String        | string_value
+| Binary        | binary_value
+| URI-reference | string_value (string expression conforming to URI-reference as defined in [RFC 3986 §4.1](https://tools.ietf.org/html/rfc3986#section-4.1))
+| Timestamp     | string_value (string expression as defined in [RFC 3339](https://tools.ietf.org/html/rfc3339))
+| Map           | map_value
+| Integer       | int_value
+| Any           | Not applicable. Any is the enclosing CloudEventAny message itself
 
 Protocol Buffer representations of CloudEvents MUST use the media type `application/cloudevents+proto`.
 

spec.json

@@ -62,7 +62,7 @@
     },
     "schemaurl": {
       "type": "string",
-      "format": "uri"
+      "format": "uri-reference"
     },
     "type": {
       "type": "string",

spec.md

@@ -235,16 +235,14 @@ help intermediate gateways determine how to route the events.
     [RFC 3339](https://tools.ietf.org/html/rfc3339)
 
 ### schemaurl
-* Type: `URI`
+* Type: `URI-reference`
 * Description: A link to the schema that the `data` attribute adheres to.
   Incompatible changes to the schema SHOULD be reflected by a different URL.
   See
   [Versioning of Attributes in the Primer](primer.md#versioning-of-attributes)
   for more information.
 * Constraints:
   * OPTIONAL
-  * If present, MUST adhere to the format specified in
-    [RFC 3986](https://tools.ietf.org/html/rfc3986)
 
 ### datacontenttype
 * Type: `String` per [RFC 2046](https://tools.ietf.org/html/rfc2046)