简柏林 / thingskit · Commits

Commit 0b63930f08dd5b9869bf41c3970b644a27b00771

Authored by Igor Kulikov
1 parent a0238fe1

Use gradle-maven-plugin from org.thingsboard groupId

Inline Side-by-side
Showing 9 changed files with 24 additions and 43 deletions
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<!--  
3 -  
4 - Copyright © 2016-2019 The Thingsboard Authors  
5 -  
6 - Licensed under the Apache License, Version 2.0 (the "License");  
7 - you may not use this file except in compliance with the License.  
8 - You may obtain a copy of the License at  
9 -  
10 - http://www.apache.org/licenses/LICENSE-2.0  
11 -  
12 - Unless required by applicable law or agreed to in writing, software  
13 - distributed under the License is distributed on an "AS IS" BASIS,  
14 - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
15 - See the License for the specific language governing permissions and  
16 - limitations under the License.  
17 -  
18 --->  
19 -<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"  
20 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  
21 - <mirrors>  
22 - <mirror>  
23 - <id>gradle-fix</id>  
24 - <name>Gradle fix</name>  
25 - <url>https://repo.gradle.org/gradle/libs-releases-local</url>  
26 - <mirrorOf>gradle</mirrorOf>  
27 - </mirror>  
28 - </mirrors>  
29 -</settings>  
@@ -3,7 +3,6 @@ before_install: @@ -3,7 +3,6 @@ before_install:
3 - export M2_HOME=/usr/local/maven 3 - export M2_HOME=/usr/local/maven
4 - export MAVEN_OPTS="-Dmaven.repo.local=$HOME/.m2/repository -Xms1024m -Xmx3072m" 4 - export MAVEN_OPTS="-Dmaven.repo.local=$HOME/.m2/repository -Xms1024m -Xmx3072m"
5 - export HTTP_LOG_CONTROLLER_ERROR_STACK_TRACE=false 5 - export HTTP_LOG_CONTROLLER_ERROR_STACK_TRACE=false
6 - - cp .travis.settings.xml $HOME/.m2/settings.xml  
7 jdk: 6 jdk:
8 - openjdk8 7 - openjdk8
9 language: java 8 language: java
@@ -1407,12 +1407,14 @@ @@ -1407,12 +1407,14 @@
1407 "balanced-match": { 1407 "balanced-match": {
1408 "version": "1.0.0", 1408 "version": "1.0.0",
1409 "bundled": true, 1409 "bundled": true,
1410 - "dev": true 1410 + "dev": true,
  1411 + "optional": true
1411 }, 1412 },
1412 "brace-expansion": { 1413 "brace-expansion": {
1413 "version": "1.1.11", 1414 "version": "1.1.11",
1414 "bundled": true, 1415 "bundled": true,
1415 "dev": true, 1416 "dev": true,
  1417 + "optional": true,
1416 "requires": { 1418 "requires": {
1417 "balanced-match": "^1.0.0", 1419 "balanced-match": "^1.0.0",
1418 "concat-map": "0.0.1" 1420 "concat-map": "0.0.1"
@@ -1427,17 +1429,20 @@ @@ -1427,17 +1429,20 @@
1427 "code-point-at": { 1429 "code-point-at": {
1428 "version": "1.1.0", 1430 "version": "1.1.0",
1429 "bundled": true, 1431 "bundled": true,
1430 - "dev": true 1432 + "dev": true,
  1433 + "optional": true
1431 }, 1434 },
1432 "concat-map": { 1435 "concat-map": {
1433 "version": "0.0.1", 1436 "version": "0.0.1",
1434 "bundled": true, 1437 "bundled": true,
1435 - "dev": true 1438 + "dev": true,
  1439 + "optional": true
1436 }, 1440 },
1437 "console-control-strings": { 1441 "console-control-strings": {
1438 "version": "1.1.0", 1442 "version": "1.1.0",
1439 "bundled": true, 1443 "bundled": true,
1440 - "dev": true 1444 + "dev": true,
  1445 + "optional": true
1441 }, 1446 },
1442 "core-util-is": { 1447 "core-util-is": {
1443 "version": "1.0.2", 1448 "version": "1.0.2",
@@ -1554,7 +1559,8 @@ @@ -1554,7 +1559,8 @@
1554 "inherits": { 1559 "inherits": {
1555 "version": "2.0.3", 1560 "version": "2.0.3",
1556 "bundled": true, 1561 "bundled": true,
1557 - "dev": true 1562 + "dev": true,
  1563 + "optional": true
1558 }, 1564 },
1559 "ini": { 1565 "ini": {
1560 "version": "1.3.5", 1566 "version": "1.3.5",
@@ -1566,6 +1572,7 @@ @@ -1566,6 +1572,7 @@
1566 "version": "1.0.0", 1572 "version": "1.0.0",
1567 "bundled": true, 1573 "bundled": true,
1568 "dev": true, 1574 "dev": true,
  1575 + "optional": true,
1569 "requires": { 1576 "requires": {
1570 "number-is-nan": "^1.0.0" 1577 "number-is-nan": "^1.0.0"
1571 } 1578 }
@@ -1580,6 +1587,7 @@ @@ -1580,6 +1587,7 @@
1580 "version": "3.0.4", 1587 "version": "3.0.4",
1581 "bundled": true, 1588 "bundled": true,
1582 "dev": true, 1589 "dev": true,
  1590 + "optional": true,
1583 "requires": { 1591 "requires": {
1584 "brace-expansion": "^1.1.7" 1592 "brace-expansion": "^1.1.7"
1585 } 1593 }
@@ -1691,7 +1699,8 @@ @@ -1691,7 +1699,8 @@
1691 "number-is-nan": { 1699 "number-is-nan": {
1692 "version": "1.0.1", 1700 "version": "1.0.1",
1693 "bundled": true, 1701 "bundled": true,
1694 - "dev": true 1702 + "dev": true,
  1703 + "optional": true
1695 }, 1704 },
1696 "object-assign": { 1705 "object-assign": {
1697 "version": "4.1.1", 1706 "version": "4.1.1",
@@ -1703,6 +1712,7 @@ @@ -1703,6 +1712,7 @@
1703 "version": "1.4.0", 1712 "version": "1.4.0",
1704 "bundled": true, 1713 "bundled": true,
1705 "dev": true, 1714 "dev": true,
  1715 + "optional": true,
1706 "requires": { 1716 "requires": {
1707 "wrappy": "1" 1717 "wrappy": "1"
1708 } 1718 }
@@ -1824,6 +1834,7 @@ @@ -1824,6 +1834,7 @@
1824 "version": "1.0.2", 1834 "version": "1.0.2",
1825 "bundled": true, 1835 "bundled": true,
1826 "dev": true, 1836 "dev": true,
  1837 + "optional": true,
1827 "requires": { 1838 "requires": {
1828 "code-point-at": "^1.0.0", 1839 "code-point-at": "^1.0.0",
1829 "is-fullwidth-code-point": "^1.0.0", 1840 "is-fullwidth-code-point": "^1.0.0",
@@ -231,7 +231,7 @@ @@ -231,7 +231,7 @@
231 </executions> 231 </executions>
232 </plugin> 232 </plugin>
233 <plugin> 233 <plugin>
234 - <groupId>org.fortasoft</groupId> 234 + <groupId>org.thingsboard</groupId>
235 <artifactId>gradle-maven-plugin</artifactId> 235 <artifactId>gradle-maven-plugin</artifactId>
236 <configuration> 236 <configuration>
237 <tasks> 237 <tasks>
@@ -255,7 +255,7 @@ @@ -255,7 +255,7 @@
255 </executions> 255 </executions>
256 </plugin> 256 </plugin>
257 <plugin> 257 <plugin>
258 - <groupId>org.fortasoft</groupId> 258 + <groupId>org.thingsboard</groupId>
259 <artifactId>gradle-maven-plugin</artifactId> 259 <artifactId>gradle-maven-plugin</artifactId>
260 <configuration> 260 <configuration>
261 <tasks> 261 <tasks>
@@ -160,9 +160,9 @@ @@ -160,9 +160,9 @@
160 <version>${spring-boot.version}</version> 160 <version>${spring-boot.version}</version>
161 </plugin> 161 </plugin>
162 <plugin> 162 <plugin>
163 - <groupId>org.fortasoft</groupId> 163 + <groupId>org.thingsboard</groupId>
164 <artifactId>gradle-maven-plugin</artifactId> 164 <artifactId>gradle-maven-plugin</artifactId>
165 - <version>1.0.8</version> 165 + <version>1.0.9</version>
166 </plugin> 166 </plugin>
167 <plugin> 167 <plugin>
168 <groupId>org.apache.maven.plugins</groupId> 168 <groupId>org.apache.maven.plugins</groupId>
@@ -260,7 +260,7 @@ @@ -260,7 +260,7 @@
260 </executions> 260 </executions>
261 </plugin> 261 </plugin>
262 <plugin> 262 <plugin>
263 - <groupId>org.fortasoft</groupId> 263 + <groupId>org.thingsboard</groupId>
264 <artifactId>gradle-maven-plugin</artifactId> 264 <artifactId>gradle-maven-plugin</artifactId>
265 <configuration> 265 <configuration>
266 <tasks> 266 <tasks>
@@ -260,7 +260,7 @@ @@ -260,7 +260,7 @@
260 </executions> 260 </executions>
261 </plugin> 261 </plugin>
262 <plugin> 262 <plugin>
263 - <groupId>org.fortasoft</groupId> 263 + <groupId>org.thingsboard</groupId>
264 <artifactId>gradle-maven-plugin</artifactId> 264 <artifactId>gradle-maven-plugin</artifactId>
265 <configuration> 265 <configuration>
266 <tasks> 266 <tasks>
@@ -260,7 +260,7 @@ @@ -260,7 +260,7 @@
260 </executions> 260 </executions>
261 </plugin> 261 </plugin>
262 <plugin> 262 <plugin>
263 - <groupId>org.fortasoft</groupId> 263 + <groupId>org.thingsboard</groupId>
264 <artifactId>gradle-maven-plugin</artifactId> 264 <artifactId>gradle-maven-plugin</artifactId>
265 <configuration> 265 <configuration>
266 <tasks> 266 <tasks>