Skip to content

Commit 07935c3

Browse files
David Stendardialexanderdean
authored andcommitted
[layout] merge modules
1 parent be3e59c commit 07935c3

29 files changed

Lines changed: 51 additions & 440 deletions

build.gradle

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,38 @@
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
1313

14-
// Applying the java plugin to add support for Java
1514
apply plugin: 'java'
16-
// As per http://www.gradle.org/docs/current/userguide/publishing_maven.html
1715
apply plugin: 'maven-publish'
18-
16+
apply plugin: 'idea'
1917
apply plugin: 'war'
2018

21-
dependencies {
22-
compile project(':snowplow-java-tracker-core')
23-
runtime project(':snowplow-java-tracker-core')
19+
20+
group = 'com.snowplowanalytics'
21+
version = '0.6.0'
22+
sourceCompatibility = '1.6'
23+
targetCompatibility = '1.6'
24+
repositories {
25+
// Use 'maven central' for resolving our dependencies
26+
mavenCentral()
2427
}
2528

26-
allprojects {
27-
apply plugin: 'java'
28-
group = 'com.snowplowanalytics'
29-
version = '0.6.0'
30-
sourceCompatibility = '1.6'
31-
targetCompatibility = '1.6'
32-
repositories {
33-
// Use 'maven central' for resolving our dependencies
34-
mavenCentral()
35-
}
29+
dependencies {
30+
31+
// Apache Commons
32+
compile 'commons-codec:commons-codec:1.2'
33+
compile 'commons-net:commons-net:3.3'
34+
35+
// Apache HTTP
36+
compile 'org.apache.httpcomponents:httpclient:4.3.3'
37+
compile 'org.apache.httpcomponents:httpasyncclient:4.0.1'
38+
39+
// SLF4J logging API
40+
compile 'org.slf4j:slf4j-simple:1.7.7'
41+
42+
// Jackson JSON processor
43+
compile 'com.fasterxml.jackson.core:jackson-databind:2.4.1.1'
44+
45+
testCompile 'junit:junit:4.11'
3646
}
3747

3848

@@ -58,16 +68,6 @@ publishing {
5868
}
5969
}
6070

61-
task testAll(dependsOn: assemble) {
62-
subprojects.each {project ->
63-
project.tasks.withType(Jar).each {
64-
65-
// Dependencies for our production and test code
66-
dependencies {
67-
}
68-
}
69-
}
70-
}
7171

7272
task generateSources {
7373
project.ext.set("outputDir", "$projectDir/src/main/java/com/snowplowanalytics/snowplow/tracker")

settings.gradle

Lines changed: 0 additions & 15 deletions
This file was deleted.

snowplow-java-tracker-core/build.gradle

Lines changed: 0 additions & 102 deletions
This file was deleted.

snowplow-java-tracker-core/gradle/wrapper/gradle-wrapper.properties

Lines changed: 0 additions & 6 deletions
This file was deleted.

snowplow-java-tracker-core/gradlew

Lines changed: 0 additions & 164 deletions
This file was deleted.

0 commit comments

Comments
 (0)