From d8e81b1abbe9d84ff1cdcfa4062f36ee57d341f9 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Tue, 19 Feb 2019 11:00:17 -0700 Subject: [PATCH] Revert "PAN-7 Updated the build.gradle files" This reverts commit da673068 --- pandamonium-theorem-prover/build.gradle | 4 ++-- pandamonium-theorem-prover/persistence/build.gradle | 12 +++--------- pandamonium-theorem-prover/services/build.gradle | 6 ------ pandamonium-theorem-prover/utilities/build.gradle | 6 ------ 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/pandamonium-theorem-prover/build.gradle b/pandamonium-theorem-prover/build.gradle index cab2bc6..a89060e 100644 --- a/pandamonium-theorem-prover/build.gradle +++ b/pandamonium-theorem-prover/build.gradle @@ -78,8 +78,8 @@ subprojects { } } -bootWar { - baseName = 'ptp-web-server' +bootJar { + baseName = 'gs-spring-boot' version = '0.1.0' } diff --git a/pandamonium-theorem-prover/persistence/build.gradle b/pandamonium-theorem-prover/persistence/build.gradle index 5fbab58..531bfff 100644 --- a/pandamonium-theorem-prover/persistence/build.gradle +++ b/pandamonium-theorem-prover/persistence/build.gradle @@ -1,7 +1,6 @@ import org.gradle.internal.os.OperatingSystem plugins { id 'java' - id 'application' } description = 'Provides database access and connectivity' @@ -10,12 +9,6 @@ version '1.0' sourceCompatibility = 1.8 -sonarqube { - properties { - property "sonar.projectName", 'Persistence Tier' - } -} - repositories { mavenCentral() } @@ -24,14 +17,17 @@ dependencies { compile group: 'org.springframework.data', name: 'spring-data-jpa', version: '2.0.5.RELEASE' compile group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: '9.0.16' compile group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '2.0.5.RELEASE' +// compile group: 'org.springframework.boot', name: 'spring-boot-starter-data-elasticsearch', version: '2.1.2.RELEASE' compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.0.5.RELEASE' compile group: 'org.springframework', name: 'spring-aspects', version: '5.1.5.RELEASE' compile group: 'org.hibernate', name: 'hibernate-core', version: '5.4.1.Final' compile group: 'com.vladmihalcea', name: 'hibernate-types-52', version: '2.4.1' + compile fileTree(dir: 'lib', include: '**/*.jar') compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.15' +// compile 'javax.validation:validation-api:1.1.0.Final' compile('com.googlecode.log4jdbc:log4jdbc:1.2') { exclude(group: 'org.slf4j') } @@ -42,8 +38,6 @@ dependencies { } -mainClassName = 'edu.msudenver.tsp.persistence.PersistenceApi' - task loadDb(type: Exec, group: 'Verification', description: 'Reloads the local database.') { if (OperatingSystem.current().isLinux() || OperatingSystem.current().isMacOsX()) { workingDir "./scripts/mysql" diff --git a/pandamonium-theorem-prover/services/build.gradle b/pandamonium-theorem-prover/services/build.gradle index 1445cae..efcc2d3 100644 --- a/pandamonium-theorem-prover/services/build.gradle +++ b/pandamonium-theorem-prover/services/build.gradle @@ -7,12 +7,6 @@ version '1.0' sourceCompatibility = 1.8 -sonarqube { - properties { - property "sonar.projectName", 'theorem Prover Services' - } -} - repositories { mavenCentral() } diff --git a/pandamonium-theorem-prover/utilities/build.gradle b/pandamonium-theorem-prover/utilities/build.gradle index 336cf6f..b8e0e3f 100644 --- a/pandamonium-theorem-prover/utilities/build.gradle +++ b/pandamonium-theorem-prover/utilities/build.gradle @@ -7,12 +7,6 @@ version '1.0' sourceCompatibility = 1.8 -sonarqube { - properties { - property "sonar.projectName", 'Pandamonium Utilities' - } -} - repositories { mavenCentral() }