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

Move to new netflixoss build #28

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added CHANGELOG.md
Empty file.
54 changes: 13 additions & 41 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
plugins {
id 'nebula.netflixoss' version '2.2.9'
}

// Establish version and status
ext.githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name
//ext.githubProjectName = "staash"
Expand All @@ -6,25 +10,22 @@ ext {
jersey_version="1.9.1"
}

buildscript {
repositories { mavenCentral() }
apply from: file('gradle/buildscript.gradle'), to: buildscript
}

allprojects {
repositories { mavenCentral() }
}

apply plugin: 'idea'
apply plugin: 'eclipse'
apply plugin: 'osgi'

apply from: file('gradle/convention.gradle')
apply from: file('gradle/maven.gradle')
apply from: file('gradle/release.gradle')
apply from: file('gradle/dependency-versions.gradle')

subprojects {
apply plugin: 'nebula.netflixoss'
apply plugin: 'java'

sourceCompatibility = 1.7
targetCompatibility = 1.7

repositories {
jcenter()
}
group = "com.netflix.${githubProjectName}" // TEMPLATE: Set to organization of project

dependencies {
Expand Down Expand Up @@ -54,13 +55,11 @@ subprojects {
}

project(':staash-core') {
apply plugin: 'java'
dependencies {
testCompile 'junit:junit:4.11'
}
}
project(':staash-astyanax') {
apply plugin: 'java'
dependencies {
compile "com.netflix.astyanax:astyanax-core:$astyanax_version"
compile "com.netflix.astyanax:astyanax-thrift:$astyanax_version"
Expand All @@ -71,15 +70,13 @@ project(':staash-astyanax') {
}
}
project(':staash-eureka') {
apply plugin: 'java'
dependencies {
compile project(':staash-core')
compile project(':staash-astyanax')
}
}

project(':staash-jetty') {
apply plugin: 'java'
dependencies {
compile 'javax.servlet:servlet-api:2.5'
compile 'com.sun.jersey:jersey-server:1.9.1'
Expand All @@ -93,7 +90,6 @@ project(':staash-jetty') {


project(':staash-mesh') {
apply plugin: 'java'
dependencies {
compile "com.netflix.astyanax:astyanax-core:$astyanax_version"
compile "com.netflix.astyanax:astyanax-thrift:$astyanax_version"
Expand All @@ -103,7 +99,6 @@ project(':staash-mesh') {
}

project(':staash-svc') {
apply plugin: 'java'
dependencies {
compile 'javax.servlet:servlet-api:2.5'
compile 'org.eclipse.jetty:jetty-servlet:7.6.7.v20120910'
Expand All @@ -118,29 +113,6 @@ project(':staash-svc') {
testCompile 'junit:junit:4.11'
}
}
//project(':staash-tomcat') {
//apply plugin: 'java'
//dependencies {
//compile 'javax.servlet:servlet-api:2.5'
//compile 'com.sun.jersey:jersey-server:1.9.1'
//compile 'org.apache.tomcat:tomcat-catalina:7.0.0'
//compile 'org.apache.tomcat.embed:tomcat-embed-core:7.0.0'
//compile 'org.apache.tomcat:jasper:7.0.0'

//compile 'tomcat:tomcat-util:7.0.16'
//compile 'org.apache.tomcat:tomcat-coyote:7.0.27'

//compile 'org.apache.tomcat:catalina:6.0.18'
//compile 'org.apache.tomcat:coyote:6.0.18'
//compile 'org.apache.tomcat:jasper:6.0.18'

//compile project(':staash-web')
//compile project(':staash-astyanax')
//compile project(':staash-eureka')
//compile project(':staash-svc')
//testCompile 'junit:junit:4.11'
//}
//}

project(':staash-web') {
apply plugin: 'war'
Expand Down
13 changes: 0 additions & 13 deletions codequality/HEADER

This file was deleted.

1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
version=1.1-SNAPSHOT
13 changes: 0 additions & 13 deletions gradle/buildscript.gradle

This file was deleted.

25 changes: 0 additions & 25 deletions gradle/check.gradle

This file was deleted.

82 changes: 0 additions & 82 deletions gradle/convention.gradle

This file was deleted.

20 changes: 0 additions & 20 deletions gradle/dependency-versions.gradle

This file was deleted.

9 changes: 0 additions & 9 deletions gradle/license.gradle

This file was deleted.

62 changes: 0 additions & 62 deletions gradle/maven.gradle

This file was deleted.

1 change: 0 additions & 1 deletion gradle/netflix-oss.gradle

This file was deleted.

Loading