From 5568dd51d4436f7a7c28831f921fec6df38ce5a1 Mon Sep 17 00:00:00 2001 From: Andrey Bespalov Date: Tue, 30 May 2017 23:24:40 +0300 Subject: [PATCH] Delete not necessary files --- build.gradle | 24 ++++++++++++++++++++---- log.txt | 0 settings.gradle | 1 - src/main/resources/logback.xml | 18 +++++++++--------- src/main/resources/spring.xml | 7 +++---- test.xls | Bin 22528 -> 0 bytes 6 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 log.txt delete mode 100644 test.xls diff --git a/build.gradle b/build.gradle index 339d585..119ed73 100644 --- a/build.gradle +++ b/build.gradle @@ -39,18 +39,22 @@ repositories { dependencies { - - compile project (":common") + //eliminate the :common project now since all method are in the excel2db class now + //compile project (":common") compile 'ch.qos.logback:logback-classic:1.2.2' compile 'javax.persistence:persistence-api:1.0.2' compile ('org.springframework:spring-context:4.3.7.RELEASE'){ - //exclude module: 'commons-logging' // force Spring to use jcl-over-slf4j bridge + exclude module: 'commons-logging' // force Spring to use jcl-over-slf4j bridge } + compile 'org.springframework.boot:spring-boot-starter-test:1.5.3.RELEASE' compile 'org.apache.poi:poi:3.15' compile 'org.apache.poi:poi-ooxml:3.15' compile 'org.postgresql:postgresql:42.0.0.jre7' compile 'org.apache.directory.studio:org.apache.commons.io:2.4' - + compile('junit:junit:4.12'){ + exclude group: 'org.hamcrest' + } + compile 'org.hamcrest:hamcrest-library:1.3' } @@ -69,6 +73,18 @@ jar { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } + +//filtering out test classes, only test suites should be run + test { + testLogging.showStandardStreams = true + testLogging.exceptionFormat = 'full' + + //exclude certain classes to avoid double running + // - suites + test classes + exclude '**/InitInputFilesImplTest.class' + exclude '**/PopulateTablePostgresImplTest.class' + } + } diff --git a/log.txt b/log.txt new file mode 100644 index 0000000..e69de29 diff --git a/settings.gradle b/settings.gradle index 96a4507..0eb62c0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,2 @@ rootProject.name = 'Excel2DB' -include 'common' diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index c1238f8..8e5bec8 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,15 +1,15 @@ - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - + - - - + + + \ No newline at end of file diff --git a/src/main/resources/spring.xml b/src/main/resources/spring.xml index 0b600ba..3c5f9d1 100644 --- a/src/main/resources/spring.xml +++ b/src/main/resources/spring.xml @@ -31,11 +31,11 @@ - - - + + + @@ -58,5 +58,4 @@ - \ No newline at end of file diff --git a/test.xls b/test.xls deleted file mode 100644 index 3b58ff314a4824b3f08dad748785db33e05409b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22528 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