From ef3618ed9e72797ebb4e5b22e2a7d47684b1cc9f Mon Sep 17 00:00:00 2001 From: SirWayne Date: Fri, 29 Jan 2016 11:27:57 +0100 Subject: [PATCH 1/3] Fix Sonar Issue: Change visibilty of mutable field Signed-off-by: SirWayne --- .../main/java/org/eclipse/hawkbit/ui/HawkbitUI.java | 2 +- .../org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitUI.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitUI.java index 1c81610e2..b8e5545f3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitUI.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitUI.java @@ -210,7 +210,7 @@ public class HawkbitUI extends DefaultHawkbitUI implements DetachListener { navigator.addView(EMPTY_VIEW, new Navigator.EmptyView()); // set locale is required for I18N class also, to get the locale from // cookie - final String locale = getLocaleId(SPUIDefinitions.AVAILABLE_LOCALES); + final String locale = getLocaleId(SPUIDefinitions.getAvailableLocales()); setLocale(new Locale(locale)); UI.getCurrent().setErrorHandler(new SPUIErrorHandler()); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java index 4c5958ff1..f3df05424 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java @@ -26,7 +26,7 @@ public final class SPUIDefinitions { /** * Available locales. */ - public static final Set AVAILABLE_LOCALES = Stream.of("en", "de").collect(Collectors.toSet()); + private static final Set AVAILABLE_LOCALES = Stream.of("en", "de").collect(Collectors.toSet()); /** * Default locale. @@ -953,4 +953,13 @@ public final class SPUIDefinitions { private SPUIDefinitions() { } + + /** + * Get the locales + * + * @return the availableLocales + */ + public static Set getAvailableLocales() { + return AVAILABLE_LOCALES; + } } From f6ad6490a5425a8e4b06ebf7c60c70e6126a906a Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Fri, 29 Jan 2016 11:28:29 +0100 Subject: [PATCH 2/3] Extended contact information --- README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c9ec53685..e824971e9 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,14 @@ -# hawkbit-update-server - Build: [![Circle CI](https://circleci.com/gh/eclipse/hawkbit.svg?style=svg)](https://circleci.com/gh/eclipse/hawkbit) -Want to chat with the team behind hawkBit? [![Join the chat at https://gitter.im/eclipse/hawkbit](https://badges.gitter.im/eclipse/hawkbit.svg)](https://gitter.im/eclipse/hawkbit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +# Eclipse.IoT hawkBit - Update Server [hawkBit](https://projects.eclipse.org/projects/iot.hawkbit) is an domain independent back end solution for rolling out software updates to constrained edge devices as well as more powerful controllers and gateways connected to IP based networking infrastructure. +# Contact us + +* Want to chat with the team behind hawkBit? [![Join the chat at https://gitter.im/eclipse/hawkbit](https://badges.gitter.im/eclipse/hawkbit.svg)](https://gitter.im/eclipse/hawkbit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +* You can also check out our [Project Homepage](https://projects.eclipse.org/projects/iot.hawkbit) for further contact options. + # Compile ``` @@ -14,7 +17,7 @@ mvn install # Run and use -We are not providing an off the shelf production ready hawkBit server. However, we recommend to check out the [Example Application](examples/hawkbit-example-app) for a runtime ready Spring Boot based update server that is empowered by hawkBit. +We are not providing an off the shelf installation ready hawkBit update server. However, we recommend to check out the [Example Application](examples/hawkbit-example-app) for a runtime ready Spring Boot based update server that is empowered by hawkBit. # Releases and Roadmap From 0bbba9b4a9b148b6e2857ec098918926c60d28f5 Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Fri, 29 Jan 2016 19:44:51 +0100 Subject: [PATCH 3/3] Disabled sonar github integration ... as it does not work for pull requests from 3rd parties --- sonarCircleCi.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sonarCircleCi.sh b/sonarCircleCi.sh index ec3f31f91..cf03e5593 100644 --- a/sonarCircleCi.sh +++ b/sonarCircleCi.sh @@ -11,19 +11,19 @@ echo $CI_PULL_REQUEST pull request # regular sonar on master if [ "$CIRCLE_BRANCH" = "master" ]; then mvn verify license:check sonar:sonar -Dsonar.login=$SONAR_SERVER_USER -Dsonar.password=$SONAR_SERVER_PASSWD -# preview in case of pull request +# preview in case of pull request - disabled as circle does not fill those with pull reuqests from different directories else - if [ -n "$CI_PULL_REQUEST" ]; then - mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify license:check sonar:sonar -B -e -V \ - -Dclirr=true \ - -Dsonar.analysis.mode=issues \ - -Dsonar.github.pullRequest=`echo $CI_PULL_REQUEST| awk -F'/' '{print $7}'` \ - -Dsonar.github.login=$SONAR_GITHUB_LOGIN \ - -Dsonar.github.oauth=$SONAR_GITHUB_OAUTH \ - -Dsonar.login=$SONAR_SERVER_USER \ - -Dsonar.password=$SONAR_SERVER_PASSWD - else + #if [ -n "$CI_PULL_REQUEST" ]; then + # mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify license:check sonar:sonar -B -e -V \ + # -Dclirr=true \ + # -Dsonar.analysis.mode=issues \ + # -Dsonar.github.pullRequest=`echo $CI_PULL_REQUEST| awk -F'/' '{print $7}'` \ + # -Dsonar.github.login=$SONAR_GITHUB_LOGIN \ + # -Dsonar.github.oauth=$SONAR_GITHUB_OAUTH \ + # -Dsonar.login=$SONAR_SERVER_USER \ + # -Dsonar.password=$SONAR_SERVER_PASSWD + #else mvn verify license:check - fi + #fi fi # but noting in case of other branches