From 0b63930f08dd5b9869bf41c3970b644a27b00771 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Thu, 16 Jan 2020 18:58:45 +0200
Subject: [PATCH] Use gradle-maven-plugin from org.thingsboard groupId

---
 .travis.settings.xml              | 29 -----------------------------
 .travis.yml                       |  1 -
 msa/js-executor/package-lock.json | 23 +++++++++++++++++------
 msa/js-executor/pom.xml           |  2 +-
 msa/web-ui/pom.xml                |  2 +-
 pom.xml                           |  4 ++--
 transport/coap/pom.xml            |  2 +-
 transport/http/pom.xml            |  2 +-
 transport/mqtt/pom.xml            |  2 +-
 9 files changed, 24 insertions(+), 43 deletions(-)
 delete mode 100644 .travis.settings.xml

diff --git a/.travis.settings.xml b/.travis.settings.xml
deleted file mode 100644
index 4d71bd7796..0000000000
--- a/.travis.settings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright © 2016-2019 The Thingsboard Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd" xmlns="http://maven.apache.org/SETTINGS/1.1.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <mirrors>
-        <mirror>
-            <id>gradle-fix</id>
-            <name>Gradle fix</name>
-            <url>https://repo.gradle.org/gradle/libs-releases-local</url>
-            <mirrorOf>gradle</mirrorOf>
-        </mirror>
-    </mirrors>
-</settings>
diff --git a/.travis.yml b/.travis.yml
index 516f25ae3b..f635da5a55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ before_install:
   - export M2_HOME=/usr/local/maven
   - export MAVEN_OPTS="-Dmaven.repo.local=$HOME/.m2/repository -Xms1024m -Xmx3072m"
   - export HTTP_LOG_CONTROLLER_ERROR_STACK_TRACE=false
-  - cp .travis.settings.xml $HOME/.m2/settings.xml
 jdk:
  - openjdk8
 language: java
diff --git a/msa/js-executor/package-lock.json b/msa/js-executor/package-lock.json
index c61ef011a2..bc9fdf512d 100644
--- a/msa/js-executor/package-lock.json
+++ b/msa/js-executor/package-lock.json
@@ -1407,12 +1407,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -1427,17 +1429,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -1554,7 +1559,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -1566,6 +1572,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -1580,6 +1587,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -1691,7 +1699,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -1703,6 +1712,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -1824,6 +1834,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
diff --git a/msa/js-executor/pom.xml b/msa/js-executor/pom.xml
index e4faee234c..c047b56827 100644
--- a/msa/js-executor/pom.xml
+++ b/msa/js-executor/pom.xml
@@ -231,7 +231,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.fortasoft</groupId>
+                <groupId>org.thingsboard</groupId>
                 <artifactId>gradle-maven-plugin</artifactId>
                 <configuration>
                     <tasks>
diff --git a/msa/web-ui/pom.xml b/msa/web-ui/pom.xml
index 73fa4f922f..a735bf99b8 100644
--- a/msa/web-ui/pom.xml
+++ b/msa/web-ui/pom.xml
@@ -255,7 +255,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.fortasoft</groupId>
+                <groupId>org.thingsboard</groupId>
                 <artifactId>gradle-maven-plugin</artifactId>
                 <configuration>
                     <tasks>
diff --git a/pom.xml b/pom.xml
index 6b8c51ef55..27447b73f5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -160,9 +160,9 @@
                     <version>${spring-boot.version}</version>
                 </plugin>
                 <plugin>
-                    <groupId>org.fortasoft</groupId>
+                    <groupId>org.thingsboard</groupId>
                     <artifactId>gradle-maven-plugin</artifactId>
-                    <version>1.0.8</version>
+                    <version>1.0.9</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
diff --git a/transport/coap/pom.xml b/transport/coap/pom.xml
index 67fbee67f8..b78cffac17 100644
--- a/transport/coap/pom.xml
+++ b/transport/coap/pom.xml
@@ -260,7 +260,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.fortasoft</groupId>
+                <groupId>org.thingsboard</groupId>
                 <artifactId>gradle-maven-plugin</artifactId>
                 <configuration>
                     <tasks>
diff --git a/transport/http/pom.xml b/transport/http/pom.xml
index 54b95ea122..eb50b53b34 100644
--- a/transport/http/pom.xml
+++ b/transport/http/pom.xml
@@ -260,7 +260,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.fortasoft</groupId>
+                <groupId>org.thingsboard</groupId>
                 <artifactId>gradle-maven-plugin</artifactId>
                 <configuration>
                     <tasks>
diff --git a/transport/mqtt/pom.xml b/transport/mqtt/pom.xml
index 63dede47ff..04a78cae99 100644
--- a/transport/mqtt/pom.xml
+++ b/transport/mqtt/pom.xml
@@ -260,7 +260,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.fortasoft</groupId>
+                <groupId>org.thingsboard</groupId>
                 <artifactId>gradle-maven-plugin</artifactId>
                 <configuration>
                     <tasks>