diff --git a/pandamonium-theorem-prover/build.gradle b/pandamonium-theorem-prover/build.gradle index 9909528..e31dc45 100644 --- a/pandamonium-theorem-prover/build.gradle +++ b/pandamonium-theorem-prover/build.gradle @@ -42,11 +42,48 @@ allprojects { apply plugin: 'io.spring.dependency-management' } -bootJar { - baseName = 'gs-spring-boot' - version = '0.1.0' +subprojects { + repositories { + mavenCentral() + } + + 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' + } + + test { + if (System.properties['test.profile'] != 'integrationTest') { + exclude '**/*integrationTest*' + } else { + exclude '**/*edu/*' + } + } + + testSets { + unitTest + integrationTest + } } +//bootJar { +// baseName = 'gs-spring-boot' +// mainClassName = 'edu.msudenver.tsp.website.Application' +// version = '0.1.0' +//} + sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/pandamonium-theorem-prover/lombok.config b/pandamonium-theorem-prover/lombok.config index 0c4a2b9..7012d1b 100644 --- a/pandamonium-theorem-prover/lombok.config +++ b/pandamonium-theorem-prover/lombok.config @@ -3,5 +3,4 @@ lombok.accessors.chain = true lombok.accessors.fluent = false lombok.addLombokGeneratedAnnotation = true lombok.log.fieldName = LOG -lombok.toString.includeFieldNames = true -lombok.data.flagUsage = error \ No newline at end of file +lombok.toString.includeFieldNames = true \ No newline at end of file diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java index ddedae9..95772e2 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java @@ -2,11 +2,10 @@ package edu.msudenver.tsp.persistence.manager; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; @Configuration @ComponentScan -@PropertySource("classpath:development.properties") +//@PropertySource("classpath:development.properties") public class ManagerConfig { } diff --git a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java index bd4510c..eb1c4f2 100644 --- a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java +++ b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java @@ -2,11 +2,10 @@ package edu.msudenver.tsp.services.parser; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; @Configuration @ComponentScan -@PropertySource("classpath:development.properties") +//@PropertySource("classpath:development.properties") public class ParserConfig { } diff --git a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java index 98614e3..3a4aa63 100644 --- a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java +++ b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java @@ -3,11 +3,10 @@ package edu.msudenver.tsp.services.scoring; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; @Configuration @ComponentScan -@PropertySource("classpath:development.properties") +//@PropertySource("classpath:development.properties") public class ScoringConfig { @Bean diff --git a/pandamonium-theorem-prover/src/main/java/hello/Application.java b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/Application.java similarity index 96% rename from pandamonium-theorem-prover/src/main/java/hello/Application.java rename to pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/Application.java index b7cb82e..c8f0854 100644 --- a/pandamonium-theorem-prover/src/main/java/hello/Application.java +++ b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/Application.java @@ -1,4 +1,4 @@ -package hello; +package edu.msudenver.tsp.website; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; diff --git a/pandamonium-theorem-prover/src/main/java/hello/HelloController.java b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/HelloController.java similarity index 88% rename from pandamonium-theorem-prover/src/main/java/hello/HelloController.java rename to pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/HelloController.java index 66a5927..a9f1ad5 100644 --- a/pandamonium-theorem-prover/src/main/java/hello/HelloController.java +++ b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/HelloController.java @@ -1,4 +1,4 @@ -package hello; +package edu.msudenver.tsp.website; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/WebsiteConfig.java b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/WebsiteConfig.java index 35ab05c..92cb387 100644 --- a/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/WebsiteConfig.java +++ b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/WebsiteConfig.java @@ -2,11 +2,10 @@ package edu.msudenver.tsp.website; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; @Configuration @ComponentScan -@PropertySource("classpath:development.properties") +//@PropertySource("classpath:development.properties") public class WebsiteConfig { diff --git a/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/integrationTest/HelloControllerIntegrationTest.java b/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/integrationTest/HelloControllerIntegrationTest.java index 3e4ab1e..d7efc65 100644 --- a/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/integrationTest/HelloControllerIntegrationTest.java +++ b/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/integrationTest/HelloControllerIntegrationTest.java @@ -1,6 +1,6 @@ package edu.msudenver.tsp.website.integrationTest; -import hello.Application; +import edu.msudenver.tsp.website.Application; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith;