SpringCloud/spring-cloud-netflix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.1.x'

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2022-03-11 16:30:58 +01:00
parent e5ba2575e6 e757479f85
commit e33e5a54f6
14 changed files with 271 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.adoc
View File

@@ -57,7 +57,8 @@ patterns provided include Service Discovery (Eureka).
== Building
:jdkversion: 1.8
:jdkversion: 17
=== Basic Compile and Test

2
spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/http/EurekaServerMockApplication.java
View File

@@ -54,7 +54,7 @@ import static com.netflix.appinfo.InstanceInfo.DEFAULT_SECURE_PORT;
import static org.springframework.util.Assert.isTrue;
/**
* Mocked Eureka Server
* Mocked Eureka Server.
*
* @author Daniel Lavoie
*/

8
spring-cloud-netflix-eureka-server/pom.xml
View File

@@ -177,14 +177,14 @@
</configuration>
<dependencies>
<dependency>
<groupId>org.webjars</groupId>
<groupId>org.webjars.npm</groupId>
<artifactId>jquery</artifactId>
<version>3.5.1</version>
<version>3.6.0</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<groupId>org.webjars.npm</groupId>
<artifactId>bootstrap</artifactId>
<version>3.2.0</version>
<version>5.1.3</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>

83
spring-cloud-netflix-eureka-server/src/main/wro/header.css Normal file
View File

@@ -0,0 +1,83 @@
.navbar {
border-top: 4px solid #6db33f;
background-color: #34302d;
margin-bottom: 0px;
border-bottom: 0;
border-left: 0;
border-right: 0;
}
.navbar a.navbar-brand {
background: url("../images/spring-logo-eureka.png") -1px -1px no-repeat;
margin: 12px 0 6px;
width: 300px;
height: 46px;
display: inline-block;
text-decoration: none;
padding: 0;
}
.navbar a.navbar-brand span {
display: block;
width: 300px;
height: 46px;
background: url("../images/spring-logo-eureka.png") -1px -48px no-repeat;
opacity: 0;
-moz-transition: opacity 0.12s ease-in-out;
-webkit-transition: opacity 0.12s ease-in-out;
-o-transition: opacity 0.12s ease-in-out;
}
.navbar a:hover.navbar-brand span {
opacity: 1;
color: #eeeeee;
background-color: #6db33f;
}
.navbar li > a, .navbar-text {
color: #f1f1f1;
font-family: "montserratregular", sans-serif;
text-shadow: none;
font-size: 14px;
padding: 28px 20px;
transition: all 0.15s;
-webkit-transition: all 0.15s;
-moz-transition: all 0.15s;
-o-transition: all 0.15s;
-ms-transition: all 0.15s;
}
.navbar li > a {
text-transform: uppercase;
}
.navbar .navbar-text {
margin-top: 0;
margin-bottom: 0;
}
.navbar li:hover > a {
color: #eeeeee;
background-color: #6db33f;
}
.navbar-toggle {
border-width: 0;
}
.navbar-toggle .icon-bar + .icon-bar {
margin-top: 3px;
}
.navbar-toggle .icon-bar {
width: 19px;
height: 3px;
background-color: #f1f1f1;
}
.navbar-default-toggle:hover .icon-bar {
background-color: transparent;
}
.navbar-default a:active{
background-color: #6db33f;
}
.nav-tabs:active a:hover{
color: #f1f1f1;
background-color: #34302D;
border-color: #34302D;
}
table{
border-color: #34302D;
}

73
spring-cloud-netflix-eureka-server/src/main/wro/header.less
View File

@@ -1,73 +0,0 @@
.navbar {
border-top: 4px solid #6db33f;
background-color: #34302d;
margin-bottom: 0px;
border-bottom: 0;
border-left: 0;
border-right: 0;
}
.navbar a.navbar-brand {
background: url("../images/spring-logo-eureka.png") -1px -1px no-repeat;
margin: 12px 0 6px;
width: 300px;
height: 46px;
display: inline-block;
text-decoration: none;
padding: 0;
}
.navbar a.navbar-brand span {
display: block;
width: 300px;
height: 46px;
background: url("../images/spring-logo-eureka.png") -1px -48px no-repeat;
opacity: 0;
-moz-transition: opacity 0.12s ease-in-out;
-webkit-transition: opacity 0.12s ease-in-out;
-o-transition: opacity 0.12s ease-in-out;
}
.navbar a:hover.navbar-brand span {
opacity: 1;
}
.navbar li > a, .navbar-text {
font-family: "montserratregular", sans-serif;
text-shadow: none;
font-size: 14px;
/* line-height: 14px; */
padding: 28px 20px;
transition: all 0.15s;
-webkit-transition: all 0.15s;
-moz-transition: all 0.15s;
-o-transition: all 0.15s;
-ms-transition: all 0.15s;
}
.navbar li > a {
text-transform: uppercase;
}
.navbar .navbar-text {
margin-top: 0;
margin-bottom: 0;
}
.navbar li:hover > a {
color: #eeeeee;
background-color: #6db33f;
}
.navbar-toggle {
border-width: 0;
.icon-bar + .icon-bar {
margin-top: 3px;
}
.icon-bar {
width: 19px;
height: 3px;
}
}

98
spring-cloud-netflix-eureka-server/src/main/wro/main.css Normal file
View File

@@ -0,0 +1,98 @@
@import "typography.css";
@import "header.css";
@import "responsive.css";
a:link{
color: #5fa134;
}
a:hover{
color: #5fa134;
}
body {
background-color: #f1f1f1;
}
.table > thead > tr > th {
background-color: #34302D;
color: #f1f1f1;
}
.table-filter {
background-color: #34302D;
padding: 9px 12px;
}
.nav > li > a {
color: #838789;
}
.btn-default {
border-width: 2px;
transition: border 0.15s;
-webkit-transition: border 0.15s;
-moz-transition: border 0.15s;
-o-transition: border 0.15s;
-ms-transition: border 0.15s;
color: #f1f1f1;
background-color: #34302D;
border-color: #6db33f;
}
.btn-default:hover, .btn-default:focus, .btn-default:active, .btn-default.active, .open .dropdown-toggle.btn-default {
background-color: #34302D;
border-color: #34302D;
}
.container .text-muted {
margin: 20px 0;
}
code {
font-size: 80%;
}
.xd-container {
margin-top: 40px;
margin-bottom: 100px;
}
h1 {
margin-bottom: 15px;
}
.index-page--subtitle {
font-size: 16px;
line-height: 24px;
margin: 0 0 30px;
}
.form-horizontal button.btn-inverse {
margin-left: 32px;
}
#job-params-modal .modal-dialog {
width: 90%;
margin-left: auto;
margin-right: auto;
}
[ng-cloak].splash {
display: block !important;
}
[ng-cloak] {
display: none;
}
.splash {
background: #6db33f;
color: #34302D;
display: none;
}
.error-page {
margin-top: 100px;
text-align: center;
}
.error-page .error-title {
font-size: 24px;
line-height: 24px;
margin: 30px 0 0;
}
table td {
vertical-align: middle !important;
}
table td .progress {
margin-bottom: 0;
}
table td.action-column {
width: 1px;
}
.help-block {
color: #f1f1f1;
}

143
spring-cloud-netflix-eureka-server/src/main/wro/main.less
View File

@@ -1,143 +0,0 @@
@spring-green: #6db33f;
@spring-dark-green: #5fa134;
@spring-brown: #34302D;
@spring-grey: #838789;
@spring-light-grey: #f1f1f1;
@body-bg: @spring-light-grey;
@text-color: @spring-light-grey;
@link-color: @spring-dark-green;
@link-hover-color: @spring-dark-green;
@navbar-default-link-color: @spring-light-grey;
@navbar-default-link-active-color: @spring-light-grey;
@navbar-default-link-hover-color: @spring-light-grey;
@navbar-default-link-hover-bg: @spring-green;
@navbar-default-toggle-icon-bar-bg: @spring-light-grey;
@navbar-default-toggle-hover-bg: transparent;
@navbar-default-link-active-bg: @spring-green;
@border-radius-base: 0;
@border-radius-large: 0;
@border-radius-small: 0;
@btn-default-color: @spring-light-grey;
@btn-default-bg: @spring-brown;
@btn-default-border: @spring-green;
@nav-tabs-active-link-hover-color: @spring-light-grey;
@nav-tabs-active-link-hover-bg: @spring-brown;
@nav-tabs-active-link-hover-border-color: @spring-brown;
@nav-tabs-border-color: @spring-brown;
@table-border-color: @spring-brown;
@import "typography.less";
@import "header.less";
.table > thead > tr > th {
background-color: lighten(@spring-brown, 3%);
color: @spring-light-grey;
}
.table-filter {
background-color: @spring-brown;
padding: 9px 12px;
}
.nav > li > a {
color: @spring-grey;
}
.btn-default {
border-width: 2px;
transition: border 0.15s;
-webkit-transition: border 0.15s;
-moz-transition: border 0.15s;
-o-transition: border 0.15s;
-ms-transition: border 0.15s;
&:hover,
&:focus,
&:active,
&.active,
.open .dropdown-toggle& {
background-color: @spring-brown;
border-color: @spring-brown;
}
}
.container .text-muted {
margin: 20px 0;
}
code {
font-size: 80%;
}
.xd-container {
margin-top: 40px;
margin-bottom: 100px;
}
h1 {
margin-bottom: 15px
}
.index-page--subtitle {
font-size: 16px;
line-height: 24px;
margin: 0 0 30px;
}
.form-horizontal button.btn-inverse {
margin-left: 32px;
}
#job-params-modal .modal-dialog {
width: 90%;
margin-left:auto;
margin-right:auto;
}
[ng-cloak].splash {
display: block !important;
}
[ng-cloak] {
display: none;
}
.splash {
background: @spring-green;
color: @spring-brown;
display: none;
}
.error-page {
margin-top: 100px;
text-align: center;
}
.error-page .error-title {
font-size: 24px;
line-height: 24px;
margin: 30px 0 0;
}
table td {
vertical-align: middle !important;
}
table td .progress {
margin-bottom: 0;
}
table td.action-column {
width: 1px;
}
.help-block {
color: lighten(@text-color, 0%); // lighten the text some for contrast
}
@import "responsive.less";

34
spring-cloud-netflix-eureka-server/src/main/wro/responsive.css Normal file
View File

@@ -0,0 +1,34 @@
@media (max-width: 768px) {
.navbar-toggle {
position: absolute;
z-index: 9999;
left: 0px;
top: 0px;
}
.navbar a.navbar-brand {
display: block;
margin: 0 auto 0 auto;
width: 200px;
height: 50px;
float: none;
background: url("../images/spring-logo-eureka-mobile.png") 0 center no-repeat;
}
.homepage-billboard .homepage-subtitle {
font-size: 21px;
line-height: 21px;
}
.navbar a.navbar-brand span {
display: none;
}
.navbar {
border-top-width: 0;
}
.xd-container {
margin-top: 20px;
margin-bottom: 30px;
}
.index-page--subtitle {
margin-top: 10px;
margin-bottom: 30px;
}
}

41
spring-cloud-netflix-eureka-server/src/main/wro/responsive.less
View File

@@ -1,41 +0,0 @@
@media (max-width: 768px) {
.navbar-toggle {
position:absolute;
z-index: 9999;
left:0px;
top:0px;
}
.navbar a.navbar-brand {
display: block;
margin: 0 auto 0 auto;
width: 200px;
height: 50px;
float: none;
background: url("../images/spring-logo-eureka-mobile.png") 0 center no-repeat;
}
.homepage-billboard .homepage-subtitle {
font-size: 21px;
line-height: 21px;
}
.navbar a.navbar-brand span {
display: none;
}
.navbar {
border-top-width: 0;
}
.xd-container {
margin-top: 20px;
margin-bottom: 30px;
}
.index-page--subtitle {
margin-top: 10px;
margin-bottom: 30px;
}
}

42
spring-cloud-netflix-eureka-server/src/main/wro/typography.css Normal file
View File

@@ -0,0 +1,42 @@
@font-face {
font-family: 'varela_roundregular';
src: url('../fonts/varela_round-webfont.eot');
src: url('../fonts/varela_round-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/varela_round-webfont.woff') format('woff'), url('../fonts/varela_round-webfont.ttf') format('truetype'), url('../fonts/varela_round-webfont.svg#varela_roundregular') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'montserratregular';
src: url('../fonts/montserrat-webfont.eot');
src: url('../fonts/montserrat-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/montserrat-webfont.woff') format('woff'), url('../fonts/montserrat-webfont.ttf') format('truetype'), url('../fonts/montserrat-webfont.svg#montserratregular') format('svg');
font-weight: normal;
font-style: normal;
}
body, h1, h2, h3, p, input {
margin: 0;
font-weight: 400;
font-family: "varela_roundregular", sans-serif;
color: #34302d;
}
h1 {
font-size: 24px;
line-height: 30px;
font-family: "montserratregular", sans-serif;
}
h2 {
font-size: 18px;
font-weight: 700;
line-height: 24px;
margin-bottom: 10px;
font-family: "montserratregular", sans-serif;
}
h3 {
font-size: 16px;
line-height: 24px;
margin-bottom: 10px;
font-weight: 700;
}
strong {
font-weight: 700;
font-family: "montserratregular", sans-serif;
}

59
spring-cloud-netflix-eureka-server/src/main/wro/typography.less
View File

@@ -1,59 +0,0 @@
@font-face {
font-family: 'varela_roundregular';
src: url('../fonts/varela_round-webfont.eot');
src: url('../fonts/varela_round-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/varela_round-webfont.woff') format('woff'),
url('../fonts/varela_round-webfont.ttf') format('truetype'),
url('../fonts/varela_round-webfont.svg#varela_roundregular') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'montserratregular';
src: url('../fonts/montserrat-webfont.eot');
src: url('../fonts/montserrat-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/montserrat-webfont.woff') format('woff'),
url('../fonts/montserrat-webfont.ttf') format('truetype'),
url('../fonts/montserrat-webfont.svg#montserratregular') format('svg');
font-weight: normal;
font-style: normal;
}
body, h1, h2, h3, p, input {
margin: 0;
font-weight: 400;
font-family: "varela_roundregular", sans-serif;
color: #34302d;
}
h1 {
font-size: 24px;
line-height: 30px;
font-family: "montserratregular", sans-serif;
}
h2 {
font-size: 18px;
font-weight: 700;
line-height: 24px;
margin-bottom: 10px;
font-family: "montserratregular", sans-serif;
}
h3 {
font-size: 16px;
line-height: 24px;
margin-bottom: 10px;
font-weight: 700;
}
p {
//font-size: 15px;
//line-height: 24px;
}
strong {
font-weight: 700;
font-family: "montserratregular", sans-serif;
}

3
spring-cloud-netflix-eureka-server/src/main/wro/wro.properties
View File

@@ -1,4 +1,5 @@
#List of preProcessors
preProcessors=cssImport
#List of postProcessors
postProcessors=less4j,jsMin
postProcessors=jsMin

8
spring-cloud-netflix-eureka-server/src/main/wro/wro.xml
View File

@@ -1,8 +1,8 @@
<groups xmlns="http://www.isdc.ro/wro">
<group name="wro">
<css>webjar:bootstrap/3.2.0/less/bootstrap.less</css>
<css>file:@.project.basedir.@/src/main/wro/main.less</css>
<js>webjar:jquery/3.5.1/jquery.min.js</js>
<js>webjar:bootstrap/3.2.0/js/bootstrap.min.js</js>
<css>webjar:bootstrap/5.1.3/dist/css/bootstrap.min.css</css>
<css>file:@.project.basedir.@/src/main/wro/main.css</css>
<js>webjar:jquery/3.6.0/jquery.min.js</js>
<js>webjar:bootstrap/5.1.3/dist/js/bootstrap.min.js</js>
</group>
</groups>

1
src/checkstyle/checkstyle-suppressions.xml
View File

@@ -12,4 +12,5 @@
<suppress files=".*TestAutoConfiguration\.java" checks="HideUtilityClassConstructor"/>
<suppress files=".*TestAutoConfiguration\.java" checks="JavadocStyle"/>
<suppress files=".*TestAutoConfiguration\.java" checks="JavadocStyle"/>
<suppress files=".*Tests\.java" checks="JavadocVariable"/>
</suppressions>