Merge commit 'da5b73d6273fcb8c2aa59fe057f41f4d5f910f07'

* commit 'da5b73d6273fcb8c2aa59fe057f41f4d5f910f07':
  Squashed 'json/' changes from 33791274..8e2a05a9

9 files changed, 36 insertions, 11 deletions

diff --git a/json/test-schema.json b/json/test-schema.json
index 801d96b..670d280 100644
--- a/json/test-schema.json
+++ b/json/test-schema.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-04/schema#",
     "definitions": {
         "outputItem": {
             "type": "object",
diff --git a/json/tests/draft2019-09/ref.json b/json/tests/draft2019-09/ref.json
index 5b6ee16..c4161d5 100644
--- a/json/tests/draft2019-09/ref.json
+++ b/json/tests/draft2019-09/ref.json
@@ -357,5 +357,30 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "ref creates new scope when adjacent to keywords",
+        "schema": {
+            "$defs": {
+                "A": {
+                    "unevaluatedProperties": false
+                }
+            },
+            "properties": {
+                "prop1": {
+                    "type": "string"
+                }
+            },
+            "$ref": "#/$defs/A"
+        },
+        "tests": [
+            {
+                "description": "referenced subschema doesn't see annoations from properties",
+                "data": {
+                    "prop1": "match"
+                },
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/json/tests/draft3/ref.json b/json/tests/draft3/ref.json
index 9279af6..31414ad 100644
--- a/json/tests/draft3/ref.json
+++ b/json/tests/draft3/ref.json
@@ -175,7 +175,7 @@
     },
     {
         "description": "remote ref, containing refs itself",
-        "schema": {"$ref": "https://json-schema.org/draft-03/schema#"},
+        "schema": {"$ref": "http://json-schema.org/draft-03/schema#"},
         "tests": [
             {
                 "description": "remote ref valid",
diff --git a/json/tests/draft4/definitions.json b/json/tests/draft4/definitions.json
index 6afb629..cf935a3 100644
--- a/json/tests/draft4/definitions.json
+++ b/json/tests/draft4/definitions.json
@@ -1,7 +1,7 @@
 [
     {
         "description": "valid definition",
-        "schema": {"$ref": "https://json-schema.org/draft-04/schema#"},
+        "schema": {"$ref": "http://json-schema.org/draft-04/schema#"},
         "tests": [
             {
                 "description": "valid definition schema",
@@ -16,7 +16,7 @@
     },
     {
         "description": "invalid definition",
-        "schema": {"$ref": "https://json-schema.org/draft-04/schema#"},
+        "schema": {"$ref": "http://json-schema.org/draft-04/schema#"},
         "tests": [
             {
                 "description": "invalid definition schema",
diff --git a/json/tests/draft4/ref.json b/json/tests/draft4/ref.json
index 044583e..51e750f 100644
--- a/json/tests/draft4/ref.json
+++ b/json/tests/draft4/ref.json
@@ -175,7 +175,7 @@
     },
     {
         "description": "remote ref, containing refs itself",
-        "schema": {"$ref": "https://json-schema.org/draft-04/schema#"},
+        "schema": {"$ref": "http://json-schema.org/draft-04/schema#"},
         "tests": [
             {
                 "description": "remote ref valid",
diff --git a/json/tests/draft6/definitions.json b/json/tests/draft6/definitions.json
index 5af5124..7f3b899 100644
--- a/json/tests/draft6/definitions.json
+++ b/json/tests/draft6/definitions.json
@@ -1,7 +1,7 @@
 [
     {
         "description": "valid definition",
-        "schema": {"$ref": "https://json-schema.org/draft-06/schema#"},
+        "schema": {"$ref": "http://json-schema.org/draft-06/schema#"},
         "tests": [
             {
                 "description": "valid definition schema",
@@ -16,7 +16,7 @@
     },
     {
         "description": "invalid definition",
-        "schema": {"$ref": "https://json-schema.org/draft-06/schema#"},
+        "schema": {"$ref": "http://json-schema.org/draft-06/schema#"},
         "tests": [
             {
                 "description": "invalid definition schema",
diff --git a/json/tests/draft6/ref.json b/json/tests/draft6/ref.json
index 649cb6b..53f3a9e 100644
--- a/json/tests/draft6/ref.json
+++ b/json/tests/draft6/ref.json
@@ -175,7 +175,7 @@
     },
     {
         "description": "remote ref, containing refs itself",
-        "schema": {"$ref": "https://json-schema.org/draft-06/schema#"},
+        "schema": {"$ref": "http://json-schema.org/draft-06/schema#"},
         "tests": [
             {
                 "description": "remote ref valid",
diff --git a/json/tests/draft7/definitions.json b/json/tests/draft7/definitions.json
index e275a92..4360406 100644
--- a/json/tests/draft7/definitions.json
+++ b/json/tests/draft7/definitions.json
@@ -1,7 +1,7 @@
 [
     {
         "description": "valid definition",
-        "schema": {"$ref": "https://json-schema.org/draft-07/schema#"},
+        "schema": {"$ref": "http://json-schema.org/draft-07/schema#"},
         "tests": [
             {
                 "description": "valid definition schema",
@@ -16,7 +16,7 @@
     },
     {
         "description": "invalid definition",
-        "schema": {"$ref": "https://json-schema.org/draft-07/schema#"},
+        "schema": {"$ref": "http://json-schema.org/draft-07/schema#"},
         "tests": [
             {
                 "description": "invalid definition schema",
diff --git a/json/tests/draft7/ref.json b/json/tests/draft7/ref.json
index a3c79bd..44b8ed2 100644
--- a/json/tests/draft7/ref.json
+++ b/json/tests/draft7/ref.json
@@ -175,7 +175,7 @@
     },
     {
         "description": "remote ref, containing refs itself",
-        "schema": {"$ref": "https://json-schema.org/draft-07/schema#"},
+        "schema": {"$ref": "http://json-schema.org/draft-07/schema#"},
         "tests": [
             {
                 "description": "remote ref valid",