Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spring Boot Configuration #115

Merged
merged 1 commit into from
May 17, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
51 changes: 45 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ buildscript {

dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:${spring_boot_version}")
classpath("io.spring.gradle:dependency-management-plugin:1.0.0.RELEASE")
classpath("org.asciidoctor:asciidoctor-gradle-plugin:1.5.3")
classpath("gradle.plugin.com.gorylenko.gradle-git-properties:gradle-git-properties:1.4.17")
classpath("com.netflix.nebula:gradle-aggregate-javadocs-plugin:3.0.1")
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the versions be set in the gradle.properties?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably could be... feel free :-)

}

plugins {
id "io.spring.dependency-management" version "1.0.2.RELEASE"
id "com.github.kt3k.coveralls" version "2.8.1"
id "nebula.netflixoss" version "3.6.0"
id "org.ajoberstar.github-pages" version "1.6.0"
Expand Down Expand Up @@ -93,7 +93,46 @@ configure(javaProjects) {
dependencyManagement {
imports {
mavenBom "io.spring.platform:platform-bom:${spring_platform_version}"
// mavenBom "org.springframework.cloud:spring-cloud-dependencies:${spring_cloud_version}"
mavenBom "org.springframework.cloud:spring-cloud-dependencies:${spring_cloud_version}"
}
dependencies {
dependency("cglib:cglib-nodep:3.2.4")
dependency("commons-dbutils:commons-dbutils:1.6")
dependency("com.amazon.redshift:redshift-jdbc42:1.2.1.1001")
dependency("com.github.fge:json-patch:1.9")
dependency("com.github.rholder:guava-retrying:2.0.0")
// Guava even with guava.version set to 19.0 in properties keeps going back to 18.0 without this.
dependency("com.google.guava:guava:19.0")
dependencySet(group: "com.google.inject.extensions", version: "4.0") {
entry "guice-persist"
entry "guice-multibindings"
entry "guice-servlet"
}
dependency("com.sun.jersey:jersey-client:1.19.1")
dependency("com.squarespace.jersey2-guice:jersey2-guice:0.5")
dependencySet(group: "com.wordnik", version: "1.3.12") {
entry "swagger-annotations"
entry "swagger-jersey2-jaxrs_2.10"
}
dependency("de.danielbechler:java-object-diff:0.91.1")
dependency("io.airlift:testing-mysql-server:0.1")
dependencySet(group: "io.github.openfeign", version: "9.3.1") {
entry "feign-core"
entry "feign-jaxrs"
entry "feign-slf4j"
}
dependency("javax.ws.rs:jsr311-api:1.1.1")
dependency("net.sf.dozer:dozer:5.4.0")
dependency("nl.jqno.equalsverifier:equalsverifier:1.7.2")
dependency("org.apache.hadoop:hadoop-core:1.2.1")
dependencySet(group: "org.apache.hive", version: "1.2.1") {
entry "hive-metastore"
}
dependency("org.apache.pig:pig:0.14.0")
dependency("org.codehaus.gpars:gpars:1.2.1")
dependency("org.glassfish.jersey.containers:jersey-container-servlet:2.19")
dependency("org.glassfish.jersey.media:jersey-media-json-jackson:2.19")
dependency("org.spockframework:spock-guice:1.0-groovy-2.4")
}
}

Expand All @@ -108,7 +147,6 @@ configure(javaProjects) {
* Compile Dependencies
*******************************/

compile("com.google.guava:guava")
compile("com.google.code.findbugs:annotations")
compile("com.google.code.findbugs:jsr305")

Expand All @@ -126,12 +164,13 @@ configure(javaProjects) {
* Test Dependencies
*******************************/

testCompile("cglib:cglib-nodep:${cglib_nodep_version}")
testCompile("cglib:cglib-nodep")
testCompile("org.codehaus.groovy:groovy-all")
testCompile("org.codehaus.gpars:gpars:${gpars_version}")
testCompile("org.codehaus.gpars:gpars")
testCompile("org.objenesis:objenesis")
testCompile("org.spockframework:spock-core")
testCompile("org.spockframework:spock-guice:${spock_version}")
testCompile("org.spockframework:spock-guice")
testCompile("org.springframework.boot:spring-boot-starter-test")
testRuntime("org.hsqldb:hsqldb")
}

Expand Down
31 changes: 4 additions & 27 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
## Spring Dependency Versions

# Used in documentation and for including the Gradle plugin
spring_boot_version=1.5.2.RELEASE
spring_cloud_version=Camden.SR6
spring_platform_version=Brussels-SR1
spring_boot_version=1.5.3.RELEASE
spring_cloud_version=Dalston.RELEASE
spring_platform_version=Brussels-SR2

## Override Spring Platform IO Versions

Expand All @@ -33,31 +33,8 @@ tomcat.version=8.0.22

## Versions Not Covered by Spring BOMs

amazon_sns_version=1.11.60
archaius_version=0.6.5
cglib_nodep_version=3.2.4
commons_dbutils_version=1.6
dozer_version=5.4.0
equalsverifier_version=1.7.2
feign_version=9.3.1
gpars_version=1.2.1
guava_retrying_version=2.0.0
guice_version=4.0
hadoop_core_version=1.2.1
hive_version=1.2.1
java_object_diff_version=0.91.1
jersey2_guice_version=0.5
jersey_version=2.19
jersey_client_version=1.19.1
json_patch_version=1.9
jsr311_api_version=1.1.1
pig_version=0.14.0
redshift_driver_version=1.2.1.1001
servo_version=0.8.3
spock_version=1.0-groovy-2.4
swagger_version=1.3.12
testing_mysql_server_version=0.1

## speed up the build process
org.gradle.parallel=true
#org.gradle.parallel=true
org.gradle.jvmargs=-Xmx2G
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Mar 29 16:35:02 PDT 2017
#Wed May 03 14:14:48 PDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\:https://services.gradle.org/distributions/gradle-3.4.1-bin.zip
distributionUrl=https\:https://services.gradle.org/distributions/gradle-3.5-bin.zip
51 changes: 51 additions & 0 deletions metacat-app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
apply plugin: "org.springframework.boot"

configurations {
// all*.exclude module: "slf4j-jdk14"
// all*.exclude module: "log4j-over-slf4j"
all*.exclude module: "jsr311-api"
// all*.exclude module: "logback-classic"
// all*.exclude module: "logback-core"
all*.exclude group: "com.sun.jersey"
}

dependencies {
/*******************************
* Compile Dependencies
*******************************/

compile(project(":metacat-main"))

/*******************************
* Provided Dependencies
*******************************/

/*******************************
* Optional Dependencies
*******************************/

/*******************************
* Runtime Dependencies
*******************************/

/*******************************
* Test Dependencies
*******************************/
}

jar {
manifest {
attributes("Implementation-Version": version)
}
}

springBoot {
mainClass = "com.netflix.metacat.MetacatApplication"
}

def env = project.hasProperty("env") ? project.getProperty("env") : "dev"

bootRun {
addResources = false
systemProperty "spring.profiles.active", env
}
18 changes: 11 additions & 7 deletions metacat-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,23 @@ compileJava {

dependencies {
/*******************************
* Compile Dependencies
* API Dependencies
*******************************/

compile(project(":metacat-common"))

compile("io.github.openfeign:feign-core")

/*******************************
* Implementation Dependencies
*******************************/

compile("com.fasterxml.jackson.core:jackson-databind")
compile("com.fasterxml.jackson.datatype:jackson-datatype-guava")
compile("com.fasterxml.jackson.module:jackson-module-jaxb-annotations")
compile("io.github.openfeign:feign-core:${feign_version}")
compile("io.github.openfeign:feign-jaxrs:${feign_version}")
compile("io.github.openfeign:feign-slf4j:${feign_version}")
compile("org.glassfish.jersey.core:jersey-server:${jersey_version}") {
exclude group: "javax.ws.rs", module: "javax.ws.rs-api"
}
compile("com.google.guava:guava")
compile("io.github.openfeign:feign-jaxrs")
compile("io.github.openfeign:feign-slf4j")
compile("org.slf4j:slf4j-api")

/*******************************
Expand Down
Loading