diff --git a/bundles/com.gwt.user/.gitignore b/bundles/com.gwt.user/.gitignore deleted file mode 100644 index 3385916..0000000 --- a/bundles/com.gwt.user/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/META-INF/ diff --git a/bundles/com.gwt.user/about.html b/bundles/com.gwt.user/about.html deleted file mode 100644 index 95e9ad2..0000000 --- a/bundles/com.gwt.user/about.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - - About - - -

About This Content

- -

November 30, 2017

-

License

- -

- The Eclipse Foundation makes available all content in this plug-in - ("Content"). Unless otherwise indicated below, the Content - is provided to you under the terms and conditions of the Eclipse - Public License Version 2.0 ("EPL"). A copy of the EPL is - available at http://www.eclipse.org/legal/epl-2.0. - For purposes of the EPL, "Program" will mean the Content. -

- -

- If you did not receive this Content directly from the Eclipse - Foundation, the Content is being redistributed by another party - ("Redistributor") and different terms and conditions may - apply to your use of any object code in the Content. Check the - Redistributor's license that was provided with the Content. If no such - license exists, contact the Redistributor. Unless otherwise indicated - below, the terms and conditions of the EPL still apply to any source - code in the Content and such source code may be obtained at http://www.eclipse.org. -

- -

Third Party Content

-

-The Content includes items that have been sourced from third parties as set out below. If you did not -receive this Content directly from the Eclipse Foundation, the following is provided for informational -purposes only, and you should look to the Redistributor's license for terms and conditions of use. -

-

-font-awesome-4.3.0
-This bundle includes the Font Awesome library. -This library can be found in the Font Awesome -download area and is licensed under MIT and SIL OFL 1.1. -

-gwtbootstrap3-0.9.1
-This bundle includes the gwtbootstrap3 library. -This library can be found on Github and is -licensed under Apache License v2.0. -

-jquery-2.0.3
-This bundle includes the jQuery library. This library can be found on -this site and is licensed under the -MIT license. -

-backbonejs-1.3.3
-This bundle includes the BackboneJS library. This library can be found on -Github and is licensed under the -MIT license. -

-Joint JS 0.9.9
-This bundle includes the JointJS library. -This library can be found in the JointJS Download area and is licensed under Mozilla Public -License. -

-bootstrap-3.3.2
-This bundle includes the Bootstrap library. This library can be found -on Github and is licensed under -MIT license. -

- - diff --git a/bundles/com.gwt.user/about_files/epl-v20.html b/bundles/com.gwt.user/about_files/epl-v20.html deleted file mode 100644 index cc699de..0000000 --- a/bundles/com.gwt.user/about_files/epl-v20.html +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - Eclipse Public License - Version 2.0 - - - -

Eclipse Public License - v 2.0

-

THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. -

-

1. DEFINITIONS

-

“Contribution” means:

- -

“Contributor” means any person or entity that Distributes the Program.

-

“Licensed Patents” mean patent claims licensable by a Contributor which - are necessarily infringed by the use or sale of its Contribution alone - or when combined with the Program. -

-

“Program” means the Contributions Distributed in accordance with this - Agreement. -

-

“Recipient” means anyone who receives the Program under this Agreement - or any Secondary License (as applicable), including Contributors. -

-

“Derivative Works” shall mean any work, whether in Source Code or other - form, that is based on (or derived from) the Program and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. -

-

“Modified Works” shall mean any work in Source Code or other form that - results from an addition to, deletion from, or modification of the - contents of the Program, including, for purposes of clarity any new file - in Source Code form that contains any contents of the Program. Modified - Works shall not include works that contain only declarations, interfaces, - types, classes, structures, or files of the Program solely in each case - in order to link to, bind by name, or subclass the Program or Modified - Works thereof. -

-

“Distribute” means the acts of a) distributing or b) making available - in any manner that enables the transfer of a copy. -

-

“Source Code” means the form of a Program preferred for making - modifications, including but not limited to software source code, - documentation source, and configuration files. -

-

“Secondary License” means either the GNU General Public License, - Version 2.0, or any later versions of that license, including any - exceptions or additional permissions as identified by the initial - Contributor. -

-

2. GRANT OF RIGHTS

- -

3. REQUIREMENTS

-

3.1 If a Contributor Distributes the Program in any form, then:

- -

3.2 When the Program is Distributed as Source Code:

- -

3.3 Contributors may not remove or alter any copyright, patent, trademark, - attribution notices, disclaimers of warranty, or limitations of liability - (‘notices’) contained within the Program from any copy of the Program which - they Distribute, provided that Contributors may add their own appropriate - notices. -

-

4. COMMERCIAL DISTRIBUTION

-

Commercial distributors of software may accept certain responsibilities - with respect to end users, business partners and the like. While this - license is intended to facilitate the commercial use of the Program, the - Contributor who includes the Program in a commercial product offering should - do so in a manner which does not create potential liability for other - Contributors. Therefore, if a Contributor includes the Program in a - commercial product offering, such Contributor (“Commercial Contributor”) - hereby agrees to defend and indemnify every other Contributor - (“Indemnified Contributor”) against any losses, damages and costs - (collectively “Losses”) arising from claims, lawsuits and other legal actions - brought by a third party against the Indemnified Contributor to the extent - caused by the acts or omissions of such Commercial Contributor in connection - with its distribution of the Program in a commercial product offering. - The obligations in this section do not apply to any claims or Losses relating - to any actual or alleged intellectual property infringement. In order to - qualify, an Indemnified Contributor must: a) promptly notify the - Commercial Contributor in writing of such claim, and b) allow the Commercial - Contributor to control, and cooperate with the Commercial Contributor in, - the defense and any related settlement negotiations. The Indemnified - Contributor may participate in any such claim at its own expense. -

-

For example, a Contributor might include the Program - in a commercial product offering, Product X. That Contributor is then a - Commercial Contributor. If that Commercial Contributor then makes performance - claims, or offers warranties related to Product X, those performance claims - and warranties are such Commercial Contributor's responsibility alone. - Under this section, the Commercial Contributor would have to defend claims - against the other Contributors related to those performance claims and - warranties, and if a court requires any other Contributor to pay any damages - as a result, the Commercial Contributor must pay those damages. -

-

5. NO WARRANTY

-

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED - BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT - WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, - WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, - MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is - solely responsible for determining the appropriateness of using and - distributing the Program and assumes all risks associated with its - exercise of rights under this Agreement, including but not limited to the - risks and costs of program errors, compliance with applicable laws, damage - to or loss of data, programs or equipment, and unavailability or - interruption of operations. -

-

6. DISCLAIMER OF LIABILITY

-

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED - BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY - LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS - GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -

-

7. GENERAL

-

If any provision of this Agreement is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability of the - remainder of the terms of this Agreement, and without further action by the - parties hereto, such provision shall be reformed to the minimum extent - necessary to make such provision valid and enforceable. -

-

If Recipient institutes patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Program itself - (excluding combinations of the Program with other software or hardware) - infringes such Recipient's patent(s), then such Recipient's rights granted - under Section 2(b) shall terminate as of the date such litigation is filed. -

-

All Recipient's rights under this Agreement shall terminate if it fails to - comply with any of the material terms or conditions of this Agreement and - does not cure such failure in a reasonable period of time after becoming - aware of such noncompliance. If all Recipient's rights under this Agreement - terminate, Recipient agrees to cease use and distribution of the Program - as soon as reasonably practicable. However, Recipient's obligations under - this Agreement and any licenses granted by Recipient relating to the - Program shall continue and survive. -

-

Everyone is permitted to copy and distribute copies of this Agreement, - but in order to avoid inconsistency the Agreement is copyrighted and may - only be modified in the following manner. The Agreement Steward reserves - the right to publish new versions (including revisions) of this Agreement - from time to time. No one other than the Agreement Steward has the right - to modify this Agreement. The Eclipse Foundation is the initial Agreement - Steward. The Eclipse Foundation may assign the responsibility to serve as - the Agreement Steward to a suitable separate entity. Each new version of - the Agreement will be given a distinguishing version number. The Program - (including Contributions) may always be Distributed subject to the version - of the Agreement under which it was received. In addition, after a new - version of the Agreement is published, Contributor may elect to Distribute - the Program (including its Contributions) under the new version. -

-

Except as expressly stated in Sections 2(a) and 2(b) above, Recipient - receives no rights or licenses to the intellectual property of any - Contributor under this Agreement, whether expressly, by implication, - estoppel or otherwise. All rights in the Program not expressly granted - under this Agreement are reserved. Nothing in this Agreement is intended - to be enforceable by any entity that is not a Contributor or Recipient. - No third-party beneficiary rights are created under this Agreement. -

-

Exhibit A – Form of Secondary Licenses Notice

-

“This Source Code may also be made available under the following - Secondary Licenses when the conditions for such availability set forth - in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), - version(s), and exceptions or additional permissions here}.” -

-
-

Simply including a copy of this Agreement, including this Exhibit A - is not sufficient to license the Source Code under Secondary Licenses. -

-

If it is not possible or desirable to put the notice in a particular file, - then You may include the notice in a location (such as a LICENSE file in a - relevant directory) where a recipient would be likely to look for - such a notice. -

-

You may add additional accurate notices of copyright ownership.

-
- - \ No newline at end of file diff --git a/bundles/com.gwt.user/pom.xml b/bundles/com.gwt.user/pom.xml deleted file mode 100644 index b05808f..0000000 --- a/bundles/com.gwt.user/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - 4.0.0 - - - org.eclipse.kura - kura-management-ui.parent - 3.0.0-SNAPSHOT - - - com.gwt.user - 2.0.0-SNAPSHOT - - bundle - - gwt-user - GWT User Library - - - - org.gwtproject - gwt-servlet-jakarta - ${gwt.version} - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - true - - - - org.apache.felix - maven-bundle-plugin - ${maven-bundle-plugin.version} - true - - META-INF - - *;inline=true - ${project.artifactId} - ${project.name} - ${project.version} - - jakarta.servlet,jakarta.servlet.http - - - com.google.gwt.user.server.*,com.google.gwt.user.client.rpc.*, - com.google.gwt.i18n.client.*,com.google.gwt.safehtml.shared.*, - com.google.gwt.i18n.shared.* - - osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))" - - - - - - diff --git a/bundles/org.eclipse.kura.web2/META-INF/MANIFEST.MF b/bundles/org.eclipse.kura.web2/META-INF/MANIFEST.MF index 3b41e2e..b63f2b6 100644 --- a/bundles/org.eclipse.kura.web2/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.kura.web2/META-INF/MANIFEST.MF @@ -8,6 +8,10 @@ Bundle-License: Eclipse Public License v2.0 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))" Service-Component: OSGI-INF/*.xml Bundle-ActivationPolicy: lazy +Bundle-ClassPath: ., + lib/gwtbootstrap3.jar, + lib/gwt-servlet-jakarta.jar, + lib/gwt-user.jar Import-Package: com.eclipsesource.json;version="0.9.5", com.google.gson;version="2.7.0", jakarta.servlet;version="5.0.0", @@ -91,4 +95,3 @@ Import-Package: com.eclipsesource.json;version="0.9.5", org.slf4j;version="1.6.4", org.w3c.dom, org.xml.sax -Require-Bundle: com.gwt.user;bundle-version="[2.0,3.0)" diff --git a/bundles/org.eclipse.kura.web2/build.properties b/bundles/org.eclipse.kura.web2/build.properties index f59bf91..e70c42d 100644 --- a/bundles/org.eclipse.kura.web2/build.properties +++ b/bundles/org.eclipse.kura.web2/build.properties @@ -17,12 +17,14 @@ bin.includes = .,\ OSGI-INF/,\ about.html,\ about_files/,\ - -output.. = target/classes/ + lib/gwtbootstrap3.jar,\ + lib/gwt-servlet-jakarta.jar,\ + lib/gwt-user.jar source.. = src/main/java/,\ src/main/resources/,\ target/generated-sources/gwt jars.extra.classpath = lib/gwtbootstrap3.jar,\ - lib/gwt-user.jar + lib/gwt-user.jar,\ + lib/gwt-servlet-jakarta.jar additional.bundles = org.osgi.service.component.annotations,\ - org.osgi.service.metatype.annotations \ No newline at end of file + org.osgi.service.metatype.annotations diff --git a/bundles/org.eclipse.kura.web2/pom.xml b/bundles/org.eclipse.kura.web2/pom.xml index 4e9832e..3302247 100644 --- a/bundles/org.eclipse.kura.web2/pom.xml +++ b/bundles/org.eclipse.kura.web2/pom.xml @@ -45,6 +45,11 @@ gwt-user ${gwt.version} + + org.gwtproject + gwt-servlet-jakarta + ${gwt.version} + @@ -82,6 +87,11 @@ gwt-user ${gwt.version} + + org.gwtproject + gwt-servlet-jakarta + ${gwt.version} + diff --git a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/EntryClassUi.java b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/EntryClassUi.java index 272c35b..f205f0a 100644 --- a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/EntryClassUi.java +++ b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/EntryClassUi.java @@ -850,7 +850,7 @@ private void changePassword() { loadPasswordStrengthRequirements(passwordStrengthRequirements -> { final PasswordChangeModal passwordChangeModal = new PasswordChangeModal(); - passwordChangeModal.pickPassword(passwordStrengthRequirements, this::setNewPassword); + passwordChangeModal.pickPassword(Optional.empty(), passwordStrengthRequirements, this::setNewPassword); }); } diff --git a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/NewPasswordInput.java b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/NewPasswordInput.java index 2e88272..7cdc770 100644 --- a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/NewPasswordInput.java +++ b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/NewPasswordInput.java @@ -16,6 +16,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Optional; import org.eclipse.kura.web.client.ui.validator.GwtValidators; import org.eclipse.kura.web.shared.model.GwtPasswordStrenghtRequirements; @@ -60,10 +61,10 @@ public List validate(final Editor editor, final String valu }); } - public void setValidatorsFrom(final GwtPasswordStrenghtRequirements userOptions) { + public void setValidatorsFrom(final Optional identityName, final GwtPasswordStrenghtRequirements userOptions) { this.validators.clear(); - for (final Validator validator : GwtValidators.newPassword(userOptions)) { + for (final Validator validator : GwtValidators.newPassword(identityName, userOptions)) { this.validators.add(validator); } } diff --git a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/login/LoginUi.java b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/login/LoginUi.java index 671fc9d..aa085e1 100644 --- a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/login/LoginUi.java +++ b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/login/LoginUi.java @@ -15,6 +15,7 @@ import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.function.Consumer; import java.util.function.Supplier; @@ -24,9 +25,9 @@ import org.eclipse.kura.web.client.ui.AlertDialog.ConfirmListener; import org.eclipse.kura.web.shared.GwtKuraErrorCode; import org.eclipse.kura.web.shared.GwtKuraException; -import org.eclipse.kura.web.shared.model.GwtPasswordStrenghtRequirements; import org.eclipse.kura.web.shared.model.GwtLoginInfo; import org.eclipse.kura.web.shared.model.GwtPasswordAuthenticationResult; +import org.eclipse.kura.web.shared.model.GwtPasswordStrenghtRequirements; import org.eclipse.kura.web.shared.service.GwtLoginInfoService; import org.eclipse.kura.web.shared.service.GwtLoginInfoServiceAsync; import org.eclipse.kura.web.shared.service.GwtPasswordAuthenticationService; @@ -370,7 +371,7 @@ private void setNewPassword(final String oldPassword, final String newPassword, private void changePassword(final Consumer onSuccess, final Consumer onFailure) { - getGwtConsoleUserOptions(options -> this.passwordChangeModal.pickPassword(options, + getGwtConsoleUserOptions(options -> this.passwordChangeModal.pickPassword(Optional.of(this.usernameInput.getValue()), options, (oldPass, newPass) -> setNewPassword(oldPass, newPass, onSuccess, onFailure)), onFailure); } diff --git a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/login/PasswordChangeModal.java b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/login/PasswordChangeModal.java index a00587a..5dab8af 100644 --- a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/login/PasswordChangeModal.java +++ b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/login/PasswordChangeModal.java @@ -78,7 +78,7 @@ public int getPriority() { @Override public List validate(Editor editor, String value) { - if (value == null || value.length() <= 0) { + if (value == null || value.trim().isEmpty()) { return Collections .singletonList(new BasicEditorError(editor, value, MSGS.loginEnterCurrentPassword())); } @@ -131,7 +131,7 @@ private void validate() { } @SuppressWarnings("unchecked") - private void setUserOptions(final GwtPasswordStrenghtRequirements options) { + private void setUserOptions(final Optional identityName, final GwtPasswordStrenghtRequirements options) { this.newPassword.setValidators(new Validator() { @Override @@ -143,7 +143,7 @@ public int getPriority() { public List validate(final Editor editor, final String value) { final List result = new ArrayList<>(); - for (final Validator validator : GwtValidators.newPassword(options)) { + for (final Validator validator : GwtValidators.newPassword(identityName, options)) { result.addAll(validator.validate(editor, value)); } @@ -153,11 +153,11 @@ public List validate(final Editor editor, final String valu }); } - public void pickPassword(final GwtPasswordStrenghtRequirements options, final Callback callback) { + public void pickPassword(Optional identityName, final GwtPasswordStrenghtRequirements options, final Callback callback) { this.oldPassword.setValue(""); this.newPassword.setValue(""); this.confirmNewPassword.setValue(""); - setUserOptions(options); + setUserOptions(identityName, options); this.callback = Optional.of(callback); this.passwordChangeModal.show(); diff --git a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabWirelessUi.java b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabWirelessUi.java index e35d6f5..9310993 100644 --- a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabWirelessUi.java +++ b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/network/TabWirelessUi.java @@ -1287,7 +1287,7 @@ private void setPasswordValidation() { || this.security.getSelectedItemText().contentEquals(WIFI_SECURITY_WPA_WPA2_MESSAGE) || this.security.getSelectedItemText().contentEquals(WIFI_SECURITY_WPA2_WPA3_MESSAGE))) { - this.password.setValidatorsFrom(passwordStrengthRequirements); + this.password.setValidatorsFrom(Optional.empty(), passwordStrengthRequirements); passwordStrengthRequirements.setPasswordMinimumLength(Math.min(passwordStrengthRequirements.getPasswordMinimumLength(), 63)); this.password @@ -1297,12 +1297,12 @@ private void setPasswordValidation() { passwordStrengthRequirements.setPasswordRequireSpecialChars(false); passwordStrengthRequirements.setPasswordMinimumLength(Math.min(passwordStrengthRequirements.getPasswordMinimumLength(), 26)); - this.password.setValidatorsFrom(passwordStrengthRequirements); + this.password.setValidatorsFrom(Optional.empty(), passwordStrengthRequirements); this.password .addValidator(GwtValidators.regex(REGEX_PASS_WEP, MSGS.netWifiWirelessInvalidWEPPassword())); } else { passwordStrengthRequirements.allowAnyPassword(); - this.password.setValidatorsFrom(passwordStrengthRequirements); + this.password.setValidatorsFrom(Optional.empty(), passwordStrengthRequirements); } }); diff --git a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/users/UserConfigUi.java b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/users/UserConfigUi.java index 9f80eaf..d263afe 100644 --- a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/users/UserConfigUi.java +++ b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/users/UserConfigUi.java @@ -276,7 +276,8 @@ private void pickPassword() { .setMessage(MSGS.usersDefineNewPassword()) // .setInputCustomizer(input -> input.setType(InputType.PASSWORD)) // .setOnCancel(onDismiss) // - .setValidators(GwtValidators.newPassword(passwordStrengthRequirements)) // + .setValidators(GwtValidators.newPassword(Optional.of(this.userData.getUserName()), // + passwordStrengthRequirements)) // .setOnPick(newPassword -> this.picker.builder() // .setTitle(MSGS.usersConfirmPassword()) // .setMessage(MSGS.usersRepeatPassword()) // diff --git a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/validator/GwtValidators.java b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/validator/GwtValidators.java index 11cffe1..8e6893e 100644 --- a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/validator/GwtValidators.java +++ b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/validator/GwtValidators.java @@ -13,8 +13,8 @@ package org.eclipse.kura.web.client.ui.validator; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; +import java.util.Optional; import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -48,15 +48,20 @@ public class GwtValidators { private GwtValidators() { } - public static List> newPassword(final GwtPasswordStrenghtRequirements userOptions) { + public static List> newPassword(final Optional identityName, + final GwtPasswordStrenghtRequirements userOptions) { - final List> defaultValidators = Arrays.asList( - stringLength(255, MSGS.pwdMaxLength()), - noWhitespaceCharacters(MSGS.pwdWhitespaceCharacters()), - nonEmpty(MSGS.pwdEmpty())); + final List> defaultValidators = new ArrayList<>(); + + defaultValidators.add(stringLength(255, MSGS.pwdMaxLength())); + defaultValidators.add(noWhitespaceCharacters(MSGS.pwdWhitespaceCharacters())); + defaultValidators.add(nonEmpty(MSGS.pwdEmpty())); - return Stream - .concat(PasswordStrengthValidators.fromConfig(userOptions, new PasswordStrengthValidators.Messages() { + identityName.ifPresent( + id -> defaultValidators.add(notEqualsIdentityName(id, MSGS.pwdStrengthNotEqualsIdentityName()))); + + return Stream.concat(PasswordStrengthValidators + .fromConfig(identityName, userOptions, new PasswordStrengthValidators.Messages() { @Override public String pwdStrengthDigitsRequired() { @@ -78,6 +83,11 @@ public String pwdStrengthMinLength(int value) { return MSGS.pwdStrengthMinLength(Integer.toString(value)); } + @Override + public String pwdNotEqualsUsername() { + return MSGS.pwdStrengthNotEqualsIdentityName(); + } + }).stream().map(v -> new ValidatorWrapper<>(v, Priority.MEDIUM)), defaultValidators.stream()) .collect(Collectors.toList()); } @@ -87,6 +97,10 @@ public static Validator nonEmpty(final String message) { }; } + public static Validator notEqualsIdentityName(final String identityName, final String message) { + return new ValidatorWrapper<>(new PredicateValidator(v -> !v.equalsIgnoreCase(identityName), message), Priority.MEDIUM); + } + public static Validator notInList(final List values, final String message) { return new ValidatorWrapper(new NotInListValidator<>(values, message), Priority.MEDIUM) { }; @@ -138,7 +152,8 @@ public static Validator noWhitespaceCharacters(final String message) { } public static Validator punctuatedAlphanumericSequence(final char[] delimiters, final String message) { - return new ValidatorWrapper(new PunctuatedAlphanumericSequenceValidator(delimiters, message), Priority.MEDIUM) { + return new ValidatorWrapper(new PunctuatedAlphanumericSequenceValidator(delimiters, message), + Priority.MEDIUM) { }; } diff --git a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/KuraRemoteServiceServlet.java b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/KuraRemoteServiceServlet.java index 5ed9d81..90dd32d 100644 --- a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/KuraRemoteServiceServlet.java +++ b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/KuraRemoteServiceServlet.java @@ -42,9 +42,6 @@ public class KuraRemoteServiceServlet extends RemoteServiceServlet { - /** - * - */ private static final long serialVersionUID = 3473193315046407200L; private static final Logger logger = LoggerFactory.getLogger(KuraRemoteServiceServlet.class); private static final Logger auditLogger = LoggerFactory.getLogger("AuditLogger"); @@ -216,9 +213,13 @@ public static String getFieldFromMultiPartForm(HttpServletRequest req, String fi if (item.isFormField()) { String name = item.getFieldName(); - if (name.equals(fieldName)) { - fieldValue = item.getString(); - logger.debug("Found field name '{}' with value: {}", name, fieldValue); + try { + if (name.equals(fieldName)) { + fieldValue = item.getString(); + logger.debug("Found field name '{}' with value: {}", name, fieldValue); + } + } catch(IOException e) { + throw new FileUploadException(e.getMessage(), e); } } } diff --git a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/net2/configuration/NetworkConfigurationServicePropertiesBuilder.java b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/net2/configuration/NetworkConfigurationServicePropertiesBuilder.java index 7ba358d..328dcca 100644 --- a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/net2/configuration/NetworkConfigurationServicePropertiesBuilder.java +++ b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/net2/configuration/NetworkConfigurationServicePropertiesBuilder.java @@ -226,8 +226,7 @@ private void setWifiMasterProperties() throws GwtKuraException { if (gwtWifiConfig.getPassword() != null) { if (GwtServerUtil.PASSWORD_PLACEHOLDER.equals(gwtWifiConfig.getPassword()) - && this.oldGwtNetInterfaceConfig instanceof GwtWifiNetInterfaceConfig) { - GwtWifiNetInterfaceConfig gwtWifiNetInterfaceConfig = (GwtWifiNetInterfaceConfig) this.oldGwtNetInterfaceConfig; + && this.oldGwtNetInterfaceConfig instanceof GwtWifiNetInterfaceConfig gwtWifiNetInterfaceConfig) { gwtWifiNetInterfaceConfig.setUnescaped(true); GwtWifiConfig gwtApConfig = gwtWifiNetInterfaceConfig.getAccessPointWifiConfig(); @@ -235,7 +234,7 @@ private void setWifiMasterProperties() throws GwtKuraException { this.properties.setWifiMasterPassphrase(this.ifname, gwtApConfig.getPassword()); } else { - GwtServerUtil.validateUserPassword(gwtWifiConfig.getPassword()); + GwtServerUtil.validateUserPassword(Optional.empty(), gwtWifiConfig.getPassword()); this.properties.setWifiMasterPassphrase(this.ifname, gwtWifiConfig.getPassword()); } } diff --git a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/servlet/FileServlet.java b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/servlet/FileServlet.java index 5591e33..3deab96 100644 --- a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/servlet/FileServlet.java +++ b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/servlet/FileServlet.java @@ -526,7 +526,12 @@ private void doPostConfigurationSnapshot(HttpServletRequest req) throws ServletE } DiskFileItem fileItem = fileItems.get(0); - byte[] data = fileItem.get(); + byte[] data; + try { + data = fileItem.get(); + } catch(IOException e) { + throw new ServletException(e.getMessage()); + } String fileItemString = new String(data, StandardCharsets.UTF_8); final List configImpls; @@ -894,11 +899,16 @@ public void parse(HttpServletRequest req) throws FileUploadException { if (item.isFormField()) { String name = item.getFieldName(); - String value = item.getString(); + + try { + String value = item.getString(); + logger.debug("Form field item name: {}, value: {}", name, value); - logger.debug("Form field item name: {}, value: {}", name, value); + this.formFields.put(name, value); + } catch(IOException e) { + throw new FileUploadException(e.getMessage(), e); + } - this.formFields.put(name, value); } else { String fieldName = item.getFieldName(); String fileName = item.getName(); diff --git a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/util/GwtServerUtil.java b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/util/GwtServerUtil.java index c7a8803..4940fdc 100644 --- a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/util/GwtServerUtil.java +++ b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/util/GwtServerUtil.java @@ -818,10 +818,11 @@ public static Optional getPostLoginMessage() throws GwtKuraException { LoginBannerService::getPostLoginBanner); } - public static void validateUserPassword(final String password) throws GwtKuraException { + public static void validateUserPassword(final Optional username, final String password) + throws GwtKuraException { - final List> validators = PasswordStrengthValidators - .fromConfig(getPasswordStrenghtRequirements()); + final List> validators = PasswordStrengthValidators.fromConfig(username, + getPasswordStrenghtRequirements()); final List errors = new ArrayList<>(); diff --git a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/service/GwtCloudConnectionService.java b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/service/GwtCloudConnectionService.java index eaa624f..0fa9886 100644 --- a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/service/GwtCloudConnectionService.java +++ b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/service/GwtCloudConnectionService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2016, 2021 Eurotech and/or its affiliates and others + * Copyright (c) 2016, 2025 Eurotech and/or its affiliates and others * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -15,13 +15,11 @@ import java.util.List; -import org.eclipse.kura.cloud.CloudService; import org.eclipse.kura.web.server.Audit; import org.eclipse.kura.web.server.RequiredPermissions; import org.eclipse.kura.web.shared.GwtKuraException; import org.eclipse.kura.web.shared.KuraPermission; import org.eclipse.kura.web.shared.model.GwtCloudComponentFactories; -import org.eclipse.kura.web.shared.model.GwtCloudConnectionEntry; import org.eclipse.kura.web.shared.model.GwtCloudEntry; import org.eclipse.kura.web.shared.model.GwtConfigComponent; import org.eclipse.kura.web.shared.model.GwtXSRFToken; diff --git a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/validator/PasswordStrengthValidators.java b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/validator/PasswordStrengthValidators.java index 2fbeb59..b0579ec 100644 --- a/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/validator/PasswordStrengthValidators.java +++ b/bundles/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/shared/validator/PasswordStrengthValidators.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Optional; import org.eclipse.kura.web.shared.model.GwtPasswordStrenghtRequirements; @@ -27,11 +28,13 @@ public class PasswordStrengthValidators { private PasswordStrengthValidators() { } - public static List> fromConfig(final GwtPasswordStrenghtRequirements userOptions) { - return fromConfig(userOptions, new DefaultMessages()); + public static List> fromConfig(final Optional identityName, + final GwtPasswordStrenghtRequirements userOptions) { + return fromConfig(identityName, userOptions, new DefaultMessages()); } - public static List> fromConfig(final GwtPasswordStrenghtRequirements userOptions, final Messages messages) { + public static List> fromConfig(final Optional identityName, + final GwtPasswordStrenghtRequirements userOptions, final Messages messages) { final List> result = new ArrayList<>(); final int minPasswordLength = userOptions.getPasswordMinimumLength(); @@ -52,6 +55,8 @@ public static List> fromConfig(final GwtPasswordStrenghtRequir result.add(containsSpecialChars(messages)); } + identityName.ifPresent(id -> result.add(requireDifferentNameAndPassword(id, messages))); + return result; } @@ -82,6 +87,12 @@ private static Validator containsBothCases(final Messages messages) { }; } + private static Validator requireDifferentNameAndPassword(final String identityName, + final Messages messages) { + + return new PredicateValidator(v -> !v.equalsIgnoreCase(identityName), messages.pwdNotEqualsUsername()); + } + public interface Messages { public String pwdStrengthDigitsRequired(); @@ -91,6 +102,8 @@ public interface Messages { public String pwdStrengthBothCasesRequired(); public String pwdStrengthMinLength(final int value); + + public String pwdNotEqualsUsername(); } private static class DefaultMessages implements Messages { @@ -114,6 +127,11 @@ public String pwdStrengthBothCasesRequired() { public String pwdStrengthMinLength(final int value) { return "Password length must be at least " + value + " characters"; } + + @Override + public String pwdNotEqualsUsername() { + return "The password cannot be the same as the identity name"; + } } } diff --git a/bundles/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties b/bundles/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties index 3a54b52..c29dbf9 100644 --- a/bundles/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties +++ b/bundles/org.eclipse.kura.web2/src/main/resources/org/eclipse/kura/web/client/messages/Messages.properties @@ -897,6 +897,7 @@ pwdStrengthBothCasesRequired=Password must contain both uppercase and lowercase pwdMaxLength=New password can be at most 255 characters long pwdWhitespaceCharacters=New password cannot contain whitespace characters pwdEmpty=New password cannot be empty +pwdStrengthNotEqualsIdentityName=The identity name cannot be the same as the password logDownload=Click this button to download all system logs in a single zip file. The process may take up to 5 minutes. diff --git a/bundles/pom.xml b/bundles/pom.xml index 94b3abb..df35817 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -200,14 +200,14 @@ ${maven-deploy-version} - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - true - - + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven-checkstyle-plugin.version} + + true + + org.honton.chas @@ -313,33 +313,6 @@ org.apache.maven.plugins maven-jarsigner-plugin - - org.apache.maven.plugins - maven-dependency-plugin - 3.6.0 - - - copy-local-target-definition - generate-resources - false - - copy - - - - - org.eclipse.kura - kura-target-definition.target - ${kura.target.definition.version} - target - ${project.basedir}/../target-definition - kura-target-definition.target - - - - - - @@ -363,10 +336,36 @@ Eclipse Kura Repository - Snapshots https://repo.eclipse.org/content/repositories/kura-snapshots/ + + kura-addons + Kura Addons Maven Repository + https://raw.github.com/eurotech/kura_addons/mvn-repo/ + + + central + https://repo1.maven.org/maven2/ + + + + jitpack.io + https://jitpack.io + + + + repo.eclipse.org + Kura Repository - Releases + https://repo.eclipse.org/content/repositories/kura-releases/ + + + repo.eclipse.org + Kura Repository - Snapshots + https://repo.eclipse.org/content/repositories/kura-snapshots/ + + + org.eclipse.kura.web2 - com.gwt.user \ No newline at end of file diff --git a/distrib/pom.xml b/distrib/pom.xml index 50f9bd4..d9740a6 100644 --- a/distrib/pom.xml +++ b/distrib/pom.xml @@ -42,8 +42,6 @@ org.eclipse.kura.web2 - com.gwt.user - 2.0.0-SNAPSHOT all @@ -167,18 +165,7 @@ com.coderplus.maven.plugins copy-rename-maven-plugin 1.0.1 - - - copy-and-rename-gwt-user-jar - generate-sources - - copy - - - ${project.basedir}/../bundles/${com.gwt.user.jar.name}/target/${com.gwt.user.jar.name}-${com.gwt.user.version}.jar - target/input_files/${com.gwt.user.jar.name}_${com.gwt.user.version}.jar - - + copy-and-rename-web2-jar generate-sources @@ -212,19 +199,6 @@ ${project.basedir}/deb/control false - - ${basedir}/target/input_files/${com.gwt.user.jar.name}_${com.gwt.user.version}.jar - ${com.gwt.user.jar.name}_${com.gwt.user.version}.jar - file - - perm - ${addon.installation.dir}/3 - kurad - kurad - 600 - - - ${basedir}/target/input_files/${web2.jar.name}_${project.version}.jar ${web2.jar.name}_${project.version}.jar diff --git a/target-definition/kura-management-ui.target.target b/target-definition/kura-management-ui.target.target index 1f79257..a8c0806 100644 --- a/target-definition/kura-management-ui.target.target +++ b/target-definition/kura-management-ui.target.target @@ -15,8 +15,21 @@ --> - + + + org.eclipse.kura + target-platform-bom + 6.0.0-SNAPSHOT + pom + + + org.eclipse.kura + kura-bom + 6.0.0-SNAPSHOT + pom + org.eclipse.kura org.eclipse.kura.net.admin.firewall @@ -37,34 +50,43 @@ org.eclipse.kura - com.gwt.user - 2.0.0-SNAPSHOT + org.eclipse.kura.asset.provider + 3.0.0-SNAPSHOT + jar + + + org.eclipse.kura + org.eclipse.kura.wire.component.provider + 3.0.0-SNAPSHOT jar - - eurotech-kura - https://raw.githubusercontent.com/eurotech/kura_addons/mvn-repo/ - - - eclipse-releases - https://repo.eclipse.org/content/groups/releases/ - kura-releases + Eclipse Kura Repository - Releases https://repo.eclipse.org/content/repositories/kura-releases/ - kura-snapshot + kura-snapshots + Eclipse Kura Repository - Snapshots https://repo.eclipse.org/content/repositories/kura-snapshots/ + + kura-addons + Kura Addons Maven Repository + https://raw.github.com/eurotech/kura_addons/mvn-repo/ + central https://repo1.maven.org/maven2/ + + + jitpack.io + https://jitpack.io + - diff --git a/target-definition/kura-target-definition.target b/target-definition/kura-target-definition.target deleted file mode 100644 index 3da7d13..0000000 --- a/target-definition/kura-target-definition.target +++ /dev/null @@ -1,1201 +0,0 @@ - - - - - - - - - - eclipse-releases - https://repo.eclipse.org/content/groups/releases/ - - - kura-releases - https://repo.eclipse.org/content/repositories/kura-releases/ - - - eurotech-kura - https://raw.githubusercontent.com/eurotech/kura_addons/mvn-repo/ - - - central - https://repo1.maven.org/maven2/ - - - - - - - - - org.eclipse.paho - org.eclipse.paho.client.mqttv3 - 1.2.1 - - - org.eclipse.kura - com.codeminders.hidapi.x86_64 - 2.0.0-SNAPSHOT - - - org.eclipse.kura - com.codeminders.hidapi.aarch64 - 2.0.0-SNAPSHOT - - - org.eclipse.kura - com.codeminders.hidapi - 2.0.0-SNAPSHOT - - - org.eclipse.kura - com.gwt.user - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.moka7 - 2.0.0-SNAPSHOT - - - org.eclipse.kura - log4j2-api-config - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.soda.dk.comm.aarch64 - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.soda.dk.comm.x86_64 - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.soda.dk.comm - 2.0.0-SNAPSHOT - - - com.google.code.gson - gson - 2.9.0 - - - com.google.protobuf - protobuf-java - 4.30.2 - - - org.eclipse.kura - jdk.dio - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.rest.provider - 2.0.0-SNAPSHOT - - - org.eclipse.kura - jdk.dio.aarch64 - 2.0.0-SNAPSHOT - - - org.eclipse.kura - jdk.dio.x86_64 - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.sun.misc - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.usb4java - 2.0.0-SNAPSHOT - - - org.eclipse.kura - usb4java-javax - 2.0.0-SNAPSHOT - - - commons-beanutils - commons-beanutils - 1.9.3 - - - commons-collections - commons-collections - 3.2.2 - - - org.apache.commons - commons-fileupload2-jakarta-servlet5 - 2.0.0-M2 - - - org.apache.commons - commons-fileupload2-core - 2.0.0-M2 - - - commons-io - commons-io - 2.19.0 - - - org.apache.logging.log4j - log4j-api - 2.23.1 - - - org.apache.logging.log4j - log4j-core - 2.23.1 - - - org.apache.logging.log4j - log4j-slf4j2-impl - 2.23.1 - - - org.jboss.logging - jboss-logging - 3.3.2.Final - - - org.apache.qpid - qpid-jms-client - 0.45.0 - - - org.apache.qpid - proton-j - 0.33.2 - - - org.slf4j - slf4j-api - 2.0.17 - - - org.slf4j - jcl-over-slf4j - 2.0.17 - - - org.slf4j - jul-to-slf4j - 2.0.17 - - - org.apache.commons - commons-lang3 - 3.12.0 - - - org.apache.commons - commons-exec - 1.3 - - - org.apache.commons - commons-csv - 1.4 - - - commons-net - commons-net - 3.8.0 - - - com.eclipsesource.minimal-json - minimal-json - 0.9.5 - - - org.quartz-scheduler - quartz - 2.5.0 - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.c3p0 - 0.9.5.5_1 - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-beans - 4.3.20.RELEASE_1 - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-context - 4.3.20.RELEASE_1 - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-core - 4.3.20.RELEASE_1 - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-expression - 4.3.20.RELEASE_1 - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-jms - 4.3.20.RELEASE_1 - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.spring-tx - 4.3.20.RELEASE_1 - - - org.eclipse.kura - org.apache.activemq.artemis - 3.0.0-SNAPSHOT - - - org.apache.activemq - artemis-mqtt-protocol - 2.6.4 - - - org.apache.activemq - artemis-native - 2.6.4 - - - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - 1.3.7 - - - org.apache.camel - camel-amqp - 2.25.3 - - - org.apache.camel - camel-core - 2.25.3 - - - org.apache.camel - camel-core-osgi - 2.25.3 - - - org.apache.camel - camel-jms - 2.25.3 - - - org.apache.camel - camel-script - 2.25.3 - - - org.apache.camel - camel-stream - 2.25.3 - - - com.zaxxer - HikariCP - 2.7.9 - - - com.h2database - h2 - 2.1.214 - - - org.apache.felix - org.apache.felix.http.servlet-api - 3.0.0 - - - org.apache.felix - org.apache.felix.http.bridge - 5.1.8 - - - org.apache.felix - org.apache.felix.http.proxy - 4.0.0 - - - org.apache.felix - org.apache.felix.http.wrappers - 1.1.2 - - - org.knowhowlab.osgi - monitoradmin - 1.0.3 - - - org.ow2.asm - asm - 9.7.1 - - - org.ow2.asm - asm-commons - 9.7.1 - - - org.ow2.asm - asm-tree - 9.7.1 - - - org.ow2.asm - asm-util - 9.7.1 - - - org.ow2.asm - asm-analysis - 9.7.1 - - - com.google.guava - guava - 32.1.1-jre - - - com.google.guava - failureaccess - 1.0.1 - - - - - io.netty - netty-buffer - 4.1.121.Final - - - io.netty - netty-codec - 4.1.121.Final - - - io.netty - netty-codec-http - 4.1.121.Final - - - io.netty - netty-codec-mqtt - 4.1.121.Final - - - io.netty - netty-common - 4.1.121.Final - - - io.netty - netty-handler - 4.1.121.Final - - - io.netty - netty-resolver - 4.1.121.Final - - - io.netty - netty-transport - 4.1.121.Final - - - io.netty - netty-transport-native-epoll - 4.1.121.Final - - - io.netty - netty-transport-classes-epoll - 4.1.121.Final - - - io.netty - netty-transport-classes-kqueue - 4.1.121.Final - - - io.netty - netty-transport-native-kqueue - 4.1.121.Final - - - io.netty - netty-transport-native-unix-common - 4.1.121.Final - - - - - - org.glassfish.hk2 - hk2-api - 3.1.1 - - - org.glassfish.hk2.external - aopalliance-repackaged - 3.1.1 - - - org.glassfish.hk2 - hk2-locator - 3.1.1 - - - org.glassfish.hk2 - hk2-utils - 3.1.1 - - - org.glassfish.jersey.inject - jersey-hk2 - 3.1.9 - - - org.glassfish.jersey.containers - jersey-container-servlet - 3.1.9 - - - org.glassfish.jersey.containers - jersey-container-servlet-core - 3.1.9 - - - org.glassfish.jersey.core - jersey-client - 3.1.9 - - - org.glassfish.jersey.core - jersey-common - 3.1.9 - - - org.glassfish.jersey.core - jersey-server - 3.1.9 - - - org.glassfish.jersey.ext - jersey-entity-filtering - 3.1.9 - - - org.glassfish.jersey.media - jersey-media-jaxb - 3.1.9 - - - org.glassfish.jersey.media - jersey-media-sse - 3.1.9 - - - org.glassfish.jersey.media - jersey-media-multipart - 3.1.9 - - - org.javassist - javassist - 3.30.2-GA - - - org.jvnet.mimepull - mimepull - 1.10.0 - - - io.dropwizard.metrics - metrics-core - 3.2.2 - - - - - - jakarta.activation - jakarta.activation-api - 2.1.2 - - - jakarta.annotation - jakarta.annotation-api - 2.1.1 - - - jakarta.inject - jakarta.inject-api - 2.0.1 - - - jakarta.validation - jakarta.validation-api - 3.0.2 - - - jakarta.xml.bind - jakarta.xml.bind-api - 4.0.2 - - - jakarta.xml.bind - jakarta.xml.bind-api - ${jakarta.xml.bind-api.javax.version} - - - jakarta.xml.ws - jakarta.xml.ws-api - 4.0.2 - - - jakarta.xml.soap - jakarta.xml.soap-api - 3.0.2 - - - jakarta.ws.rs - jakarta.ws.rs-api - 3.1.0 - - - com.sun.xml.bind - jaxb-osgi - 4.0.2 - - - com.sun.xml.bind - jaxb-osgi - ${jaxb-osgi.javax.version} - - - - - - jakarta.xml.bind - jakarta.xml.bind-api - ${jakarta.xml.bind-api.javax.version} - - - jakarta.activation - jakarta.activation-api - ${jakarta.activation-api.javax.version} - - - com.sun.xml.bind - jaxb-osgi - ${jaxb-osgi.javax.version} - - - - - - org.osgi - org.osgi.service.cm - 1.6.1 - - - org.osgi - org.osgi.service.component - 1.5.1 - - - org.osgi - org.osgi.service.coordinator - 1.0.2 - - - org.osgi - org.osgi.service.device - 1.1.1 - - - org.osgi - org.osgi.service.event - 1.4.1 - - - org.osgi - org.osgi.service.log.stream - 1.0.0 - - - org.osgi - org.osgi.service.metatype - 1.4.1 - - - org.osgi - org.osgi.service.prefs - 1.1.2 - - - org.osgi - org.osgi.service.provisioning - 1.2.0 - - - org.osgi - org.osgi.service.upnp - 1.2.1 - - - org.osgi - org.osgi.service.useradmin - 1.1.1 - - - org.osgi - org.osgi.service.wireadmin - 1.0.2 - - - - org.osgi - org.osgi.util.function - 1.2.0 - - - org.osgi - org.osgi.util.measurement - 1.0.2 - - - org.osgi - org.osgi.util.position - 1.0.1 - - - org.osgi - org.osgi.util.promise - 1.3.0 - - - org.osgi - org.osgi.util.pushstream - 1.1.0 - - - org.osgi - org.osgi.util.xml - 1.0.2 - - - org.osgi - osgi.annotation - 8.1.0 - - - org.osgi - org.osgi.service.http.whiteboard - 1.1.1 - - - org.osgi - org.osgi.service.jakartars - 2.0.0 - - - org.osgi - org.osgi.service.servlet - 2.0.0 - - - org.eclipse.platform - org.eclipse.equinox.cm - 1.6.100 - - - org.eclipse.platform - org.eclipse.equinox.common - 3.19.100 - - - org.eclipse.platform - org.eclipse.equinox.console - 1.4.800 - - - org.eclipse.platform - org.eclipse.equinox.event - 1.7.100 - - - org.eclipse.platform - org.eclipse.equinox.io - 1.1.300 - - - org.eclipse.platform - org.eclipse.equinox.launcher - 1.6.900 - - - org.eclipse.platform - org.eclipse.equinox.metatype - 1.6.600 - - - org.eclipse.platform - org.eclipse.equinox.preferences - 3.11.100 - - - org.eclipse.platform - org.eclipse.equinox.registry - 3.12.100 - - - org.eclipse.platform - org.eclipse.equinox.util - 1.1.300 - - - org.eclipse.platform - org.eclipse.equinox.wireadmin - 1.0.800 - - - - - org.eclipse.jetty - jetty-http - 12.0.14 - - - org.eclipse.jetty - jetty-security - 12.0.14 - - - org.eclipse.jetty - jetty-server - 12.0.14 - - - org.eclipse.jetty - jetty-session - 12.0.14 - - - org.eclipse.jetty - jetty-util - 12.0.14 - - - org.eclipse.jetty - jetty-io - 12.0.14 - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.14 - - - - org.eclipse.kura - org.eclipse.kura.sun.misc - 2.0.0-SNAPSHOT - - - - org.eclipse.platform - org.eclipse.core.runtime - 3.31.100 - - - org.eclipse.platform - org.eclipse.core.jobs - 3.15.400 - - - org.eclipse.platform - org.eclipse.core.contenttype - 3.9.500 - - - org.eclipse.platform - org.eclipse.equinox.app - 1.7.200 - - - org.eclipse.platform - org.eclipse.osgi.util - 3.7.300 - - - org.eclipse.platform - org.eclipse.osgi - 3.21.0 - - - org.eclipse.osgi-technology.rest - org.eclipse.osgitech.rest - 1.2.3 - - - org.eclipse.osgi-technology.rest - org.eclipse.osgitech.rest.sse - 1.2.3 - - - org.eclipse.osgi-technology.rest - org.eclipse.osgitech.rest.servlet.whiteboard - 1.2.3 - - - org.apache.felix - org.apache.felix.scr - 2.2.12 - - - org.apache.felix - org.apache.felix.gogo.command - 1.1.2 - - - org.apache.felix - org.apache.felix.gogo.runtime - 1.1.6 - - - org.apache.felix - org.apache.felix.gogo.shell - 1.1.4 - - - org.apache.felix - org.apache.felix.dependencymanager - 3.0.0 - - - org.apache.felix - org.apache.felix.deploymentadmin - 0.9.5 - - - org.apache.felix - org.apache.felix.useradmin - 1.0.4.k1 - - - org.apache.geronimo.specs - geronimo-json_1.0_spec - 1.0-alpha-1 - - - org.apache.geronimo.specs - geronimo-jms_2.0_spec - 1.0-alpha-2 - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - 1.1.1 - - - org.glassfish.hk2 - osgi-resource-locator - 1.0.3 - - - org.osgi - org.osgi.service.component.annotations - 1.5.1 - - - org.osgi - org.osgi.service.metatype.annotations - 1.4.1 - - - - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - - - org.bouncycastle - bctls-jdk18on - 1.78.1 - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - - - - - - org.junit - org.junit - 4.12.0.v201504281640 - - - org.hamcrest - org.hamcrest - 1.1.0.v20090501071000 - - - org.hamcrest - org.hamcrest.core - 1.3.0.v201303031735 - - - org.hamcrest - org.hamcrest.integration - 1.1.0.v201303031500 - - - org.hamcrest - org.hamcrest.library - 1.1.0.v20090501071000 - - - org.hamcrest - org.hamcrest.text - 1.1.0.v20090501071000 - - - org.mockito - mockito-core - 4.8.1 - test - - - org.objenesis - objenesis - 3.3 - - - net.bytebuddy - byte-buddy - 1.12.18 - - - net.bytebuddy - byte-buddy-agent - 1.12.18 - test - - - com.github.moquette-io.moquette - moquette-broker - 0.18.0 - - - - - - org.eclipse.kura - org.eclipse.kura.api - 3.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.core - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.core.crypto - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.core.configuration - 3.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.core.deployment - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.cloud.base.provider - 1.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.core.keystore - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.core.comm - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.core.status - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.core.identity - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.core.inventory - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.core.system - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.core.net - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.core.testutil - 6.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.json.marshaller.unmarshaller.provider - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.xml.marshaller.unmarshaller.provider - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.net.configuration - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.emulator - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.emulator.watchdog - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.emulator.net - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.emulator.position - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.emulator.clock - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.emulator.usb - 2.0.0-SNAPSHOT - - - - - - org.eclipse.kura - org.eclipse.kura.asset.provider - 3.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.deployment.agent - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.driver.block - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.util - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.wire.component.provider - 3.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.driver.helper.provider - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.request.handler.jaxrs - 2.0.0-SNAPSHOT - - - org.eclipse.kura - org.eclipse.kura.util.wire.test - 6.0.0-SNAPSHOT - - - - - - diff --git a/target-definition/pom.xml b/target-definition/pom.xml index 0e0d6e3..a66bbe5 100644 --- a/target-definition/pom.xml +++ b/target-definition/pom.xml @@ -14,10 +14,10 @@ --> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 4.0.0 + 4.0.0 org.eclipse.kura @@ -25,28 +25,25 @@ 3.0.0-SNAPSHOT ../bundles/pom.xml - - kura-management-ui.target - eclipse-target-definition - Target Definition for Kura Management UI - - - - - org.eclipse.tycho - tycho-maven-plugin - 4.0.11 - true - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - false - - - - - + kura-management-ui.target + eclipse-target-definition + Target Definition for Kura Management UI + + + + + org.eclipse.tycho + tycho-maven-plugin + true + + + org.apache.maven.plugins + maven-deploy-plugin + + false + + + + +