Commit b0c99fed authored by 郭燕飞's avatar 郭燕飞 💬

bugfix

parent 23605a25
description = '{artifactId}-api' description = '{artifactId}-api'
dependencies { dependencies {
provided('cn.com.duiba:wolf') provided 'cn.com.duiba:wolf'
provided('cn.com.duiba.boot:spring-boot-ext-api') provided 'cn.com.duiba.boot:spring-boot-ext-api'
provided('org.springframework:spring-web') provided 'org.springframework:spring-web'
} }
...@@ -4,16 +4,17 @@ buildscript { ...@@ -4,16 +4,17 @@ buildscript {
} }
repositories { repositories {
mavenLocal() mavenLocal()
maven { url "http://nexus.dui88.com:8081/nexus/content/groups/public/" } maven { url 'http://nexus.dui88.com:8081/nexus/content/groups/public/' }
maven { url "https://plugins.gradle.org/m2/" } //sonarqube maven { url 'https://plugins.gradle.org/m2/' } //sonarqube
maven { url 'http://repo.spring.io/plugins-release' } maven { url 'http://repo.spring.io/plugins-release' }
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath "io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE" classpath 'io.spring.gradle:dependency-management-plugin:1.0.5.RELEASE'
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.5' //sonarqube classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.5' //sonarqube
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") classpath 'org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}'
classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7' classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
classpath 'cn.com.duiba:duiba-gradle-plugin:0.1.7'
} }
} }
...@@ -24,7 +25,7 @@ allprojects { ...@@ -24,7 +25,7 @@ allprojects {
apply plugin: 'idea' apply plugin: 'idea'
apply plugin: 'eclipse' apply plugin: 'eclipse'
apply plugin: 'jacoco' apply plugin: 'jacoco'
apply plugin: "io.spring.dependency-management" apply plugin: 'io.spring.dependency-management'
apply plugin: 'propdeps' apply plugin: 'propdeps'
test{ test{
ignoreFailures = true ignoreFailures = true
...@@ -51,18 +52,12 @@ subprojects { ...@@ -51,18 +52,12 @@ subprojects {
mavenBom 'cn.com.duiba.boot:spring-boot-ext-dependencies:1.2.200' mavenBom 'cn.com.duiba.boot:spring-boot-ext-dependencies:1.2.200'
mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Edgware.SR4' mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Edgware.SR4'
} }
dependency 'com.alibaba:fastjson:1.2.47'
dependency 'mysql:mysql-connector-java:5.1.9'
dependency 'javax.validation:validation-api:1.1.0.Final'
} }
} }
repositories { repositories {
mavenLocal() mavenLocal()
maven { url "http://nexus.dui88.com:8081/nexus/content/groups/public/" } maven { url 'http://nexus.dui88.com:8081/nexus/content/groups/public/' }
mavenCentral() mavenCentral()
} }
...@@ -70,11 +65,11 @@ subprojects { ...@@ -70,11 +65,11 @@ subprojects {
uploadArchives { uploadArchives {
repositories { repositories {
mavenDeployer { mavenDeployer {
snapshotRepository(url: "http://nexus.dui88.com:8081/nexus/content/repositories/snapshots/") { snapshotRepository(url: 'http://nexus.dui88.com:8081/nexus/content/repositories/snapshots/') {
authentication(userName: "admin", password: "admin123") authentication(userName: 'admin', password: 'admin123')
} }
repository(url: "http://nexus.dui88.com:8081/nexus/content/repositories/releases/") { repository(url: 'http://nexus.dui88.com:8081/nexus/content/repositories/releases/') {
authentication(userName: "admin", password: "admin123") authentication(userName: 'admin', password: 'admin123')
} }
pom.project { pom.project {
......
...@@ -7,25 +7,27 @@ buildscript { ...@@ -7,25 +7,27 @@ buildscript {
} }
repositories { repositories {
mavenLocal() mavenLocal()
maven { url "http://nexus.dui88.com:8081/nexus/content/groups/public/" } maven { url 'http://nexus.dui88.com:8081/nexus/content/groups/public/' }
maven { url "https://plugins.gradle.org/m2/" } //sonarqube maven { url 'https://plugins.gradle.org/m2/' } //sonarqube
maven { url 'http://repo.spring.io/plugins-release' } maven { url 'http://repo.spring.io/plugins-release' }
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath "io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE" classpath 'io.spring.gradle:dependency-management-plugin:1.0.5.RELEASE'
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.5' //sonarqube classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.5' //sonarqube
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") classpath 'org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}'
classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7' classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
classpath 'cn.com.duiba:duiba-gradle-plugin:0.1.7'
} }
} }
apply plugin: 'duiba.gradle.plugin'
apply plugin: 'maven' apply plugin: 'maven'
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'idea' apply plugin: 'idea'
apply plugin: 'eclipse' apply plugin: 'eclipse'
apply plugin: 'jacoco' apply plugin: 'jacoco'
apply plugin: "io.spring.dependency-management" apply plugin: 'io.spring.dependency-management'
apply plugin: 'org.springframework.boot' apply plugin: 'org.springframework.boot'
apply plugin: 'propdeps' apply plugin: 'propdeps'
test { test {
...@@ -51,8 +53,8 @@ configurations { ...@@ -51,8 +53,8 @@ configurations {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url "http://nexus.dui88.com:8081/nexus/content/groups/public/" } maven { url 'http://nexus.dui88.com:8081/nexus/content/groups/public/' }
maven { url "https://plugins.gradle.org/m2/" } //sonarqube maven { url 'https://plugins.gradle.org/m2/' } //sonarqube
maven { url 'http://repo.spring.io/plugins-release' } maven { url 'http://repo.spring.io/plugins-release' }
mavenCentral() mavenCentral()
} }
...@@ -62,7 +64,7 @@ dependencyManagement { ...@@ -62,7 +64,7 @@ dependencyManagement {
imports { imports {
mavenBom 'cn.com.duiba.boot:spring-boot-ext-dependencies:1.2.200' mavenBom 'cn.com.duiba.boot:spring-boot-ext-dependencies:1.2.200'
mavenBom "org.springframework.boot:spring-boot-dependencies:${springBootVersion}" mavenBom 'org.springframework.boot:spring-boot-dependencies:${springBootVersion}'
mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Edgware.SR4' mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Edgware.SR4'
} }
} }
...@@ -82,12 +84,12 @@ dependencies { ...@@ -82,12 +84,12 @@ dependencies {
compile 'org.springframework.cloud:spring-cloud-starter-netflix-ribbon' compile 'org.springframework.cloud:spring-cloud-starter-netflix-ribbon'
compile 'org.springframework.cloud:spring-cloud-starter-openfeign' compile 'org.springframework.cloud:spring-cloud-starter-openfeign'
compile 'javax.validation:validation-api:1.1.0.Final' compile 'javax.validation:validation-api'
compile 'io.springfox:springfox-swagger-ui:2.5.0' compile 'io.springfox:springfox-swagger-ui:2.5.0'
compile 'io.springfox:springfox-swagger2:2.5.0' compile 'io.springfox:springfox-swagger2:2.5.0'
compile 'com.alibaba:fastjson:1.2.47' compile 'com.alibaba:fastjson'
testCompile 'org.springframework.boot:spring-boot-starter-test' testCompile 'org.springframework.boot:spring-boot-starter-test'
} }
...@@ -102,11 +104,11 @@ uploadArchives {// ...@@ -102,11 +104,11 @@ uploadArchives {//
uploadArchives { uploadArchives {
repositories { repositories {
mavenDeployer { mavenDeployer {
snapshotRepository(url: "http://nexus.dui88.com:8081/nexus/content/repositories/snapshots/") { snapshotRepository(url: 'http://nexus.dui88.com:8081/nexus/content/repositories/snapshots/') {
authentication(userName: "admin", password: "admin123") authentication(userName: 'admin', password: 'admin123')
} }
repository(url: "http://nexus.dui88.com:8081/nexus/content/repositories/releases/") { repository(url: 'http://nexus.dui88.com:8081/nexus/content/repositories/releases/') {
authentication(userName: "admin", password: "admin123") authentication(userName: 'admin', password: 'admin123')
} }
pom.project { pom.project {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment