Updated the build.gradle to delegate down to the subprojects

pandamonium-theorem-prover/build.gradle

@@ -16,6 +16,9 @@ plugins {
     id 'org.unbroken-dome.test-sets' version '1.4.5'
     id 'war'
 }
+
+apply plugin: 'org.springframework.boot'
+
 description = 'Pandamonium Theorem Prover'
 
 group 'edu.msudenver.tsp'
@@ -38,7 +41,6 @@ allprojects {
     apply plugin: 'jacoco'
     apply plugin: 'org.unbroken-dome.test-sets'
     apply plugin: 'idea'
-    apply plugin: 'org.springframework.boot'
     apply plugin: 'io.spring.dependency-management'
 }
 
@@ -48,17 +50,13 @@ subprojects {
     }
 
     dependencies {
-        compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-        compile 'org.codehaus.groovy:groovy-all:2.3.11'
         compile 'org.apache.commons:commons-lang3:3.5'
         // The production code uses the SLF4J logging API at compile time
         compile 'org.slf4j:slf4j-api:1.7.21'
         compile "joda-time:joda-time:2.2"
-        compile("org.springframework.boot:spring-boot-starter-web")
 
         testCompile group: 'junit', name: 'junit', version: '4.11'
         testCompile group: 'junit', name: 'junit', version: '4.12'
-        testCompile("org.springframework.boot:spring-boot-starter-test")
         testCompile('org.mockito:mockito-core:1.10.19') {exclude(group: 'org.hamcrest')}
 
         compileOnly 'org.projectlombok:lombok:1.18.4'
@@ -78,11 +76,10 @@ subprojects {
     }
 }
 
-//bootJar {
+bootJar {
-//    baseName = 'gs-spring-boot'
+    baseName = 'gs-spring-boot'
-//    mainClassName = 'edu.msudenver.tsp.website.Application'
+    version =  '0.1.0'
-//    version =  '0.1.0'
+}
-//}
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

pandamonium-theorem-prover/persistence/build.gradle

@@ -13,17 +13,5 @@ repositories {
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
-}
+    compile fileTree(dir: 'lib', include: '**/*.jar')
-
-test {
-    if (System.properties['test.profile'] != 'integrationTest') {
-        exclude '**/*integrationTest*'
-    } else {
-        exclude '**/*edu/*'
-    }
-}
-
-testSets {
-    unitTest
-    integrationTest
 }

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/PersistenceConfig.java

@@ -1,8 +1,6 @@
 package edu.msudenver.tsp.persistence;
 
-import org.springframework.context.annotation.Configuration;
+//@Configuration
-
-@Configuration
 public class PersistenceConfig {
 
 }

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/DefinitionManager.java

@@ -2,9 +2,7 @@ package edu.msudenver.tsp.persistence.manager;
 
 import edu.msudenver.tsp.persistence.dao.DefinitionDao;
 import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Component;
 
-@Component
 @AllArgsConstructor
 class DefinitionManager {
     final private DefinitionDao definitionDao;

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java

@@ -1,10 +1,7 @@
 package edu.msudenver.tsp.persistence.manager;
 
-import org.springframework.context.annotation.ComponentScan;
+//@Configuration
-import org.springframework.context.annotation.Configuration;
+//@ComponentScan
-
-@Configuration
-@ComponentScan
 //@PropertySource("classpath:development.properties")
 public class ManagerConfig {
 

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/NotationManager.java

@@ -2,9 +2,8 @@ package edu.msudenver.tsp.persistence.manager;
 
 import edu.msudenver.tsp.persistence.dao.NotationDao;
 import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Component;
 
-@Component
+
 @AllArgsConstructor
 class NotationManager {
     final private NotationDao notationDao;

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ProofManager.java

@@ -1,9 +1,7 @@
 package edu.msudenver.tsp.persistence.manager;
 
 import edu.msudenver.tsp.persistence.dao.ProofDao;
-import org.springframework.stereotype.Component;
 
-@Component
 class ProofManager {
     final private ProofDao proofDao;
 

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/TheoremManager.java

@@ -2,9 +2,7 @@ package edu.msudenver.tsp.persistence.manager;
 
 import edu.msudenver.tsp.persistence.dao.TheoremDao;
 import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Component;
 
-@Component
 @AllArgsConstructor
 class TheoremManager {
     final private TheoremDao theoremDao;

pandamonium-theorem-prover/services/build.gradle

@@ -15,16 +15,3 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
     compile fileTree(dir: 'lib', include: '**/*.jar')
 }
-
-test {
-    if (System.properties['test.profile'] != 'integrationTest') {
-        exclude '**/*integrationTest*'
-    } else {
-        exclude '**/*edu/*'
-    }
-}
-
-testSets {
-    unitTest
-    integrationTest
-}

pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java

@@ -1,10 +1,7 @@
 package edu.msudenver.tsp.services.parser;
 
-import org.springframework.context.annotation.ComponentScan;
+//@Configuration
-import org.springframework.context.annotation.Configuration;
+//@ComponentScan
-
-@Configuration
-@ComponentScan
 //@PropertySource("classpath:development.properties")
 public class ParserConfig {
 

pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java

@@ -1,8 +1,6 @@
 package edu.msudenver.tsp.services.parser;
 
-import org.springframework.stereotype.Service;
+//@Service
-
-@Service
 class ParserService {
 
 }

pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java

@@ -1,15 +1,11 @@
 package edu.msudenver.tsp.services.scoring;
 
-import org.springframework.context.annotation.Bean;
+//@Configuration
-import org.springframework.context.annotation.ComponentScan;
+//@ComponentScan
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ComponentScan
 //@PropertySource("classpath:development.properties")
 public class ScoringConfig {
 
-    @Bean
+//    @Bean
     public TheoremScoringService theoremScoringService() {
         return new TheoremScoringService();
     }

pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java

@@ -1,8 +1,6 @@
 package edu.msudenver.tsp.services.scoring;
 
-import org.springframework.stereotype.Service;
+//@Service
-
-@Service
 class TheoremScoringService {
 
 }

pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java

@@ -1,9 +1,17 @@
 package edu.msudenver.tsp.services.parser;
 
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import static org.junit.Assert.assertEquals;
+
 @RunWith(MockitoJUnitRunner.class)
 public class ParserServiceTest {
 
+    @Test
+    public void test() {
+        assertEquals(3,3);
+    }
+
 }

pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/scoring/TheoremScoringServiceTest.java

@@ -1,9 +1,16 @@
 package edu.msudenver.tsp.services.scoring;
 
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import static org.junit.Assert.assertEquals;
+
 @RunWith(MockitoJUnitRunner.class)
 public class TheoremScoringServiceTest {
 
+    @Test
+    public void test() {
+        assertEquals(3,3);
+    }
 }

pandamonium-theorem-prover/src/main/java/hello/Application.java

@@ -1,4 +1,4 @@
-package edu.msudenver.tsp.website;
+package hello;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.CommandLineRunner;

pandamonium-theorem-prover/src/main/java/hello/HelloController.java

@@ -1,4 +1,4 @@
-package edu.msudenver.tsp.website;
+package hello;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/integrationTest/HelloControllerIntegrationTest.java

@@ -1,6 +1,6 @@
 package edu.msudenver.tsp.website.integrationTest;
 
-import edu.msudenver.tsp.website.Application;
+import hello.Application;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

pandamonium-theorem-prover/utilities/build.gradle

@@ -13,17 +13,5 @@ repositories {
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
-}
+    compile fileTree(dir: 'lib', include: '**/*.jar')
-
-test {
-    if (System.properties['test.profile'] != 'integrationTest') {
-        exclude '**/*integrationTest*'
-    } else {
-        exclude '**/*edu/*'
-    }
-}
-
-testSets {
-    unitTest
-    integrationTest
 }