root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #16106 from Spring Operator 

* gh-16106:
  Drop AnyEdit from Eclipse setup as it is not available over HTTPS
  Update build and setup configuration to use HTTPS

Closes gh-16106
This commit is contained in:
Andy Wilkinson 2019-03-12 10:05:02 +00:00
parent 3831aeeb39 19275fd9d6
commit 28cf63354a
8 changed files with 22 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
eclipse/spring-boot-project.setup
View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<setup:Project <setup:Project
xmi:version="2.0" xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI" xmlns:xmi="https://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0" xmlns:jdt="https://www.eclipse.org/oomph/setup/jdt/1.0"
xmlns:maven="http://www.eclipse.org/oomph/setup/maven/1.0" xmlns:maven="https://www.eclipse.org/oomph/setup/maven/1.0"
xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0" xmlns:predicates="https://www.eclipse.org/oomph/predicates/1.0"
xmlns:setup="http://www.eclipse.org/oomph/setup/1.0" xmlns:setup="https://www.eclipse.org/oomph/setup/1.0"
xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0" xmlns:setup.p2="https://www.eclipse.org/oomph/setup/p2/1.0"
xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0" xmlns:setup.workingsets="https://www.eclipse.org/oomph/setup/workingsets/1.0"
xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0" xmlns:workingsets="https://www.eclipse.org/oomph/workingsets/1.0"
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/maven/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore" xsi:schemaLocation="https://www.eclipse.org/oomph/setup/jdt/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore https://www.eclipse.org/oomph/setup/maven/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore https://www.eclipse.org/oomph/predicates/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore https://www.eclipse.org/oomph/setup/workingsets/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore https://www.eclipse.org/oomph/workingsets/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
name="spring.boot" name="spring.boot"
label="Spring Boot"> label="Spring Boot">
<setupTask <setupTask
@ -60,8 +60,6 @@
name="org.eclipse.platform.feature.group"/> name="org.eclipse.platform.feature.group"/>
<requirement <requirement
name="org.eclipse.jdt.feature.group"/> name="org.eclipse.jdt.feature.group"/>
<requirement
name="AnyEditTools.feature.group"/>
<requirement <requirement
name="io.spring.javaformat.eclipse.feature.feature.group"/> name="io.spring.javaformat.eclipse.feature.feature.group"/>
<requirement <requirement
@ -81,19 +79,17 @@
<requirement <requirement
name="org.springframework.ide.eclipse.boot.feature.feature.group"/> name="org.springframework.ide.eclipse.boot.feature.feature.group"/>
<repository <repository
url="http://download.eclipse.org/technology/epp/packages/oxygen/R/"/> url="https://download.eclipse.org/technology/epp/packages/oxygen/R/"/>
<repository <repository
url="http://download.eclipse.org/releases/oxygen/"/> url="https://download.eclipse.org/releases/oxygen/"/>
<repository
url="http://andrei.gmxhome.de/eclipse/"/>
<repository <repository
url="https://dl.bintray.com/spring/javaformat-eclipse/"/> url="https://dl.bintray.com/spring/javaformat-eclipse/"/>
<repository <repository
url="http://download.eclipse.org/egit/github/updates/"/> url="https://download.eclipse.org/egit/github/updates/"/>
<repository <repository
url="http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201207090124/"/> url="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201207090124/"/>
<repository <repository
url="http://dist.springsource.com/release/TOOLS/update/e4.7"/> url="https://dist.springsource.com/release/TOOLS/update/e4.7"/>
<description> <description>
Install the tools needed in the IDE to work with the Install the tools needed in the IDE to work with the
source code for ${scope.project.label} source code for ${scope.project.label}
@ -147,18 +143,6 @@
pattern="spring-boot-.*-test.*"/> pattern="spring-boot-.*-test.*"/>
</workingSet> </workingSet>
</setupTask> </setupTask>
<setupTask
xsi:type="setup:CompoundTask"
name="de.loskutov.anyedit.AnyEditTools">
<setupTask
xsi:type="setup:PreferenceTask"
key="/instance/de.loskutov.anyedit.AnyEditTools/org.eclipse.jdt.ui.editor.tab.width"
value="4"/>
<setupTask
xsi:type="setup:PreferenceTask"
key="/instance/de.loskutov.anyedit.AnyEditTools/saveAndAddLine"
value="true"/>
</setupTask>
<setupTask <setupTask
xsi:type="setup:CompoundTask" xsi:type="setup:CompoundTask"
name="org.eclipse.jdt.ui"> name="org.eclipse.jdt.ui">

2
mvnw vendored
View File

@ -8,7 +8,7 @@
# "License"); you may not use this file except in compliance # "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at # with the License. You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # https://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, # Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an # software distributed under the License is distributed on an

2
mvnw.cmd vendored
View File

@ -7,7 +7,7 @@
@REM "License"); you may not use this file except in compliance @REM "License"); you may not use this file except in compliance
@REM with the License. You may obtain a copy of the License at @REM with the License. You may obtain a copy of the License at
@REM @REM
@REM http://www.apache.org/licenses/LICENSE-2.0 @REM https://www.apache.org/licenses/LICENSE-2.0
@REM @REM
@REM Unless required by applicable law or agreed to in writing, @REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an @REM software distributed under the License is distributed on an

4
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@ -17,7 +17,7 @@
<licenses> <licenses>
<license> <license>
<name>Apache License, Version 2.0</name> <name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url> <url>https://www.apache.org/licenses/LICENSE-2.0</url>
</license> </license>
</licenses> </licenses>
<scm> <scm>
@ -28,7 +28,7 @@
<name>Pivotal</name> <name>Pivotal</name>
<email>info@pivotal.io</email> <email>info@pivotal.io</email>
<organization>Pivotal Software, Inc.</organization> <organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl> <organizationUrl>https://www.spring.io</organizationUrl>
</developer> </developer>
</developers> </developers>
<properties> <properties>

2
spring-boot-project/spring-boot-parent/pom.xml
View File

@ -32,7 +32,7 @@
<spring-doc-resources.version>0.1.0.RELEASE</spring-doc-resources.version> <spring-doc-resources.version>0.1.0.RELEASE</spring-doc-resources.version>
</properties> </properties>
<scm> <scm>
<url>http://github.com/spring-projects/spring-boot</url> <url>https://github.com/spring-projects/spring-boot</url>
<connection>scm:git:git://github.com/spring-projects/spring-boot.git</connection> <connection>scm:git:git://github.com/spring-projects/spring-boot.git</connection>
<developerConnection>scm:git:ssh://git@github.com/spring-projects/spring-boot.git</developerConnection> <developerConnection>scm:git:ssh://git@github.com/spring-projects/spring-boot.git</developerConnection>
</scm> </scm>

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
View File

@ -46,7 +46,7 @@ javadoc {
author() author()
stylesheetFile = file('src/main/javadoc/spring-javadoc.css') stylesheetFile = file('src/main/javadoc/spring-javadoc.css')
links = [ links = [
'http://docs.oracle.com/javase/8/docs/api/', 'https://docs.oracle.com/javase/8/docs/api/',
'https://docs.gradle.org/current/javadoc/' 'https://docs.gradle.org/current/javadoc/'
] ]
} }

2
spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
View File

@ -14,7 +14,7 @@
<main.basedir>${basedir}/../../..</main.basedir> <main.basedir>${basedir}/../../..</main.basedir>
<wildfly.version>12.0.0.Final</wildfly.version> <wildfly.version>12.0.0.Final</wildfly.version>
<cargo.container.id>wildfly12x</cargo.container.id> <cargo.container.id>wildfly12x</cargo.container.id>
<cargo.container.url>http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip <cargo.container.url>https://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip
</cargo.container.url> </cargo.container.url>
</properties> </properties>
<dependencies> <dependencies>

2
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.9-a23bced6/Dockerfile
View File

@ -4,6 +4,6 @@ RUN yum install -y wget && \
yum install -y system-config-services && \ yum install -y system-config-services && \
yum install -y curl && \ yum install -y curl && \
wget --output-document jdk.rpm \ wget --output-document jdk.rpm \
http://cdn.azul.com/zulu/bin/zulu8.21.0.1-jdk8.0.131-linux.x86_64.rpm && \ https://cdn.azul.com/zulu/bin/zulu8.21.0.1-jdk8.0.131-linux.x86_64.rpm && \
yum --nogpg localinstall -y jdk.rpm && \ yum --nogpg localinstall -y jdk.rpm && \
rm -f jdk.rpm rm -f jdk.rpm