Merge pull request #2 from openbaton/develop

Merging version 1.3.0 in develop into master

Author: marcellom

README.md

@@ -13,14 +13,23 @@
 * limitations under the License.
 */
 
+plugins {
+    id "com.github.sherter.google-java-format" version "0.3.2"
+}
+
 apply plugin: 'java'
 apply from: 'gradle/application.java.gradle'
 
+
 repositories {
     mavenCentral()
     maven {
         url "http://get.openbaton.org:8081/nexus/content/groups/public"
     }
+    // fc dependency
+    maven {
+        url "https://repository.jboss.org"
+    }
 }
 
 project.ext{
@@ -49,49 +58,69 @@ apply from: 'gradle/run.application.java.gradle'
 
 dependencies {
 
-    compile project(':fault-correlator')
-    compile project(':cli')
-    compile project(':high-availability')
-
     /**
      * Spring dependencies
     */
     compile 'org.springframework.boot:spring-boot:'+ springBootVersion
     compile 'org.springframework.boot:spring-boot-starter-logging:'+ springBootVersion
 
 
-    //EnableJPA annotation
-    compile 'org.springframework.data:spring-data-jpa:1.9.4.RELEASE'
-
     //Rest Annotation in RestRegister
     compile "org.springframework.boot:spring-boot-starter-web:" + springBootVersion
 
 
+    //fc dependencies start
 
-    //Testing Service in Spring (see PolicyManagerTest)
-    testCompile 'junit:junit:4.12'
-    testCompile group: 'junit', name: 'junit', version: '4.11'
+    //compile project (':high-availability')
 
-}
+    //Rest Annotation in AlarmReceiverImpl
+    compile 'org.springframework.boot:spring-boot-starter-websocket:1.3.3.RELEASE'
 
-allprojects{
-    dependencies {
-        //Unirest
-        compile 'com.mashape.unirest:unirest-java:1.3.0'
+    // CrudRepository
+    //compile 'org.springframework.data:spring-data-jpa:1.9.4.RELEASE'
+    compile group: 'org.springframework.data', name: 'spring-data-jpa', version: '1.10.2.RELEASE'
+    //compile 'org.hibernate:hibernate-entitymanager:4.3.10.Final'
+    compile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '5.1.0.Final'
 
-        /**
-         * Spring dependencies
-         */
-        compile 'org.springframework.boot:spring-boot:' + springBootVersion
-        compile 'org.springframework.boot:spring-boot-starter-logging:' + springBootVersion
+    compile 'commons-dbcp:commons-dbcp:1.4'
+    compile 'mysql:mysql-connector-java:5.1.35'
+    compile 'org.aspectj:aspectjweaver:1.8.7'
 
-        //Openbaton
-        compile 'org.openbaton:monitoring:2.0.1'
+    compile 'org.springframework:spring-jdbc'
+    compile 'org.springframework.boot:spring-boot-starter-jdbc:1.3.3.RELEASE'
+
+    //NFVO Requestor
+    compile 'org.openbaton:sdk:2.1.1-SNAPSHOT-fm' /*{
+        exclude module: 'catalogue'
+    }*/
+
+    //RABBIT
+    compile 'org.springframework.boot:spring-boot-starter-amqp:1.3.3.RELEASE'
+
+    //Drools
+    compile 'org.kie:kie-spring:6.3.0.Final'
+
+    // fc dependencies end
+
+    //Unirest
+    compile 'com.mashape.unirest:unirest-java:1.3.0'
+
+    // cli dependencies start
+    compile 'org.springframework.boot:spring-boot:1.3.3.RELEASE'
+    compile 'commons-io:commons-io:2.4'
+    compile "org.springframework.shell:spring-shell:1.1.0.RELEASE"
+    // cli dependencies end
+
+    //Openbaton
+    compile 'org.openbaton:monitoring:2.1.0'
+
+    //Gson
+    compile 'com.google.code.gson:gson:2.4'
+
+    //Testing Service in Spring (see PolicyManagerTest)
+    testCompile 'junit:junit:4.12'
+    testCompile group: 'junit', name: 'junit', version: '4.11'
 
-        testCompile 'org.springframework:spring-test:' + springVersion
-        //Gson
-        compile 'com.google.code.gson:gson:2.4'
-    }
 }