Commit 580e751398f3fae76ca65b0779649b9d03b4b7cc
1 parent
25dc4e4e
Use gradle-maven-plugin from org.thingsboard groupId
Showing
9 changed files
with
8 additions
and
38 deletions
.travis.settings.xml
deleted
100644 → 0
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | -<!-- | ||
| 3 | - | ||
| 4 | - Copyright © 2016-2020 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 |
| @@ -547,7 +547,7 @@ | @@ -547,7 +547,7 @@ | ||
| 547 | </executions> | 547 | </executions> |
| 548 | </plugin> | 548 | </plugin> |
| 549 | <plugin> | 549 | <plugin> |
| 550 | - <groupId>org.fortasoft</groupId> | 550 | + <groupId>org.thingsboard</groupId> |
| 551 | <artifactId>gradle-maven-plugin</artifactId> | 551 | <artifactId>gradle-maven-plugin</artifactId> |
| 552 | <configuration> | 552 | <configuration> |
| 553 | <tasks> | 553 | <tasks> |
| @@ -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> |
| @@ -171,9 +171,9 @@ | @@ -171,9 +171,9 @@ | ||
| 171 | <version>${spring-boot.version}</version> | 171 | <version>${spring-boot.version}</version> |
| 172 | </plugin> | 172 | </plugin> |
| 173 | <plugin> | 173 | <plugin> |
| 174 | - <groupId>org.fortasoft</groupId> | 174 | + <groupId>org.thingsboard</groupId> |
| 175 | <artifactId>gradle-maven-plugin</artifactId> | 175 | <artifactId>gradle-maven-plugin</artifactId> |
| 176 | - <version>1.0.8</version> | 176 | + <version>1.0.9</version> |
| 177 | </plugin> | 177 | </plugin> |
| 178 | <plugin> | 178 | <plugin> |
| 179 | <groupId>org.apache.maven.plugins</groupId> | 179 | <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> |