diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc index 795a9624..d5e71781 100644 --- a/CODE_OF_CONDUCT.adoc +++ b/CODE_OF_CONDUCT.adoc @@ -40,5 +40,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden 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 +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/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 315b2d62..3ccee367 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -10,7 +10,7 @@ unacceptable behavior to spring-code-of-conduct@pivotal.io. == Using GitHub issues We use GitHub issues to track bugs and enhancements. If you have a general usage question -please ask on http://stackoverflow.com[Stack Overflow] or join us on the +please ask on https://stackoverflow.com[Stack Overflow] or join us on the https://gitter.im/spring-io/initializr[Gitter channel]. == Sign the Contributor License Agreement @@ -38,7 +38,7 @@ added after the original pull request but before a merge. * A few unit tests would help a lot as well -- someone has to do it. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). -* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). @@ -50,7 +50,7 @@ added after the original pull request but before a merge. === Building from Source Spring Initializer source can be build from the command line using -http://maven.apache.org/run-maven/index.html[Apache Maven] on JDK 1.8 or above. +https://maven.apache.org/run-maven/index.html[Apache Maven] on JDK 1.8 or above. We include '`Maven Wrapper`' scripts (`./mvnw` or `mvnw.bat`) that you can run rather than needing to install Maven locally. diff --git a/LICENSE.txt b/LICENSE.txt index ff9ad453..62589edd 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,7 +1,7 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION diff --git a/README.adoc b/README.adoc index f3f7a1bf..e71582cd 100644 --- a/README.adoc +++ b/README.adoc @@ -1,8 +1,8 @@ = Spring Initializr image:https://ci.spring.io/api/v1/teams/initializr/pipelines/initializr/jobs/build/badge["Build Status", link="https://ci.spring.io/teams/initializr/pipelines/initializr?groups=Build"] image:https://badges.gitter.im/spring-io/initializr.svg[link="https://gitter.im/spring-io/initializr?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"] -:boot-doc: http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle +:boot-doc: https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle :code: https://github.com/spring-io/initializr/blob/master -:docs: http://docs.spring.io/initializr/docs/current-SNAPSHOT/reference +:docs: https://docs.spring.io/initializr/docs/current-SNAPSHOT/reference :service: https://github.com/spring-io/start.spring.io Spring Initializr provides an extensible API to generate quickstart projects. It also diff --git a/eclipse/org.eclipse.jdt.ui.prefs b/eclipse/org.eclipse.jdt.ui.prefs index de463c28..51ab39fe 100644 --- a/eclipse/org.eclipse.jdt.ui.prefs +++ b/eclipse/org.eclipse.jdt.ui.prefs @@ -70,7 +70,7 @@ org.eclipse.jdt.ui.keywordthis=false org.eclipse.jdt.ui.ondemandthreshold=9999 org.eclipse.jdt.ui.overrideannotation=true org.eclipse.jdt.ui.staticondemandthreshold=9999 -org.eclipse.jdt.ui.text.custom_code_templates= +org.eclipse.jdt.ui.text.custom_code_templates= sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=true diff --git a/initializr-actuator/pom.xml b/initializr-actuator/pom.xml index cae41104..c73a6021 100644 --- a/initializr-actuator/pom.xml +++ b/initializr-actuator/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 io.spring.initializr diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisherTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisherTests.java index 95054083..a2ff1829 100755 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisherTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisherTests.java @@ -89,11 +89,11 @@ class ProjectGenerationStatPublisherTests { @Test void publishDocumentWithUserNameAndPassword() { StatsProperties properties = new StatsProperties(); - properties.getElastic().setUri("http://example.com/elastic"); + properties.getElastic().setUri("https://example.com/elastic"); properties.getElastic().setUsername("foo"); properties.getElastic().setPassword("bar"); configureService(properties); - testAuthorization("http://example.com/elastic/initializr/request", + testAuthorization("https://example.com/elastic/initializr/request", header("Authorization", "Basic Zm9vOmJhcg==")); } @@ -152,7 +152,7 @@ class ProjectGenerationStatPublisherTests { request.getParameters().put("cf-connecting-ip", "10.0.0.42"); request.getParameters().put("cf-ipcountry", "BE"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request, this.metadata); - this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) + this.mockServer.expect(requestTo("https://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)).andExpect(json("stat/request-simple.json", event.getTimestamp())) .andRespond(withStatus(HttpStatus.CREATED).body(mockResponse(UUID.randomUUID().toString(), true)) .contentType(MediaType.APPLICATION_JSON)); @@ -171,7 +171,7 @@ class ProjectGenerationStatPublisherTests { request.setDependencies(Arrays.asList("web", "data-jpa")); request.setLanguage("java"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request, this.metadata); - this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) + this.mockServer.expect(requestTo("https://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)).andExpect(json("stat/request-no-client.json", event.getTimestamp())) .andRespond(withStatus(HttpStatus.CREATED).body(mockResponse(UUID.randomUUID().toString(), true)) .contentType(MediaType.APPLICATION_JSON)); @@ -190,7 +190,7 @@ class ProjectGenerationStatPublisherTests { request.setDependencies(Arrays.asList("web", "data-jpa")); request.setLanguage("java"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request, this.metadata); - this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) + this.mockServer.expect(requestTo("https://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)) .andExpect(json("stat/request-invalid-type.json", event.getTimestamp())) .andRespond(withStatus(HttpStatus.CREATED).body(mockResponse(UUID.randomUUID().toString(), true)) @@ -210,7 +210,7 @@ class ProjectGenerationStatPublisherTests { request.setDependencies(Arrays.asList("web", "data-jpa")); request.setLanguage("c"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request, this.metadata); - this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) + this.mockServer.expect(requestTo("https://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)) .andExpect(json("stat/request-invalid-language.json", event.getTimestamp())) .andRespond(withStatus(HttpStatus.CREATED).body(mockResponse(UUID.randomUUID().toString(), true)) @@ -231,7 +231,7 @@ class ProjectGenerationStatPublisherTests { request.setLanguage("java"); request.setJavaVersion("1.2"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request, this.metadata); - this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) + this.mockServer.expect(requestTo("https://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)) .andExpect(json("stat/request-invalid-java-version.json", event.getTimestamp())) .andRespond(withStatus(HttpStatus.CREATED).body(mockResponse(UUID.randomUUID().toString(), true)) @@ -251,7 +251,7 @@ class ProjectGenerationStatPublisherTests { request.setDependencies(Arrays.asList("invalid-2", "web", "invalid-1")); request.setLanguage("java"); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request, this.metadata); - this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) + this.mockServer.expect(requestTo("https://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)) .andExpect(json("stat/request-invalid-dependencies.json", event.getTimestamp())) .andRespond(withStatus(HttpStatus.CREATED).body(mockResponse(UUID.randomUUID().toString(), true)) @@ -265,13 +265,13 @@ class ProjectGenerationStatPublisherTests { void recoverFromError() { ProjectRequest request = createProjectRequest(); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request, this.metadata); - this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) + this.mockServer.expect(requestTo("https://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)).andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR)); - this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) + this.mockServer.expect(requestTo("https://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)).andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR)); - this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) + this.mockServer.expect(requestTo("https://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)) .andRespond(withStatus(HttpStatus.CREATED).body(mockResponse(UUID.randomUUID().toString(), true)) .contentType(MediaType.APPLICATION_JSON)); @@ -286,10 +286,10 @@ class ProjectGenerationStatPublisherTests { ProjectGeneratedEvent event = new ProjectGeneratedEvent(request, this.metadata); this.retryTemplate.setRetryPolicy(new SimpleRetryPolicy(2, Collections.singletonMap(Exception.class, true))); - this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) + this.mockServer.expect(requestTo("https://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)).andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR)); - this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request")) + this.mockServer.expect(requestTo("https://example.com/elastic/initializr/request")) .andExpect(method(HttpMethod.POST)).andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR)); this.statPublisher.handleEvent(event); @@ -310,7 +310,7 @@ class ProjectGenerationStatPublisherTests { private static StatsProperties createProperties() { StatsProperties properties = new StatsProperties(); Elastic elastic = properties.getElastic(); - elastic.setUri("http://example.com/elastic"); + elastic.setUri("https://example.com/elastic"); return properties; } diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/StatsPropertiesTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/StatsPropertiesTests.java index d01ab693..6b50c2d2 100755 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/StatsPropertiesTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/StatsPropertiesTests.java @@ -31,8 +31,8 @@ class StatsPropertiesTests { @Test void cleanTrailingSlash() { - this.properties.getElastic().setUri("http://example.com/"); - assertThat(this.properties.getElastic().getUri()).isEqualTo("http://example.com"); + this.properties.getElastic().setUri("https://example.com/"); + assertThat(this.properties.getElastic().getUri()).isEqualTo("https://example.com"); } } diff --git a/initializr-bom/pom.xml b/initializr-bom/pom.xml index 09cb3c77..77ba8553 100644 --- a/initializr-bom/pom.xml +++ b/initializr-bom/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 io.spring.initializr diff --git a/initializr-docs/pom.xml b/initializr-docs/pom.xml index 1a61c2ac..a91d9ca4 100644 --- a/initializr-docs/pom.xml +++ b/initializr-docs/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 io.spring.initializr diff --git a/initializr-docs/src/main/asciidoc/configuration-guide.adoc b/initializr-docs/src/main/asciidoc/configuration-guide.adoc index 50b6a6e6..177d392d 100644 --- a/initializr-docs/src/main/asciidoc/configuration-guide.adoc +++ b/initializr-docs/src/main/asciidoc/configuration-guide.adoc @@ -354,7 +354,7 @@ defaults can be overridden as shown below: [[create-instance-boot-versions]] === Configuring available Spring Boot versions -If you look at http://projects.spring.io/spring-boot[the project home page for Spring +If you look at https://projects.spring.io/spring-boot[the project home page for Spring Boot], the latest versions are displayed. And you've probably noticed that they match the drop down list that you automatically get with a default instance of Spring Initializr. The reason for that is that Spring Initializr calls an API on https://spring.io to @@ -592,7 +592,7 @@ declared at the top level (under `env`) and given an id via the key in the confi repositories: my-api-repo-1: name: repo1 - url: http://example.com/repo1 + url: https://example.com/repo1 ---- Once defined, the repository can then be referred back to in a dependency @@ -789,7 +789,7 @@ Here is an example that adds two links to the `acme` dependency: href: https://com.example/guides/acme/ description: Getting started with Acme - rel: reference - href: http://docs.example.com/acme/html + href: https://docs.example.com/acme/html ---- diff --git a/initializr-docs/src/main/asciidoc/index.adoc b/initializr-docs/src/main/asciidoc/index.adoc index f0f6c7cf..d51b869c 100644 --- a/initializr-docs/src/main/asciidoc/index.adoc +++ b/initializr-docs/src/main/asciidoc/index.adoc @@ -24,9 +24,9 @@ Stéphane Nicoll; Dave Syer; Madhura Bhave :github-master-code: https://github.com/{github-repo}/tree/master :sc-initializr-generator: {github-code}/initializr-generator/src/main/java/io/spring/initializr :spring-initializr-docs-version: current -:spring-initializr-docs: http://docs.spring.io/initializr/docs/{spring-initializr-docs-version}/reference -:spring-initializr-docs-current: http://docs.spring.io/initializr/docs/current/reference/html -:spring-boot-reference: http://docs.spring.io/spring-boot/docs/{spring-boot-docs-version}/reference/htmlsingle +:spring-initializr-docs: https://docs.spring.io/initializr/docs/{spring-initializr-docs-version}/reference +:spring-initializr-docs-current: https://docs.spring.io/initializr/docs/current/reference/html +:spring-boot-reference: https://docs.spring.io/spring-boot/docs/{spring-boot-docs-version}/reference/htmlsingle // ====================================================================================== diff --git a/initializr-docs/src/main/asciidoc/user-guide.adoc b/initializr-docs/src/main/asciidoc/user-guide.adoc index fbcc72bd..60d2179c 100644 --- a/initializr-docs/src/main/asciidoc/user-guide.adoc +++ b/initializr-docs/src/main/asciidoc/user-guide.adoc @@ -224,7 +224,7 @@ The following IDEs have dedicated support: * Eclipse/STS * IntelliJ IDEA (Ultimate Edition) -* NetBeans (using the http://plugins.netbeans.org/plugin/67888/nb-springboot[NB SpringBoot plugin]) +* NetBeans (using the https://plugins.netbeans.org/plugin/67888/nb-springboot[NB SpringBoot plugin]) * Microsoft VSCode Refer to the documentation of your favorite IDE for more details. diff --git a/initializr-generator-spring/pom.xml b/initializr-generator-spring/pom.xml index e43c678d..13715bf3 100644 --- a/initializr-generator-spring/pom.xml +++ b/initializr-generator-spring/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 io.spring.initializr diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizerTests.java index cb8477b7..71cd64f6 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizerTests.java @@ -59,8 +59,8 @@ class DependencyManagementBuildCustomizerTests { BillOfMaterials bom = BillOfMaterials.create("com.example", "foo-bom", "1.0.0"); bom.getRepositories().add("bar-repo"); InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults().addBom("foo-bom", bom) - .addRepository("foo-repo", "foo-repo", "http://example.com/foo", false) - .addRepository("bar-repo", "bar-repo", "http://example.com/bar", false) + .addRepository("foo-repo", "foo-repo", "https://example.com/foo", false) + .addRepository("bar-repo", "bar-repo", "https://example.com/bar", false) .addDependencyGroup("test", dependency).build(); Build build = createBuild(metadata); build.dependencies().add(dependency.getId()); diff --git a/initializr-generator/pom.xml b/initializr-generator/pom.xml index d5460d70..bfef652a 100644 --- a/initializr-generator/pom.xml +++ b/initializr-generator/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 io.spring.initializr diff --git a/initializr-generator/src/test/resources/application-test-default.yml b/initializr-generator/src/test/resources/application-test-default.yml index b8707f95..3968e931 100644 --- a/initializr-generator/src/test/resources/application-test-default.yml +++ b/initializr-generator/src/test/resources/application-test-default.yml @@ -32,13 +32,13 @@ initializr: repositories: my-api-repo-1: name: repo1 - url: http://example.com/repo1 + url: https://example.com/repo1 my-api-repo-2: name: repo2 - url: http://example.com/repo2 + url: https://example.com/repo2 my-api-repo-3: name: repo3 - url: http://example.com/repo3 + url: https://example.com/repo3 dependencies: - name: Core content: diff --git a/initializr-generator/src/test/resources/metadata/sagan/spring-boot-no-default.json b/initializr-generator/src/test/resources/metadata/sagan/spring-boot-no-default.json index 24ea000e..7c0e34c1 100644 --- a/initializr-generator/src/test/resources/metadata/sagan/spring-boot-no-default.json +++ b/initializr-generator/src/test/resources/metadata/sagan/spring-boot-no-default.json @@ -2,14 +2,14 @@ "id": "spring-boot", "name": "Spring Boot", "repoUrl": "https://github.com/spring-projects/spring-boot", - "siteUrl": "http://projects.spring.io/spring-boot", + "siteUrl": "https://projects.spring.io/spring-boot", "category": "active", "stackOverflowTags": "spring-boot", "projectReleases": [ { "releaseStatus": "SNAPSHOT", - "refDocUrl": "http://docs.spring.io/spring-boot/docs/1.3.1.BUILD-SNAPSHOT/reference/htmlsingle/", - "apiDocUrl": "http://docs.spring.io/spring-boot/docs/1.3.1.BUILD-SNAPSHOT/api/", + "refDocUrl": "https://docs.spring.io/spring-boot/docs/1.3.1.BUILD-SNAPSHOT/reference/htmlsingle/", + "apiDocUrl": "https://docs.spring.io/spring-boot/docs/1.3.1.BUILD-SNAPSHOT/api/", "groupId": "org.springframework.boot", "artifactId": "spring-boot", "repository": { @@ -27,8 +27,8 @@ }, { "releaseStatus": "GENERAL_AVAILABILITY", - "refDocUrl": "http://docs.spring.io/spring-boot/docs/1.3.0.RELEASE/reference/htmlsingle/", - "apiDocUrl": "http://docs.spring.io/spring-boot/docs/1.3.0.RELEASE/api/", + "refDocUrl": "https://docs.spring.io/spring-boot/docs/1.3.0.RELEASE/reference/htmlsingle/", + "apiDocUrl": "https://docs.spring.io/spring-boot/docs/1.3.0.RELEASE/api/", "groupId": "org.springframework.boot", "artifactId": "spring-boot", "repository": null, @@ -41,8 +41,8 @@ }, { "releaseStatus": "SNAPSHOT", - "refDocUrl": "http://docs.spring.io/spring-boot/docs/1.2.6.BUILD-SNAPSHOT/reference/htmlsingle/", - "apiDocUrl": "http://docs.spring.io/spring-boot/docs/1.2.6.BUILD-SNAPSHOT/api/", + "refDocUrl": "https://docs.spring.io/spring-boot/docs/1.2.6.BUILD-SNAPSHOT/reference/htmlsingle/", + "apiDocUrl": "https://docs.spring.io/spring-boot/docs/1.2.6.BUILD-SNAPSHOT/api/", "groupId": "org.springframework.boot", "artifactId": "spring-boot", "repository": { @@ -60,8 +60,8 @@ }, { "releaseStatus": "GENERAL_AVAILABILITY", - "refDocUrl": "http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/", - "apiDocUrl": "http://docs.spring.io/spring-boot/docs/current/api/", + "refDocUrl": "https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/", + "apiDocUrl": "https://docs.spring.io/spring-boot/docs/current/api/", "groupId": "org.springframework.boot", "artifactId": "spring-boot", "repository": null, diff --git a/initializr-generator/src/test/resources/metadata/sagan/spring-boot.json b/initializr-generator/src/test/resources/metadata/sagan/spring-boot.json index 46e57a1d..e0b6c06d 100644 --- a/initializr-generator/src/test/resources/metadata/sagan/spring-boot.json +++ b/initializr-generator/src/test/resources/metadata/sagan/spring-boot.json @@ -2,14 +2,14 @@ "id": "spring-boot", "name": "Spring Boot", "repoUrl": "https://github.com/spring-projects/spring-boot", - "siteUrl": "http://projects.spring.io/spring-boot", + "siteUrl": "https://projects.spring.io/spring-boot", "category": "active", "stackOverflowTags": "spring-boot", "projectReleases": [ { "releaseStatus": "SNAPSHOT", - "refDocUrl": "http://docs.spring.io/spring-boot/docs/1.4.1.BUILD-SNAPSHOT/reference/htmlsingle/", - "apiDocUrl": "http://docs.spring.io/spring-boot/docs/1.4.1.BUILD-SNAPSHOT/api/", + "refDocUrl": "https://docs.spring.io/spring-boot/docs/1.4.1.BUILD-SNAPSHOT/reference/htmlsingle/", + "apiDocUrl": "https://docs.spring.io/spring-boot/docs/1.4.1.BUILD-SNAPSHOT/api/", "groupId": "org.springframework.boot", "artifactId": "spring-boot", "repository": { @@ -27,8 +27,8 @@ }, { "releaseStatus": "GENERAL_AVAILABILITY", - "refDocUrl": "http://docs.spring.io/spring-boot/docs/1.4.0.RELEASE/reference/htmlsingle/", - "apiDocUrl": "http://docs.spring.io/spring-boot/docs/1.4.0.RELEASE/api/", + "refDocUrl": "https://docs.spring.io/spring-boot/docs/1.4.0.RELEASE/reference/htmlsingle/", + "apiDocUrl": "https://docs.spring.io/spring-boot/docs/1.4.0.RELEASE/api/", "groupId": "org.springframework.boot", "artifactId": "spring-boot", "repository": null, @@ -41,8 +41,8 @@ }, { "releaseStatus": "SNAPSHOT", - "refDocUrl": "http://docs.spring.io/spring-boot/docs/1.3.8.BUILD-SNAPSHOT/reference/htmlsingle/", - "apiDocUrl": "http://docs.spring.io/spring-boot/docs/1.3.8.BUILD-SNAPSHOT/api/", + "refDocUrl": "https://docs.spring.io/spring-boot/docs/1.3.8.BUILD-SNAPSHOT/reference/htmlsingle/", + "apiDocUrl": "https://docs.spring.io/spring-boot/docs/1.3.8.BUILD-SNAPSHOT/api/", "groupId": "org.springframework.boot", "artifactId": "spring-boot", "repository": { @@ -60,8 +60,8 @@ }, { "releaseStatus": "GENERAL_AVAILABILITY", - "refDocUrl": "http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/", - "apiDocUrl": "http://docs.spring.io/spring-boot/docs/current/api/", + "refDocUrl": "https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/", + "apiDocUrl": "https://docs.spring.io/spring-boot/docs/current/api/", "groupId": "org.springframework.boot", "artifactId": "spring-boot", "repository": null, diff --git a/initializr-metadata/pom.xml b/initializr-metadata/pom.xml index fb3b3cb9..5e0d3545 100644 --- a/initializr-metadata/pom.xml +++ b/initializr-metadata/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 io.spring.initializr diff --git a/initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrMetadataBuilderTests.java b/initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrMetadataBuilderTests.java index 3ee8edd1..3129ab0a 100755 --- a/initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrMetadataBuilderTests.java +++ b/initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrMetadataBuilderTests.java @@ -120,13 +120,13 @@ class InitializrMetadataBuilderTests { Repository myRepo = repositories.get("my-repo"); assertThat(myRepo).isNotNull(); assertThat(myRepo.getName()).isEqualTo("my repo"); - assertThat(myRepo.getUrl()).isEqualTo(new URL("http://example.com/my")); + assertThat(myRepo.getUrl()).isEqualTo(new URL("https://example.com/my")); assertThat(myRepo.isSnapshotsEnabled()).isEqualTo(true); Repository anotherRepo = repositories.get("another-repo"); assertThat(anotherRepo).isNotNull(); assertThat(anotherRepo.getName()).isEqualTo("another repo"); - assertThat(anotherRepo.getUrl()).isEqualTo(new URL("http://example.com/another")); + assertThat(anotherRepo.getUrl()).isEqualTo(new URL("https://example.com/another")); assertThat(anotherRepo.isSnapshotsEnabled()).isEqualTo(false); } diff --git a/initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrMetadataTests.java b/initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrMetadataTests.java index 0184f228..7e09200f 100755 --- a/initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrMetadataTests.java +++ b/initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrMetadataTests.java @@ -56,7 +56,7 @@ class InitializrMetadataTests { foo.setRepository("foo-repo"); addTestDependencyGroup(metadata, foo); metadata.getConfiguration().getEnv().getRepositories().put("my-repo", - new Repository("repo", new URL("http://example.com/repo"), true)); + new Repository("repo", new URL("https://example.com/repo"), true)); assertThatExceptionOfType(InvalidInitializrMetadataException.class).isThrownBy(metadata::validate) .withMessageContaining("foo-repo").withMessageContaining("my-repo"); } diff --git a/initializr-metadata/src/test/resources/application-test-default.yml b/initializr-metadata/src/test/resources/application-test-default.yml index b8707f95..3968e931 100644 --- a/initializr-metadata/src/test/resources/application-test-default.yml +++ b/initializr-metadata/src/test/resources/application-test-default.yml @@ -32,13 +32,13 @@ initializr: repositories: my-api-repo-1: name: repo1 - url: http://example.com/repo1 + url: https://example.com/repo1 my-api-repo-2: name: repo2 - url: http://example.com/repo2 + url: https://example.com/repo2 my-api-repo-3: name: repo3 - url: http://example.com/repo3 + url: https://example.com/repo3 dependencies: - name: Core content: diff --git a/initializr-metadata/src/test/resources/metadata/config/test-repository.json b/initializr-metadata/src/test/resources/metadata/config/test-repository.json index cc3a30e7..5f0a7879 100644 --- a/initializr-metadata/src/test/resources/metadata/config/test-repository.json +++ b/initializr-metadata/src/test/resources/metadata/config/test-repository.json @@ -4,12 +4,12 @@ "repositories": { "my-repo": { "name": "my repo", - "url": "http://example.com/my", + "url": "https://example.com/my", "snapshotsEnabled": true }, "another-repo": { "name": "another repo", - "url": "http://example.com/another", + "url": "https://example.com/another", "snapshotsEnabled": false } } diff --git a/initializr-parent/pom.xml b/initializr-parent/pom.xml index 6cd7ae39..e05ddbc0 100644 --- a/initializr-parent/pom.xml +++ b/initializr-parent/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 io.spring.initializr diff --git a/initializr-service-sample/README.adoc b/initializr-service-sample/README.adoc index 09bf9bfc..c6cc93dd 100644 --- a/initializr-service-sample/README.adoc +++ b/initializr-service-sample/README.adoc @@ -1,6 +1,6 @@ = Service sample -:docs: http://docs.spring.io/initializr/docs/current-SNAPSHOT/reference/html +:docs: https://docs.spring.io/initializr/docs/current-SNAPSHOT/reference/html This sample demonstrates how you can create your own service easily as described in the {docs}/#create-instance[reference documentation]. diff --git a/initializr-service-sample/pom.xml b/initializr-service-sample/pom.xml index eda142b8..54f86a52 100644 --- a/initializr-service-sample/pom.xml +++ b/initializr-service-sample/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 io.spring.initializr diff --git a/initializr-version-resolver/pom.xml b/initializr-version-resolver/pom.xml index 26ce67e7..4411c5fc 100644 --- a/initializr-version-resolver/pom.xml +++ b/initializr-version-resolver/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 io.spring.initializr diff --git a/initializr-web/pom.xml b/initializr-web/pom.xml index 7cf8f370..8ab222d6 100644 --- a/initializr-web/pom.xml +++ b/initializr-web/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 io.spring.initializr diff --git a/initializr-web/src/assembly/snippets.xml b/initializr-web/src/assembly/snippets.xml index 005c95ac..8a709b63 100644 --- a/initializr-web/src/assembly/snippets.xml +++ b/initializr-web/src/assembly/snippets.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 https://maven.apache.org/xsd/assembly-1.1.3.xsd"> snippets zip diff --git a/initializr-web/src/assembly/stub.xml b/initializr-web/src/assembly/stub.xml index e03548a9..f91cc032 100644 --- a/initializr-web/src/assembly/stub.xml +++ b/initializr-web/src/assembly/stub.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 https://maven.apache.org/xsd/assembly-1.1.3.xsd"> stubs jar diff --git a/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/CloudfoundryEnvironmentPostProcessorTests.java b/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/CloudfoundryEnvironmentPostProcessorTests.java index 36599c3a..dd36f565 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/CloudfoundryEnvironmentPostProcessorTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/CloudfoundryEnvironmentPostProcessorTests.java @@ -49,11 +49,11 @@ class CloudfoundryEnvironmentPostProcessorTests { @Test void parseUri() { this.environment.setProperty("vcap.services.stats-index.credentials.uri", - "http://example.com/bar/biz?param=one"); + "https://example.com/bar/biz?param=one"); this.postProcessor.postProcessEnvironment(this.environment, this.application); assertThat(this.environment.getProperty("initializr.stats.elastic.uri")) - .isEqualTo("http://example.com/bar/biz?param=one"); + .isEqualTo("https://example.com/bar/biz?param=one"); assertThat(this.environment.getProperty("initializr.stats.elastic.username")).isNull(); assertThat(this.environment.getProperty("initializr.stats.elastic.password")).isNull(); } diff --git a/initializr-web/src/test/java/io/spring/initializr/web/mapper/DependencyMetadataJsonMapperTests.java b/initializr-web/src/test/java/io/spring/initializr/web/mapper/DependencyMetadataJsonMapperTests.java index 3a8a0a44..6cfac1fa 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/mapper/DependencyMetadataJsonMapperTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/mapper/DependencyMetadataJsonMapperTests.java @@ -43,7 +43,7 @@ class DependencyMetadataJsonMapperTests { d.setBom("my-bom"); Repository repository = new Repository(); repository.setName("foo-repo"); - repository.setUrl(new URL("http://example.com/foo")); + repository.setUrl(new URL("https://example.com/foo")); BillOfMaterials bom = BillOfMaterials.create("org.foo", "foo-bom", "1.0.0.RELEASE"); DependencyMetadata metadata = new DependencyMetadata(Version.parse("1.2.0.RELEASE"), Collections.singletonMap(d.getId(), d), Collections.singletonMap("repo-id", repository), diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java index a730f7f0..69049c46 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java @@ -304,7 +304,6 @@ class MainControllerIntegrationTests extends AbstractInitializrControllerIntegra void doNotForceSslByDefault() { ResponseEntity response = invokeHome("curl/1.2.4", "*/*"); String body = response.getBody(); - assertThat(body).as("Must not force https").contains("http://start.spring.io/"); assertThat(body).as("Must not force https").doesNotContain("https://"); } diff --git a/initializr-web/src/test/resources/metadata/config/test-default.json b/initializr-web/src/test/resources/metadata/config/test-default.json index 1b4d3953..b4c2a60a 100644 --- a/initializr-web/src/test/resources/metadata/config/test-default.json +++ b/initializr-web/src/test/resources/metadata/config/test-default.json @@ -68,17 +68,17 @@ "repositories": { "my-api-repo-1": { "name": "repo1", - "url": "http://example.com/repo1", + "url": "https://example.com/repo1", "snapshotsEnabled": false }, "my-api-repo-2": { "name": "repo2", - "url": "http://example.com/repo2", + "url": "https://example.com/repo2", "snapshotsEnabled": false }, "my-api-repo-3": { "name": "repo3", - "url": "http://example.com/repo3", + "url": "https://example.com/repo3", "snapshotsEnabled": false }, "spring-milestones": { diff --git a/initializr-web/src/test/resources/metadata/dependencies/test-dependencies-2.1.4.json b/initializr-web/src/test/resources/metadata/dependencies/test-dependencies-2.1.4.json index 2ca43c79..506f9293 100644 --- a/initializr-web/src/test/resources/metadata/dependencies/test-dependencies-2.1.4.json +++ b/initializr-web/src/test/resources/metadata/dependencies/test-dependencies-2.1.4.json @@ -3,7 +3,7 @@ "repositories": { "my-api-repo-1": { "name": "repo1", - "url": "http://example.com/repo1", + "url": "https://example.com/repo1", "snapshotEnabled": false } }, diff --git a/initializr-web/src/test/resources/metadata/dependencies/test-dependencies-2.2.1.json b/initializr-web/src/test/resources/metadata/dependencies/test-dependencies-2.2.1.json index a254a97d..565656e6 100644 --- a/initializr-web/src/test/resources/metadata/dependencies/test-dependencies-2.2.1.json +++ b/initializr-web/src/test/resources/metadata/dependencies/test-dependencies-2.2.1.json @@ -3,7 +3,7 @@ "repositories": { "my-api-repo-2": { "name": "repo2", - "url": "http://example.com/repo2", + "url": "https://example.com/repo2", "snapshotEnabled": false } }, diff --git a/pom.xml b/pom.xml index ec827562..1e12dd10 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 io.spring.initializr initializr @@ -10,7 +11,7 @@ https://github.com/spring-io/initializr Pivotal Software, Inc. - http://www.spring.io + https://www.spring.io @@ -28,7 +29,7 @@ Stephane Nicoll snicoll at pivotal.io Pivotal Software, Inc. - http://www.spring.io + https://www.spring.io Project lead