Browse Source

Use gradle-maven-plugin from org.thingsboard groupId

pull/2411/head
Igor Kulikov 7 years ago
parent
commit
0b63930f08
  1. 29
      .travis.settings.xml
  2. 1
      .travis.yml
  3. 23
      msa/js-executor/package-lock.json
  4. 2
      msa/js-executor/pom.xml
  5. 2
      msa/web-ui/pom.xml
  6. 4
      pom.xml
  7. 2
      transport/coap/pom.xml
  8. 2
      transport/http/pom.xml
  9. 2
      transport/mqtt/pom.xml

29
.travis.settings.xml

@ -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>

1
.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

23
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",

2
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>

2
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>

4
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>

2
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>

2
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>

2
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>

Loading…
Cancel
Save