Skip to content

Commit 7612b12

Browse files
authored
Spring Boot Compiles and Runs (Netflix#115)
1 parent 0014023 commit 7612b12

File tree

373 files changed

+10486
-6110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

373 files changed

+10486
-6110
lines changed

build.gradle

+45-6
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ buildscript {
2626

2727
dependencies {
2828
classpath("org.springframework.boot:spring-boot-gradle-plugin:${spring_boot_version}")
29-
classpath("io.spring.gradle:dependency-management-plugin:1.0.0.RELEASE")
3029
classpath("org.asciidoctor:asciidoctor-gradle-plugin:1.5.3")
3130
classpath("gradle.plugin.com.gorylenko.gradle-git-properties:gradle-git-properties:1.4.17")
3231
classpath("com.netflix.nebula:gradle-aggregate-javadocs-plugin:3.0.1")
3332
}
3433
}
3534

3635
plugins {
36+
id "io.spring.dependency-management" version "1.0.2.RELEASE"
3737
id "com.github.kt3k.coveralls" version "2.8.1"
3838
id "nebula.netflixoss" version "3.6.0"
3939
id "org.ajoberstar.github-pages" version "1.6.0"
@@ -93,7 +93,46 @@ configure(javaProjects) {
9393
dependencyManagement {
9494
imports {
9595
mavenBom "io.spring.platform:platform-bom:${spring_platform_version}"
96-
// mavenBom "org.springframework.cloud:spring-cloud-dependencies:${spring_cloud_version}"
96+
mavenBom "org.springframework.cloud:spring-cloud-dependencies:${spring_cloud_version}"
97+
}
98+
dependencies {
99+
dependency("cglib:cglib-nodep:3.2.4")
100+
dependency("commons-dbutils:commons-dbutils:1.6")
101+
dependency("com.amazon.redshift:redshift-jdbc42:1.2.1.1001")
102+
dependency("com.github.fge:json-patch:1.9")
103+
dependency("com.github.rholder:guava-retrying:2.0.0")
104+
// Guava even with guava.version set to 19.0 in properties keeps going back to 18.0 without this.
105+
dependency("com.google.guava:guava:19.0")
106+
dependencySet(group: "com.google.inject.extensions", version: "4.0") {
107+
entry "guice-persist"
108+
entry "guice-multibindings"
109+
entry "guice-servlet"
110+
}
111+
dependency("com.sun.jersey:jersey-client:1.19.1")
112+
dependency("com.squarespace.jersey2-guice:jersey2-guice:0.5")
113+
dependencySet(group: "com.wordnik", version: "1.3.12") {
114+
entry "swagger-annotations"
115+
entry "swagger-jersey2-jaxrs_2.10"
116+
}
117+
dependency("de.danielbechler:java-object-diff:0.91.1")
118+
dependency("io.airlift:testing-mysql-server:0.1")
119+
dependencySet(group: "io.github.openfeign", version: "9.3.1") {
120+
entry "feign-core"
121+
entry "feign-jaxrs"
122+
entry "feign-slf4j"
123+
}
124+
dependency("javax.ws.rs:jsr311-api:1.1.1")
125+
dependency("net.sf.dozer:dozer:5.4.0")
126+
dependency("nl.jqno.equalsverifier:equalsverifier:1.7.2")
127+
dependency("org.apache.hadoop:hadoop-core:1.2.1")
128+
dependencySet(group: "org.apache.hive", version: "1.2.1") {
129+
entry "hive-metastore"
130+
}
131+
dependency("org.apache.pig:pig:0.14.0")
132+
dependency("org.codehaus.gpars:gpars:1.2.1")
133+
dependency("org.glassfish.jersey.containers:jersey-container-servlet:2.19")
134+
dependency("org.glassfish.jersey.media:jersey-media-json-jackson:2.19")
135+
dependency("org.spockframework:spock-guice:1.0-groovy-2.4")
97136
}
98137
}
99138

@@ -108,7 +147,6 @@ configure(javaProjects) {
108147
* Compile Dependencies
109148
*******************************/
110149

111-
compile("com.google.guava:guava")
112150
compile("com.google.code.findbugs:annotations")
113151
compile("com.google.code.findbugs:jsr305")
114152

@@ -126,12 +164,13 @@ configure(javaProjects) {
126164
* Test Dependencies
127165
*******************************/
128166

129-
testCompile("cglib:cglib-nodep:${cglib_nodep_version}")
167+
testCompile("cglib:cglib-nodep")
130168
testCompile("org.codehaus.groovy:groovy-all")
131-
testCompile("org.codehaus.gpars:gpars:${gpars_version}")
169+
testCompile("org.codehaus.gpars:gpars")
132170
testCompile("org.objenesis:objenesis")
133171
testCompile("org.spockframework:spock-core")
134-
testCompile("org.spockframework:spock-guice:${spock_version}")
172+
testCompile("org.spockframework:spock-guice")
173+
testCompile("org.springframework.boot:spring-boot-starter-test")
135174
testRuntime("org.hsqldb:hsqldb")
136175
}
137176

gradle.properties

+4-27
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
## Spring Dependency Versions
2020

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

2626
## Override Spring Platform IO Versions
2727

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

3434
## Versions Not Covered by Spring BOMs
3535

36-
amazon_sns_version=1.11.60
37-
archaius_version=0.6.5
38-
cglib_nodep_version=3.2.4
39-
commons_dbutils_version=1.6
40-
dozer_version=5.4.0
41-
equalsverifier_version=1.7.2
42-
feign_version=9.3.1
43-
gpars_version=1.2.1
44-
guava_retrying_version=2.0.0
45-
guice_version=4.0
46-
hadoop_core_version=1.2.1
4736
hive_version=1.2.1
48-
java_object_diff_version=0.91.1
49-
jersey2_guice_version=0.5
50-
jersey_version=2.19
51-
jersey_client_version=1.19.1
52-
json_patch_version=1.9
53-
jsr311_api_version=1.1.1
54-
pig_version=0.14.0
55-
redshift_driver_version=1.2.1.1001
56-
servo_version=0.8.3
57-
spock_version=1.0-groovy-2.4
58-
swagger_version=1.3.12
59-
testing_mysql_server_version=0.1
6037

6138
## speed up the build process
62-
org.gradle.parallel=true
39+
#org.gradle.parallel=true
6340
org.gradle.jvmargs=-Xmx2G

gradle/wrapper/gradle-wrapper.jar

571 Bytes
Binary file not shown.
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Mar 29 16:35:02 PDT 2017
1+
#Wed May 03 14:14:48 PDT 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip

metacat-app/build.gradle

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
apply plugin: "org.springframework.boot"
2+
3+
configurations {
4+
// all*.exclude module: "slf4j-jdk14"
5+
// all*.exclude module: "log4j-over-slf4j"
6+
all*.exclude module: "jsr311-api"
7+
// all*.exclude module: "logback-classic"
8+
// all*.exclude module: "logback-core"
9+
all*.exclude group: "com.sun.jersey"
10+
}
11+
12+
dependencies {
13+
/*******************************
14+
* Compile Dependencies
15+
*******************************/
16+
17+
compile(project(":metacat-main"))
18+
19+
/*******************************
20+
* Provided Dependencies
21+
*******************************/
22+
23+
/*******************************
24+
* Optional Dependencies
25+
*******************************/
26+
27+
/*******************************
28+
* Runtime Dependencies
29+
*******************************/
30+
31+
/*******************************
32+
* Test Dependencies
33+
*******************************/
34+
}
35+
36+
jar {
37+
manifest {
38+
attributes("Implementation-Version": version)
39+
}
40+
}
41+
42+
springBoot {
43+
mainClass = "com.netflix.metacat.MetacatApplication"
44+
}
45+
46+
def env = project.hasProperty("env") ? project.getProperty("env") : "dev"
47+
48+
bootRun {
49+
addResources = false
50+
systemProperty "spring.profiles.active", env
51+
}

metacat-client/build.gradle

+11-7
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,23 @@ compileJava {
2323

2424
dependencies {
2525
/*******************************
26-
* Compile Dependencies
26+
* API Dependencies
2727
*******************************/
2828

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

31+
compile("io.github.openfeign:feign-core")
32+
33+
/*******************************
34+
* Implementation Dependencies
35+
*******************************/
36+
37+
compile("com.fasterxml.jackson.core:jackson-databind")
3138
compile("com.fasterxml.jackson.datatype:jackson-datatype-guava")
3239
compile("com.fasterxml.jackson.module:jackson-module-jaxb-annotations")
33-
compile("io.github.openfeign:feign-core:${feign_version}")
34-
compile("io.github.openfeign:feign-jaxrs:${feign_version}")
35-
compile("io.github.openfeign:feign-slf4j:${feign_version}")
36-
compile("org.glassfish.jersey.core:jersey-server:${jersey_version}") {
37-
exclude group: "javax.ws.rs", module: "javax.ws.rs-api"
38-
}
40+
compile("com.google.guava:guava")
41+
compile("io.github.openfeign:feign-jaxrs")
42+
compile("io.github.openfeign:feign-slf4j")
3943
compile("org.slf4j:slf4j-api")
4044

4145
/*******************************

0 commit comments

Comments
 (0)