Set version to 1.1.0-dev in master (elastic#351)

kgeller · Mar 4, 2019 · 26ede93 · 26ede93
1 parent ca9d77f
commit 26ede93
Show file tree

Hide file tree

Showing 15 changed files with 286 additions and 295 deletions.
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ FIND             := find . -type f -not -path './build/*' -not -path './.git/*'
 FORCE_GO_MODULES := GO111MODULE=on
 OPEN_DOCS        ?= "-open"
 PYTHON           := build/ve/bin/python
-VERSION          ?= 1.0.0-beta2
+VERSION          := $(shell cat version)
 
 #
 # Targets (sorted alphabetically)

diff --git a/README.md b/README.md
@@ -190,7 +190,7 @@ Meta-information specific to ECS.
 
 | Field  | Description  | Level  | Type  | Example  |
 |---|---|---|---|---|
-| <a name="ecs.version"></a>ecs.version | ECS version this event conforms to. `ecs.version` is a required field and must exist in all events.<br/>When querying across multiple indices -- which may conform to slightly different ECS versions -- this field lets integrations adjust to the schema version of the events.<br/>The current version is 1.0.0-beta2. | core | keyword | `1.0.0-beta2` |
+| <a name="ecs.version"></a>ecs.version | ECS version this event conforms to. `ecs.version` is a required field and must exist in all events.<br/>When querying across multiple indices -- which may conform to slightly different ECS versions -- this field lets integrations adjust to the schema version of the events. | core | keyword | `1.0.0` |
 
 
 ## <a name="error"></a> Error fields

diff --git a/code/go/ecs/ecs.go b/code/go/ecs/ecs.go
diff --git a/code/go/ecs/version.go b/code/go/ecs/version.go
diff --git a/fields.yml b/fields.yml
@@ -409,9 +409,7 @@
             When querying across multiple indices -- which may conform to slightly
             different ECS versions -- this field lets integrations adjust to the
             schema version of the events.
-
-            The current version is 1.0.0-beta2.
-          example: 1.0.0-beta2
+          example: 1.0.0
 
     - name: error
       title: Error

diff --git a/generated/csv/fields.csv b/generated/csv/fields.csv
diff --git a/generated/ecs/fields_flat.yml b/generated/ecs/fields_flat.yml
@@ -589,10 +589,8 @@ ecs.version:
 
     When querying across multiple indices -- which may conform to slightly different
     ECS versions -- this field lets integrations adjust to the schema version of the
-    events.
-
-    The current version is 1.0.0-beta2.'
-  example: 1.0.0-beta2
+    events.'
+  example: 1.0.0
   flat_name: ecs.version
   ignore_above: 1024
   level: core

diff --git a/generated/ecs/fields_nested.yml b/generated/ecs/fields_nested.yml
@@ -451,10 +451,8 @@ ecs:
 
         When querying across multiple indices -- which may conform to slightly different
         ECS versions -- this field lets integrations adjust to the schema version
-        of the events.
-
-        The current version is 1.0.0-beta2.'
-      example: 1.0.0-beta2
+        of the events.'
+      example: 1.0.0
       flat_name: ecs.version
       ignore_above: 1024
       level: core

diff --git a/generated/elasticsearch/6/template.json b/generated/elasticsearch/6/template.json
@@ -5,7 +5,7 @@
   "mappings": {
     "_doc": {
       "_meta": {
-        "version": "1.0.0-beta2"
+        "version": "1.1.0-dev"
       }, 
       "date_detection": false, 
       "dynamic_templates": [

diff --git a/generated/elasticsearch/7/template.json b/generated/elasticsearch/7/template.json
@@ -4,7 +4,7 @@
   ], 
   "mappings": {
     "_meta": {
-      "version": "1.0.0-beta2"
+      "version": "1.1.0-dev"
     }, 
     "date_detection": false, 
     "dynamic_templates": [

diff --git a/generated/legacy/schema.csv b/generated/legacy/schema.csv
@@ -35,7 +35,7 @@ destination.ip,ip,core,
 destination.mac,keyword,core,
 destination.packets,long,core,12
 destination.port,long,core,
-ecs.version,keyword,core,1.0.0-beta2
+ecs.version,keyword,core,1.0.0
 error.code,keyword,core,
 error.id,keyword,core,
 error.message,text,core,

diff --git a/generated/legacy/template.json b/generated/legacy/template.json
@@ -1,11 +1,11 @@
 {
   "index_patterns": [
-    "ecs-1.0.0-beta2-*"
+    "ecs-1.1.0-dev-*"
   ],
   "mappings": {
     "_doc": {
       "_meta": {
-        "version": "1.0.0-beta2"
+        "version": "1.1.0-dev"
       },
       "date_detection": false,
       "dynamic_templates": [

diff --git a/schema.json b/schema.json
@@ -417,8 +417,8 @@
     "description": "Meta-information specific to ECS.\n", 
     "fields": {
       "ecs.version": {
-        "description": "ECS version this event conforms to. `ecs.version` is a required field and must exist in all events.\nWhen querying across multiple indices -- which may conform to slightly different ECS versions -- this field lets integrations adjust to the schema version of the events.\nThe current version is 1.0.0-beta2.", 
-        "example": "1.0.0-beta2", 
+        "description": "ECS version this event conforms to. `ecs.version` is a required field and must exist in all events.\nWhen querying across multiple indices -- which may conform to slightly different ECS versions -- this field lets integrations adjust to the schema version of the events.", 
+        "example": "1.0.0", 
         "footnote": "", 
         "group": 2, 
         "level": "core", 

diff --git a/schemas/ecs.yml b/schemas/ecs.yml
@@ -18,6 +18,4 @@
         When querying across multiple indices -- which may conform to slightly
         different ECS versions -- this field lets integrations adjust to the
         schema version of the events.
-
-        The current version is 1.0.0-beta2.
-      example: 1.0.0-beta2
+      example: 1.0.0
diff --git a/version b/version
@@ -1 +1 @@
-1.0.0-beta2
+1.1.0-dev