diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc
index f64fb1b7..33ae7bc9 100644
--- a/CODE_OF_CONDUCT.adoc
+++ b/CODE_OF_CONDUCT.adoc
@@ -24,4 +24,4 @@ Instances of abusive, harassing, or otherwise unacceptable behavior may be repor
All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
-This Code of Conduct is adapted from the http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/].
\ No newline at end of file
+This Code of Conduct is adapted from the https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/].
\ No newline at end of file
diff --git a/README.adoc b/README.adoc
index f8e653c4..d333dbb5 100644
--- a/README.adoc
+++ b/README.adoc
@@ -74,7 +74,7 @@ the appropriate dependency version.
spring-libs-snapshot
Spring Snapshot Repository
- http://repo.spring.io/libs-snapshot
+ https://repo.spring.io/libs-snapshot
----
diff --git a/src/integration/resources/configurations/couchbase-consistency.xml b/src/integration/resources/configurations/couchbase-consistency.xml
index 735de4bb..1dbc757e 100644
--- a/src/integration/resources/configurations/couchbase-consistency.xml
+++ b/src/integration/resources/configurations/couchbase-consistency.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/data/couchbase https://www.springframework.org/schema/data/couchbase/spring-couchbase.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/src/integration/resources/configurations/couchbase-multi-bucket-bean.xml b/src/integration/resources/configurations/couchbase-multi-bucket-bean.xml
index a5552ccd..7d0e057a 100644
--- a/src/integration/resources/configurations/couchbase-multi-bucket-bean.xml
+++ b/src/integration/resources/configurations/couchbase-multi-bucket-bean.xml
@@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:couchbase="http://www.springframework.org/schema/data/couchbase"
xmlns:data-repository="http://www.springframework.org/schema/data/repository"
- xsi:schemaLocation="http://www.springframework.org/schema/data/couchbase http://www.springframework.org/schema/data/couchbase/spring-couchbase.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/data/repository http://www.springframework.org/schema/data/repository/spring-repository.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/data/couchbase https://www.springframework.org/schema/data/couchbase/spring-couchbase.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/data/repository https://www.springframework.org/schema/data/repository/spring-repository.xsd">
diff --git a/src/integration/resources/configurations/couchbase-repository-bean.xml b/src/integration/resources/configurations/couchbase-repository-bean.xml
index 55769b35..6a1730fe 100644
--- a/src/integration/resources/configurations/couchbase-repository-bean.xml
+++ b/src/integration/resources/configurations/couchbase-repository-bean.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/data/couchbase https://www.springframework.org/schema/data/couchbase/spring-couchbase.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/src/integration/resources/configurations/couchbase-template-bean.xml b/src/integration/resources/configurations/couchbase-template-bean.xml
index 99c5845d..80068b1b 100644
--- a/src/integration/resources/configurations/couchbase-template-bean.xml
+++ b/src/integration/resources/configurations/couchbase-template-bean.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/data/couchbase https://www.springframework.org/schema/data/couchbase/spring-couchbase.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/src/integration/resources/configurations/couchbase-template-with-translation-service-bean.xml b/src/integration/resources/configurations/couchbase-template-with-translation-service-bean.xml
index 9690d792..6adfbfb1 100644
--- a/src/integration/resources/configurations/couchbase-template-with-translation-service-bean.xml
+++ b/src/integration/resources/configurations/couchbase-template-with-translation-service-bean.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/data/couchbase https://www.springframework.org/schema/data/couchbase/spring-couchbase.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/src/integration/resources/configurations/couchbase-typekey.xml b/src/integration/resources/configurations/couchbase-typekey.xml
index 1a1f7056..b21f92b0 100644
--- a/src/integration/resources/configurations/couchbase-typekey.xml
+++ b/src/integration/resources/configurations/couchbase-typekey.xml
@@ -2,8 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/data/couchbase https://www.springframework.org/schema/data/couchbase/spring-couchbase.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/src/main/asciidoc/configuration.adoc b/src/main/asciidoc/configuration.adoc
index 3a8a31e1..77749106 100644
--- a/src/main/asciidoc/configuration.adoc
+++ b/src/main/asciidoc/configuration.adoc
@@ -22,7 +22,7 @@ All versions intended for production use are distributed across Maven Central an
This will pull in several dependencies, including the underlying Couchbase Java SDK, common Spring dependencies and also Jackson as the JSON mapping infrastructure.
-You can also grab snapshots from the http://repo.spring.io/libs-snapshot[spring snapshot repository] and milestone releases from the http://repo.spring.io/libs-milestone[milestone repository]. Here is an example on how to use the current SNAPSHOT dependency:
+You can also grab snapshots from the https://repo.spring.io/libs-snapshot[spring snapshot repository] and milestone releases from the https://repo.spring.io/libs-milestone[milestone repository]. Here is an example on how to use the current SNAPSHOT dependency:
.Using a snapshot version
====
@@ -105,9 +105,9 @@ The library provides a custom namespace that you can use in your XML configurati
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://www.springframework.org/schema/data/couchbase
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
+ https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/data/couchbase
- http://www.springframework.org/schema/data/couchbase/spring-couchbase.xsd">
+ https://www.springframework.org/schema/data/couchbase/spring-couchbase.xsd">
127.0.0.1
diff --git a/src/main/asciidoc/template.adoc b/src/main/asciidoc/template.adoc
index c04d0f23..5374165e 100644
--- a/src/main/asciidoc/template.adoc
+++ b/src/main/asciidoc/template.adoc
@@ -32,8 +32,8 @@ The template can be configured via xml, including setting a custom `TranslationS
+ xsi:schemaLocation="http://www.springframework.org/schema/data/couchbase https://www.springframework.org/schema/data/couchbase/spring-couchbase.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/src/main/resources/META-INF/spring.schemas b/src/main/resources/META-INF/spring.schemas
index 6b43469e..3a07bfb9 100644
--- a/src/main/resources/META-INF/spring.schemas
+++ b/src/main/resources/META-INF/spring.schemas
@@ -1,4 +1,4 @@
-http\://www.springframework.org/schema/data/couchbase/spring-couchbase-1.0.xsd=org/springframework/data/couchbase/config/spring-couchbase-1.0.xsd
-http\://www.springframework.org/schema/data/couchbase/spring-couchbase-2.0.xsd=org/springframework/data/couchbase/config/spring-couchbase-2.0.xsd
-http\://www.springframework.org/schema/data/couchbase/spring-couchbase-env-2.0.xsd=org/springframework/data/couchbase/config/spring-couchbase-env-2.0.xsd
-http\://www.springframework.org/schema/data/couchbase/spring-couchbase.xsd=org/springframework/data/couchbase/config/spring-couchbase-2.0.xsd
\ No newline at end of file
+https\://www.springframework.org/schema/data/couchbase/spring-couchbase-1.0.xsd=org/springframework/data/couchbase/config/spring-couchbase-1.0.xsd
+https\://www.springframework.org/schema/data/couchbase/spring-couchbase-2.0.xsd=org/springframework/data/couchbase/config/spring-couchbase-2.0.xsd
+https\://www.springframework.org/schema/data/couchbase/spring-couchbase-env-2.0.xsd=org/springframework/data/couchbase/config/spring-couchbase-env-2.0.xsd
+https\://www.springframework.org/schema/data/couchbase/spring-couchbase.xsd=org/springframework/data/couchbase/config/spring-couchbase-2.0.xsd
\ No newline at end of file
diff --git a/src/main/resources/license.txt b/src/main/resources/license.txt
index 682d127a..964a55d1 100644
--- a/src/main/resources/license.txt
+++ b/src/main/resources/license.txt
@@ -207,7 +207,7 @@ similar licenses that require the source code and/or modifications to
source code to be made available (as would be noted above), you may obtain a
copy of the source code corresponding to the binaries for such open source
components and modifications thereto, if any, (the "Source Files"), by
-downloading the Source Files from http://www.springsource.org/download,
+downloading the Source Files from https://www.springsource.org/download,
or by sending a request, with your name and address to: VMware, Inc., 3401 Hillview
Avenue, Palo Alto, CA 94304, United States of America or email info@vmware.com. All
such requests should clearly specify: OPEN SOURCE FILES REQUEST, Attention General
diff --git a/src/main/resources/org/springframework/data/couchbase/config/spring-couchbase-1.0.xsd b/src/main/resources/org/springframework/data/couchbase/config/spring-couchbase-1.0.xsd
index 4c6a998b..ac8f004d 100644
--- a/src/main/resources/org/springframework/data/couchbase/config/spring-couchbase-1.0.xsd
+++ b/src/main/resources/org/springframework/data/couchbase/config/spring-couchbase-1.0.xsd
@@ -9,7 +9,7 @@
-
+
diff --git a/src/main/resources/org/springframework/data/couchbase/config/spring-couchbase-2.0.xsd b/src/main/resources/org/springframework/data/couchbase/config/spring-couchbase-2.0.xsd
index b0673cca..523987e3 100644
--- a/src/main/resources/org/springframework/data/couchbase/config/spring-couchbase-2.0.xsd
+++ b/src/main/resources/org/springframework/data/couchbase/config/spring-couchbase-2.0.xsd
@@ -10,7 +10,7 @@
-
+
diff --git a/src/test/resources/configurations/couchbaseBucket-bean.xml b/src/test/resources/configurations/couchbaseBucket-bean.xml
index 31b9393e..d38d1c0c 100644
--- a/src/test/resources/configurations/couchbaseBucket-bean.xml
+++ b/src/test/resources/configurations/couchbaseBucket-bean.xml
@@ -2,9 +2,9 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/data/couchbase https://www.springframework.org/schema/data/couchbase/spring-couchbase.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
diff --git a/src/test/resources/configurations/couchbaseCluster-bean.xml b/src/test/resources/configurations/couchbaseCluster-bean.xml
index 2ad55028..141004ff 100644
--- a/src/test/resources/configurations/couchbaseCluster-bean.xml
+++ b/src/test/resources/configurations/couchbaseCluster-bean.xml
@@ -2,9 +2,9 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/data/couchbase https://www.springframework.org/schema/data/couchbase/spring-couchbase.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
diff --git a/src/test/resources/configurations/couchbaseEnv-bean.xml b/src/test/resources/configurations/couchbaseEnv-bean.xml
index 975cf2fb..2916df65 100644
--- a/src/test/resources/configurations/couchbaseEnv-bean.xml
+++ b/src/test/resources/configurations/couchbaseEnv-bean.xml
@@ -2,9 +2,9 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/data/couchbase https://www.springframework.org/schema/data/couchbase/spring-couchbase.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
diff --git a/src/test/resources/configurations/couchbaseSingleEnv-bean.xml b/src/test/resources/configurations/couchbaseSingleEnv-bean.xml
index a200252c..83ca59e2 100644
--- a/src/test/resources/configurations/couchbaseSingleEnv-bean.xml
+++ b/src/test/resources/configurations/couchbaseSingleEnv-bean.xml
@@ -2,9 +2,9 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/data/couchbase https://www.springframework.org/schema/data/couchbase/spring-couchbase.xsd
+ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">