diff --git a/hawkbit-custom-theme-example/.gitignore b/hawkbit-custom-theme-example/.gitignore deleted file mode 100644 index 6a3b2b4..0000000 --- a/hawkbit-custom-theme-example/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/.springBeans diff --git a/hawkbit-custom-theme-example/README.md b/hawkbit-custom-theme-example/README.md deleted file mode 100644 index 5a6a571..0000000 --- a/hawkbit-custom-theme-example/README.md +++ /dev/null @@ -1 +0,0 @@ -Theme customization example for Eclipse hawkBit. See wiki for the theme customization guide. \ No newline at end of file diff --git a/hawkbit-custom-theme-example/pom.xml b/hawkbit-custom-theme-example/pom.xml deleted file mode 100644 index 6d4bb24..0000000 --- a/hawkbit-custom-theme-example/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - 4.0.0 - - org.eclipse.hawkbit - hawkbit-examples-parent - ${revision} - - hawkbit-custom-theme-example - hawkBit :: Examples :: Custom Theme Example App - - - - - com.vaadin - vaadin-maven-plugin - ${vaadin.plugin.version} - - src/main/resources - - - - - update-theme - compile-theme - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - ${baseDir} - false - org.eclipse.hawkbit.app.Start - JAR - - - - - - - - - - org.eclipse.hawkbit - hawkbit-boot-starter - - - com.h2database - h2 - - - - diff --git a/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java b/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java deleted file mode 100644 index 69b2fad..0000000 --- a/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - */ -package org.eclipse.hawkbit.app; - -import org.eclipse.hawkbit.im.authentication.MultitenancyIndicator; -import org.eclipse.hawkbit.ui.UiProperties; -import org.eclipse.hawkbit.ui.login.AbstractHawkbitLoginUI; -import org.eclipse.hawkbit.ui.themes.HawkbitTheme; -import org.eclipse.hawkbit.ui.utils.VaadinMessageSource; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.vaadin.spring.security.VaadinSecurity; - -import com.vaadin.annotations.Theme; -import com.vaadin.annotations.Title; -import com.vaadin.spring.annotation.SpringUI; - -/** - * Example hawkBit login UI implementation. - * - * A {@link SpringUI} annotated class must be present in the classpath for the - * login path. The easiest way to get an hawkBit login UI running is to extend - * the {@link AbstractHawkbitLoginUI} and to annotated it with {@link SpringUI} - * as in this example to the defined {@link HawkbitTheme#LOGIN_UI_PATH}. - * - */ -@SpringUI(path = HawkbitTheme.LOGIN_UI_PATH) -@Title("hawkBit Theme example") -@Theme(value = "exampletheme") -public class MyLoginUI extends AbstractHawkbitLoginUI { - - private static final long serialVersionUID = 1L; - - @Autowired - MyLoginUI(final ApplicationContext context, final VaadinSecurity vaadinSecurity, final VaadinMessageSource i18n, - final UiProperties uiProperties, final MultitenancyIndicator multiTenancyIndicator) { - super(context, vaadinSecurity, i18n, uiProperties, multiTenancyIndicator); - } - -} diff --git a/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyUI.java b/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyUI.java deleted file mode 100644 index 8a6a507..0000000 --- a/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyUI.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.eclipse.hawkbit.app; -/** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - */ - -import com.vaadin.server.ErrorHandler; -import org.eclipse.hawkbit.ui.AbstractHawkbitUI; -import org.eclipse.hawkbit.ui.UiProperties; -import org.eclipse.hawkbit.ui.components.NotificationUnreadButton; -import org.eclipse.hawkbit.ui.error.ErrorView; -import org.eclipse.hawkbit.ui.menu.DashboardMenu; -import org.eclipse.hawkbit.ui.push.EventPushStrategy; -import org.eclipse.hawkbit.ui.push.UIEventProvider; -import org.eclipse.hawkbit.ui.utils.VaadinMessageSource; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.vaadin.spring.events.EventBus.UIEventBus; - -import com.vaadin.annotations.Push; -import com.vaadin.annotations.Theme; -import com.vaadin.annotations.Title; -import com.vaadin.shared.communication.PushMode; -import com.vaadin.shared.ui.ui.Transport; -import com.vaadin.spring.annotation.SpringUI; -import com.vaadin.spring.navigator.SpringViewProvider; - -/** - * Example hawkBit UI implementation. - * - * A {@link SpringUI} annotated class must be present in the classpath. The - * easiest way to get an hawkBit UI running is to extend the - * {@link AbstractHawkbitUI} and to annotated it with {@link SpringUI} as in - * this example. - * - */ -@SpringUI -@Push(value = PushMode.AUTOMATIC, transport = Transport.WEBSOCKET_XHR) -@Title("hawkBit Theme example") -@Theme(value = "exampletheme") -public class MyUI extends AbstractHawkbitUI { - - private static final long serialVersionUID = 1L; - - @Autowired - MyUI(final EventPushStrategy pushStrategy, final UIEventBus eventBus, final UIEventProvider eventProvider, final SpringViewProvider viewProvider, - final ApplicationContext context, final DashboardMenu dashboardMenu, final ErrorView errorview, - final NotificationUnreadButton notificationUnreadButton, final UiProperties uiProperties, - final VaadinMessageSource i18n, final ErrorHandler errorHandler) { - super(pushStrategy, eventBus, eventProvider, viewProvider, context, dashboardMenu, errorview, notificationUnreadButton, - uiProperties, i18n, errorHandler); - } -} diff --git a/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/Start.java b/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/Start.java deleted file mode 100644 index 33004e8..0000000 --- a/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/Start.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.eclipse.hawkbit.app; -/** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - */ - -import org.eclipse.hawkbit.autoconfigure.security.EnableHawkbitManagedSecurityConfiguration; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * A {@link SpringBootApplication} annotated class with a main method to start. - * The minimal configuration for the stand alone hawkBit server. - * - */ -@SpringBootApplication -@EnableHawkbitManagedSecurityConfiguration -// Exception squid:S1118 - Spring boot standard behavior -@SuppressWarnings({ "squid:S1118" }) -public class Start { - /** - * Main method to start the spring-boot application. - * - * @param args - * the VM arguments. - */ - // Exception squid:S2095 - Spring boot standard behavior - @SuppressWarnings({ "squid:S2095" }) - public static void main(final String[] args) { - SpringApplication.run(Start.class, args); - } -} diff --git a/hawkbit-custom-theme-example/src/main/resources/VAADIN/themes/exampletheme/.gitignore b/hawkbit-custom-theme-example/src/main/resources/VAADIN/themes/exampletheme/.gitignore deleted file mode 100644 index 1cdd02b..0000000 --- a/hawkbit-custom-theme-example/src/main/resources/VAADIN/themes/exampletheme/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/addons.scss -/styles.css diff --git a/hawkbit-custom-theme-example/src/main/resources/VAADIN/themes/exampletheme/customstyles/examplevariables.scss b/hawkbit-custom-theme-example/src/main/resources/VAADIN/themes/exampletheme/customstyles/examplevariables.scss deleted file mode 100644 index 6bf201f..0000000 --- a/hawkbit-custom-theme-example/src/main/resources/VAADIN/themes/exampletheme/customstyles/examplevariables.scss +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ - -$dark-gray: #848484; - -//Example color change -$hawkbit-primary-color: $dark-gray; -$hawkbit-primary-color-light: #D8D8D8; -$app-selection-item-selection-color: $dark-gray; -$app-focus-color: $dark-gray; -$app-selection-color: $dark-gray; -$tag-text-color: $dark-gray; -$tab-sheet-caption-color: $dark-gray; -$table-details-tab-font-color: $dark-gray; -$widget-caption-color: $dark-gray; -$accordion-action-history-title-color: $dark-gray; -$menu-title-bg-color: $dark-gray; -$button-icon-color: $dark-gray; \ No newline at end of file diff --git a/hawkbit-custom-theme-example/src/main/resources/VAADIN/themes/exampletheme/images/profile-pic-57px.jpg b/hawkbit-custom-theme-example/src/main/resources/VAADIN/themes/exampletheme/images/profile-pic-57px.jpg deleted file mode 100644 index d730cb5..0000000 Binary files a/hawkbit-custom-theme-example/src/main/resources/VAADIN/themes/exampletheme/images/profile-pic-57px.jpg and /dev/null differ diff --git a/hawkbit-custom-theme-example/src/main/resources/VAADIN/themes/exampletheme/layouts/footer.html b/hawkbit-custom-theme-example/src/main/resources/VAADIN/themes/exampletheme/layouts/footer.html deleted file mode 100644 index f2ac781..0000000 --- a/hawkbit-custom-theme-example/src/main/resources/VAADIN/themes/exampletheme/layouts/footer.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - diff --git a/hawkbit-custom-theme-example/src/main/resources/VAADIN/themes/exampletheme/styles.scss b/hawkbit-custom-theme-example/src/main/resources/VAADIN/themes/exampletheme/styles.scss deleted file mode 100644 index 4b3f298..0000000 --- a/hawkbit-custom-theme-example/src/main/resources/VAADIN/themes/exampletheme/styles.scss +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ - -@import "../hawkbit/customstyles/hawkbitvariables"; -@import "customstyles/examplevariables"; -@import "../hawkbit/hawkbittheme"; -@import "addons"; - -// This file prefixes all rules with the theme name to avoid causing conflicts with other themes. -.exampletheme { - @include addons; - @include hawkbittheme; -} diff --git a/hawkbit-custom-theme-example/src/main/resources/application.properties b/hawkbit-custom-theme-example/src/main/resources/application.properties deleted file mode 100644 index ca445c9..0000000 --- a/hawkbit-custom-theme-example/src/main/resources/application.properties +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2015 Bosch Software Innovations GmbH and others -# -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# - -# UI demo account -hawkbit.server.ui.demo.password=admin -hawkbit.server.ui.demo.user=admin -hawkbit.server.ui.demo.tenant=DEFAULT - -# UI help links -hawkbit.server.ui.links.documentation.root=https://www.eclipse.org/hawkbit/documentation/guide/customtheme.html - -spring.main.allow-bean-definition-overriding=true \ No newline at end of file diff --git a/hawkbit-device-simulator/pom.xml b/hawkbit-device-simulator/pom.xml index 3012729..6590cae 100644 --- a/hawkbit-device-simulator/pom.xml +++ b/hawkbit-device-simulator/pom.xml @@ -122,6 +122,7 @@ org.apache.httpcomponents httpclient + 4.5.14 diff --git a/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/SimulationProperties.java b/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/SimulationProperties.java index 2b9fc2d..3e5c455 100644 --- a/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/SimulationProperties.java +++ b/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/SimulationProperties.java @@ -15,7 +15,7 @@ import java.util.Random; import java.util.concurrent.TimeUnit; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import org.eclipse.hawkbit.simulator.AbstractSimulatedDevice.Protocol; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/http/BasicAuthSecurityConfiguration.java b/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/http/BasicAuthSecurityConfiguration.java index c0a769f..a918b30 100644 --- a/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/http/BasicAuthSecurityConfiguration.java +++ b/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/http/BasicAuthSecurityConfiguration.java @@ -50,7 +50,7 @@ protected SecurityFilterChain filterChainBasicAuth(final HttpSecurity http) thro return http .csrf(AbstractHttpConfigurer::disable) .authorizeHttpRequests(amrmRegistry -> amrmRegistry - .antMatchers("/").permitAll() + .requestMatchers("/").permitAll() .anyRequest().authenticated()) .httpBasic(Customizer.withDefaults()) .exceptionHandling(configurer -> configurer.authenticationEntryPoint((request, response, e) -> { diff --git a/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/http/NoAuthSecurityConfiguration.java b/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/http/NoAuthSecurityConfiguration.java index c3bc71f..edd151f 100644 --- a/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/http/NoAuthSecurityConfiguration.java +++ b/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/http/NoAuthSecurityConfiguration.java @@ -33,7 +33,7 @@ public class NoAuthSecurityConfiguration { @Bean protected SecurityFilterChain filterChainNoAuth(final HttpSecurity httpSec) throws Exception { return httpSec - .authorizeRequests(amrmRegistry -> amrmRegistry.antMatchers("/**").permitAll()) + .authorizeRequests(amrmRegistry -> amrmRegistry.requestMatchers("/**").permitAll()) .csrf(AbstractHttpConfigurer::disable) .build(); } diff --git a/pom.xml b/pom.xml index 78e2308..9affc55 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ org.eclipse.hawkbit hawkbit-parent - 0.4.1 + 0-SNAPSHOT hawkbit-examples-parent @@ -53,7 +53,6 @@ - hawkbit-custom-theme-example hawkbit-device-simulator hawkbit-example-core-feign-client hawkbit-example-ddi-feign-client @@ -62,8 +61,8 @@ - 0.4.0-SNAPSHOT - 0.4.1 + 0-SNAPSHOT + 0-SNAPSHOT scm:git:git@github.com:eclipse/hawkbit-examples.git @@ -120,9 +119,6 @@ .git* **/*.sql eclipse_codeformatter.xml - **/addons.scss - **/VAADIN/widgetsets/** - **/resources/VAADIN/themes/exampletheme/** .sonar **/docker/** **/.sonar/**