Merge codec with mongoser module

build.gradle

@@ -1,3 +1,31 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.ryanharter.gradle-git-repo:gradle-plugin:1.0.2'
+    }
+}
+
+allprojects {
+    repositories {
+        mavenLocal()
+        repositories {
+            maven {
+                url "https://raw.githubusercontent.com/iincube/mdeals/master/releases"
+                credentials {
+                    username GIT_USERNAME
+                    password GIT_PASSWORD
+                }
+                authentication {
+                    basic(BasicAuthentication)
+                }
+            }
+        }
+    }
+}
+
 ext {
     versionCode = 1
     versionName = "1.0"
@@ -7,9 +35,8 @@ ext.libraries = [
         javaxServlet: 'javax.servlet:javax.servlet-api:3.0.1',
         gson: 'com.google.code.gson:gson:2.4',
         mongoDriver: 'org.mongodb:mongo-java-driver:2.7.3',
-        mongoapi: project(':mongoapi'),
+        mongoapi: 'in.mtap.iincube:mongoapi:0.0.2',
         mongoser: project(':mongoser'),
-        codec: project(':codec'),
         googleTruth: 'com.google.truth:truth:0.27',
         junit: 'junit:junit:4.11',
         mockito: 'org.mockito:mockito-core:1.10.+',

gradle.properties

@@ -1,5 +1,5 @@
 GROUP=in.mtap.iincube
-VERSION_NAME=0.0.1
+VERSION_NAME=0.0.6
 
 POM_DESCRIPTION=MongoDB REST API
 POM_URL=https://github.com/safetrax/mongorest

mongoapi/build.gradle

@@ -1,3 +1,4 @@
+apply plugin: 'git-repo'
 apply plugin: 'java'
 
 sourceCompatibility = 1.7
@@ -8,12 +9,13 @@ repositories {
 }
 
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.11'
     compile libraries.mongoDriver
+
     testCompile libraries.junit
     testCompile libraries.googleTruth
     testCompile libraries.mockito
 }
 
 apply from: rootProject.file('gradle/test.gradle')
-apply from: rootProject.file('gradle/checkstyle.gradle')
+apply from: rootProject.file('gradle/checkstyle.gradle')
+apply from: rootProject.file('gradle/mvnpush.gradle')

mongoapi/gradle.properties

@@ -0,0 +1,3 @@
+POM_NAME=Mongo Java driver wrapper
+POM_ARTIFACT_ID=mongoapi
+POM_PACKAGING=jar

mongoser/build.gradle

@@ -1,13 +1,3 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-    dependencies {
-        classpath libraries.gitpushplugin
-    }
-}
-
 apply plugin: 'java'
 apply plugin: 'git-repo'
 
@@ -19,13 +9,14 @@ repositories {
 }
 
 dependencies {
+    compile libraries.mongoapi
     compile libraries.gson
     compile libraries.javaxServlet
-    compile libraries.codec
+    compile libraries.apacheCommons
+
     compile 'org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016'
     compile 'org.eclipse.jetty:jetty-server:8.1.2.v20120308'
     compile 'org.eclipse.jetty:jetty-servlet:8.1.2.v20120308'
-    compile libraries.mongoapi
 
     testCompile libraries.junit
     testCompile libraries.googleTruth

codec/src/test/java/in/mtap/iincube/mongoser/codec/JsonArrayDecoderTest.java → mongoser/src/test/java/in/mtap/iincube/mongoser/codec/JsonArrayDecoderTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

codec/src/test/java/in/mtap/iincube/mongoser/codec/SimpleLineDecoderTest.java → mongoser/src/test/java/in/mtap/iincube/mongoser/codec/SimpleLineDecoderTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

codec/src/test/java/in/mtap/iincube/mongoser/codec/io/RequestReaderTest.java → mongoser/src/test/java/in/mtap/iincube/mongoser/codec/io/RequestReaderTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

codec/src/test/java/in/mtap/iincube/mongoser/crypto/PsyferTest.java → mongoser/src/test/java/in/mtap/iincube/mongoser/crypto/PsyferTest.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

settings.gradle

@@ -1,2 +1,2 @@
-include ':mongoser', ':codec', ':mongoapi', ':restrunner'
+include ':mongoser', ':mongoapi', ':restrunner'