From cefbf17afb7e8d5337342f60b3b1cb3e3fc9a8f8 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 22 May 2020 01:31:11 +0000 Subject: [PATCH] Sync docs from 1.1.x to gh-pages --- 1.1.x/reference/html/README.html | 17 +++++++++++++---- 1.1.x/reference/html/index.html | 17 +++++++++++++---- .../reference/html/spring-cloud-kubernetes.html | 17 +++++++++++++---- 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/1.1.x/reference/html/README.html b/1.1.x/reference/html/README.html index 6b20472c..c1168237 100644 --- a/1.1.x/reference/html/README.html +++ b/1.1.x/reference/html/README.html @@ -131,8 +131,9 @@ $(addBlockSwitches);
  • 14.2. Documentation
  • 14.3. Working with the code
    • @@ -1569,7 +1570,15 @@ a modified file in the correct place. Just commit it and push the change.

    should also work without issue as long as they use Maven 3.3.3 or better.

    -

    14.3.1. Importing into eclipse with m2eclipse

    +

    14.3.1. Activate the Spring Maven profile

    +
    +

    Spring Cloud projects require the 'spring' Maven profile to be activated to resolve +the spring milestone and snapshot repositories. Use your preferred IDE to set this +profile to be active, or you may experience build errors.

    +
    +
    +
    +

    14.3.2. Importing into eclipse with m2eclipse

    We recommend the m2eclipse eclipse plugin when working with eclipse. If you don’t already have m2eclipse installed it is available from the "eclipse @@ -1596,7 +1605,7 @@ pom into your settings.xml.

    -

    14.3.2. Importing into eclipse without m2eclipse

    +

    14.3.3. Importing into eclipse without m2eclipse

    If you prefer not to use m2eclipse you can generate eclipse project metadata using the following command:

    diff --git a/1.1.x/reference/html/index.html b/1.1.x/reference/html/index.html index 6b20472c..c1168237 100644 --- a/1.1.x/reference/html/index.html +++ b/1.1.x/reference/html/index.html @@ -131,8 +131,9 @@ $(addBlockSwitches);
  • 14.2. Documentation
  • 14.3. Working with the code
    • @@ -1569,7 +1570,15 @@ a modified file in the correct place. Just commit it and push the change.

    should also work without issue as long as they use Maven 3.3.3 or better.

    -

    14.3.1. Importing into eclipse with m2eclipse

    +

    14.3.1. Activate the Spring Maven profile

    +
    +

    Spring Cloud projects require the 'spring' Maven profile to be activated to resolve +the spring milestone and snapshot repositories. Use your preferred IDE to set this +profile to be active, or you may experience build errors.

    +
    +
    +
    +

    14.3.2. Importing into eclipse with m2eclipse

    We recommend the m2eclipse eclipse plugin when working with eclipse. If you don’t already have m2eclipse installed it is available from the "eclipse @@ -1596,7 +1605,7 @@ pom into your settings.xml.

    -

    14.3.2. Importing into eclipse without m2eclipse

    +

    14.3.3. Importing into eclipse without m2eclipse

    If you prefer not to use m2eclipse you can generate eclipse project metadata using the following command:

    diff --git a/1.1.x/reference/html/spring-cloud-kubernetes.html b/1.1.x/reference/html/spring-cloud-kubernetes.html index 6b20472c..c1168237 100644 --- a/1.1.x/reference/html/spring-cloud-kubernetes.html +++ b/1.1.x/reference/html/spring-cloud-kubernetes.html @@ -131,8 +131,9 @@ $(addBlockSwitches);
  • 14.2. Documentation
  • 14.3. Working with the code
    • @@ -1569,7 +1570,15 @@ a modified file in the correct place. Just commit it and push the change.

    should also work without issue as long as they use Maven 3.3.3 or better.

    -

    14.3.1. Importing into eclipse with m2eclipse

    +

    14.3.1. Activate the Spring Maven profile

    +
    +

    Spring Cloud projects require the 'spring' Maven profile to be activated to resolve +the spring milestone and snapshot repositories. Use your preferred IDE to set this +profile to be active, or you may experience build errors.

    +
    +
    +
    +

    14.3.2. Importing into eclipse with m2eclipse

    We recommend the m2eclipse eclipse plugin when working with eclipse. If you don’t already have m2eclipse installed it is available from the "eclipse @@ -1596,7 +1605,7 @@ pom into your settings.xml.

    -

    14.3.2. Importing into eclipse without m2eclipse

    +

    14.3.3. Importing into eclipse without m2eclipse

    If you prefer not to use m2eclipse you can generate eclipse project metadata using the following command: