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

1.x #569

Open
wants to merge 8 commits into
base: 1.0
Choose a base branch
from
Open

1.x #569

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
File renamed without changes.
21 changes: 21 additions & 0 deletions astyanax-cassandra/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apply plugin: 'osgi'

dependencies {
compile "org.apache.cassandra:cassandra-all:$cassandraVersion"
compile "org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-csv:$commonsCsvVersion"
compile "io.netty:netty:$nettyVersion"
compile project(':astyanax-core')
compile "joda-time:joda-time:$jodaTimeVersion"
compile "com.github.stephenc.high-scale-lib:high-scale-lib:$highScaleLibVersion"
compile "com.google.guava:guava:$guavaVersion"
compile "com.eaio.uuid:uuid:$uuidVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion"
compile "org.codehaus.jettison:jettison:$jettisonVersion"
compile "commons-codec:commons-codec:$commonsCodecVersion"
compile "commons-lang:commons-lang:$commonsLangVersion"
compile "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:$concurrentLinkedHashMapVersion"
compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion"
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
compile "org.xerial.snappy:snappy-java:$snappyVersion"
testCompile "junit:junit:$junitVersion"
}
51 changes: 0 additions & 51 deletions astyanax-cassandra/conf/cassandra-template.yaml

This file was deleted.

19 changes: 19 additions & 0 deletions astyanax-contrib/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
dependencies {
compile project(':astyanax-cassandra')
compile project(':astyanax-core')
compile 'com.netflix.eureka:eureka-client:1.1.110'
compile 'com.netflix.archaius:archaius-core:0.5.12'
compile "joda-time:joda-time:$jodaTimeVersion"
compile "com.github.stephenc.high-scale-lib:high-scale-lib:$highScaleLibVersion"
compile "com.google.guava:guava:$guavaVersion"
compile "com.eaio.uuid:uuid:$uuidVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion"
compile "org.codehaus.jettison:jettison:$jettisonVersion"
compile "commons-codec:commons-codec:$commonsCodecVersion"
compile "commons-lang:commons-lang:$commonsLangVersion"
compile "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:$concurrentLinkedHashMapVersion"
compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion"
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
compile "org.xerial.snappy:snappy-java:$snappyVersion"
testCompile "junit:junit:$junitVersion"
}
17 changes: 17 additions & 0 deletions astyanax-core/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apply plugin: 'osgi'

dependencies {
compile "joda-time:joda-time:$jodaTimeVersion"
compile "com.github.stephenc.high-scale-lib:high-scale-lib:$highScaleLibVersion"
compile "com.google.guava:guava:$guavaVersion"
compile "com.eaio.uuid:uuid:$uuidVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion"
compile "org.codehaus.jettison:jettison:$jettisonVersion"
compile "commons-codec:commons-codec:$commonsCodecVersion"
compile "commons-lang:commons-lang:$commonsLangVersion"
compile "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:$concurrentLinkedHashMapVersion"
compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion"
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
compile "org.xerial.snappy:snappy-java:$snappyVersion"
testCompile "junit:junit:$junitVersion"
}
20 changes: 20 additions & 0 deletions astyanax-entity-mapper/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
dependencies {
compile project(':astyanax-core')
compile project(':astyanax-cassandra')
compile project(':astyanax-recipes')
compile "javax.persistence:persistence-api:$jpaVersion"
testCompile project(':astyanax-thrift')
compile "joda-time:joda-time:$jodaTimeVersion"
compile "com.github.stephenc.high-scale-lib:high-scale-lib:$highScaleLibVersion"
compile "com.google.guava:guava:$guavaVersion"
compile "com.eaio.uuid:uuid:$uuidVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion"
compile "org.codehaus.jettison:jettison:$jettisonVersion"
compile "commons-codec:commons-codec:$commonsCodecVersion"
compile "commons-lang:commons-lang:$commonsLangVersion"
compile "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:$concurrentLinkedHashMapVersion"
compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion"
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
compile "org.xerial.snappy:snappy-java:$snappyVersion"
testCompile "junit:junit:$junitVersion"
}
19 changes: 19 additions & 0 deletions astyanax-examples/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
dependencies {
compile project(':astyanax-core')
compile project(':astyanax-cassandra')
compile project(':astyanax-thrift')
testCompile project(':astyanax-thrift')
compile "joda-time:joda-time:$jodaTimeVersion"
compile "com.github.stephenc.high-scale-lib:high-scale-lib:$highScaleLibVersion"
compile "com.google.guava:guava:$guavaVersion"
compile "com.eaio.uuid:uuid:$uuidVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion"
compile "org.codehaus.jettison:jettison:$jettisonVersion"
compile "commons-codec:commons-codec:$commonsCodecVersion"
compile "commons-lang:commons-lang:$commonsLangVersion"
compile "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:$concurrentLinkedHashMapVersion"
compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion"
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
compile "org.xerial.snappy:snappy-java:$snappyVersion"
testCompile "junit:junit:$junitVersion"
}
21 changes: 21 additions & 0 deletions astyanax-queue/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apply plugin: 'osgi'

dependencies {
compile project(':astyanax-core')
compile project(':astyanax-cassandra')
compile project(':astyanax-thrift')
compile project(':astyanax-recipes')
compile "joda-time:joda-time:$jodaTimeVersion"
compile "com.github.stephenc.high-scale-lib:high-scale-lib:$highScaleLibVersion"
compile "com.google.guava:guava:$guavaVersion"
compile "com.eaio.uuid:uuid:$uuidVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion"
compile "org.codehaus.jettison:jettison:$jettisonVersion"
compile "commons-codec:commons-codec:$commonsCodecVersion"
compile "commons-lang:commons-lang:$commonsLangVersion"
compile "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:$concurrentLinkedHashMapVersion"
compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion"
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
compile "org.xerial.snappy:snappy-java:$snappyVersion"
testCompile "junit:junit:$junitVersion"
}
18 changes: 18 additions & 0 deletions astyanax-recipes/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
dependencies {
compile project(':astyanax-core')
compile project(':astyanax-cassandra')
testCompile project(':astyanax-thrift')
compile "joda-time:joda-time:$jodaTimeVersion"
compile "com.github.stephenc.high-scale-lib:high-scale-lib:$highScaleLibVersion"
compile "com.google.guava:guava:$guavaVersion"
compile "com.eaio.uuid:uuid:$uuidVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion"
compile "org.codehaus.jettison:jettison:$jettisonVersion"
compile "commons-codec:commons-codec:$commonsCodecVersion"
compile "commons-lang:commons-lang:$commonsLangVersion"
compile "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:$concurrentLinkedHashMapVersion"
compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion"
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
compile "org.xerial.snappy:snappy-java:$snappyVersion"
testCompile "junit:junit:$junitVersion"
}
21 changes: 21 additions & 0 deletions astyanax-thrift/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apply plugin: 'osgi'

dependencies {
compile project(':astyanax-core')
compile project(':astyanax-cassandra')
compile "org.apache.cassandra:cassandra-thrift:$cassandraVersion"
compile "org.apache.thrift:libthrift:$thriftVersion"
compile "joda-time:joda-time:$jodaTimeVersion"
compile "com.github.stephenc.high-scale-lib:high-scale-lib:$highScaleLibVersion"
compile "com.google.guava:guava:$guavaVersion"
compile "com.eaio.uuid:uuid:$uuidVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion"
compile "org.codehaus.jettison:jettison:$jettisonVersion"
compile "commons-codec:commons-codec:$commonsCodecVersion"
compile "commons-lang:commons-lang:$commonsLangVersion"
compile "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:$concurrentLinkedHashMapVersion"
compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion"
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
compile "org.xerial.snappy:snappy-java:$snappyVersion"
testCompile "junit:junit:$junitVersion"
}
24 changes: 24 additions & 0 deletions astyanax/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
dependencies {
compile project(':astyanax-core')
compile project(':astyanax-cassandra')
compile project(':astyanax-thrift')
compile project(':astyanax-queue')
compile project(':astyanax-recipes')
compile project(':astyanax-entity-mapper')
compile project(':astyanax-examples')
compile project(':astyanax-contrib')

compile "joda-time:joda-time:$jodaTimeVersion"
compile "com.github.stephenc.high-scale-lib:high-scale-lib:$highScaleLibVersion"
compile "com.google.guava:guava:$guavaVersion"
compile "com.eaio.uuid:uuid:$uuidVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion"
compile "org.codehaus.jettison:jettison:$jettisonVersion"
compile "commons-codec:commons-codec:$commonsCodecVersion"
compile "commons-lang:commons-lang:$commonsLangVersion"
compile "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:$concurrentLinkedHashMapVersion"
compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion"
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
compile "org.xerial.snappy:snappy-java:$snappyVersion"
testCompile "junit:junit:$junitVersion"
}
142 changes: 11 additions & 131 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,144 +1,24 @@
// Establish version and status
ext.githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name

buildscript {
repositories {
mavenLocal()
mavenCentral() // maven { url 'http://jcenter.bintray.com' }
}
apply from: file('gradle/buildscript.gradle'), to: buildscript
plugins {
id 'nebula.netflixoss' version '2.2.5'
}

allprojects {
repositories {
mavenCentral() // maven { url: 'http://jcenter.bintray.com' }
}
}
// Establish version and status
ext.githubProjectName = rootProject.name // Change if github project name is not the same as the root project's name

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

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

subprojects {
group = "com.netflix.${githubProjectName}"

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

dependencies {
compile "joda-time:joda-time:$jodaTimeVersion"
compile "com.github.stephenc.high-scale-lib:high-scale-lib:$highScaleLibVersion"
compile "com.google.guava:guava:$guavaVersion"
compile "com.eaio.uuid:uuid:$uuidVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion"
compile "org.codehaus.jettison:jettison:$jettisonVersion"
compile "commons-codec:commons-codec:$commonsCodecVersion"
compile "commons-lang:commons-lang:$commonsLangVersion"
compile "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:$concurrentLinkedHashMapVersion"
compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion"
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
compile "org.xerial.snappy:snappy-java:$snappyVersion"
testCompile "junit:junit:$junitVersion"
}
}

project(':astyanax') {
dependencies {
compile project(':astyanax-core')
compile project(':astyanax-cassandra')
compile project(':astyanax-thrift')
compile project(':astyanax-queue')
compile project(':astyanax-recipes')
compile project(':astyanax-entity-mapper')
compile project(':astyanax-examples')
compile project(':astyanax-contrib')
}
}

project(':astyanax-core') {
apply plugin: 'osgi'
apply plugin: 'java'
dependencies {
testCompile "junit:junit:$junitVersion"
}
}

project(':astyanax-thrift') {
apply plugin: 'osgi'
apply plugin: 'java'
dependencies {
compile project(':astyanax-core')
compile project(':astyanax-cassandra')
compile "org.apache.cassandra:cassandra-thrift:$cassandraVersion"
compile "org.apache.thrift:libthrift:$thriftVersion"
}
}

project(':astyanax-queue') {
apply plugin: 'osgi'
apply plugin: 'java'
dependencies {
compile project(':astyanax-core')
compile project(':astyanax-cassandra')
compile project(':astyanax-thrift')
compile project(':astyanax-recipes')
}
}

project(':astyanax-cassandra') {
apply plugin: 'osgi'
apply plugin: 'java'
dependencies {
compile "org.apache.cassandra:cassandra-all:$cassandraVersion"
compile "org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-csv:$commonsCsvVersion"
compile "io.netty:netty:$nettyVersion"
compile project(':astyanax-core')
}
}

project(':astyanax-recipes') {
apply plugin: 'nebula.netflixoss'
apply plugin: 'java'
dependencies {
compile project(':astyanax-core')
compile project(':astyanax-cassandra')
testCompile project(':astyanax-thrift')
}
}
group = "com.netflix.${githubProjectName}"

project(':astyanax-entity-mapper') {
apply plugin: 'java'
dependencies {
compile project(':astyanax-core')
compile project(':astyanax-cassandra')
compile project(':astyanax-recipes')
compile "javax.persistence:persistence-api:$jpaVersion"
testCompile project(':astyanax-thrift')
testCompile "junit:junit:$junitVersion"
}
}
sourceCompatibility = 1.6
targetCompatibility = 1.6

project(':astyanax-examples') {
apply plugin: 'java'
dependencies {
compile project(':astyanax-core')
compile project(':astyanax-cassandra')
compile project(':astyanax-thrift')
testCompile project(':astyanax-thrift')
}
}

project(':astyanax-contrib') {
apply plugin: 'java'
dependencies {
compile project(':astyanax-cassandra')
compile project(':astyanax-core')
compile 'com.netflix.eureka:eureka-client:1.1.110'
compile 'com.netflix.archaius:archaius-core:0.5.12'
repositories {
jcenter()
}
}
Loading