From b41f6532df7b2b0458a6cef17203f15d080187b2 Mon Sep 17 00:00:00 2001 From: Mateusz Kopeć <m.kopec@ipipan.waw.pl> Date: Sun, 23 Oct 2016 10:36:17 +0200 Subject: [PATCH] clean dependencies --- nicolas-core/pom.xml | 27 ++++++++++++++++++++++++++- nicolas-core/src/main/java/pl/waw/ipipan/zil/summ/nicolas/mention/PrepareTrainingData.java | 6 +++--- nicolas-core/src/main/java/pl/waw/ipipan/zil/summ/nicolas/sentence/PrepareTrainingData.java | 6 +++--- pom.xml | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------- 4 files changed, 89 insertions(+), 45 deletions(-) diff --git a/nicolas-core/pom.xml b/nicolas-core/pom.xml index 63fc157..c2fa0a9 100644 --- a/nicolas-core/pom.xml +++ b/nicolas-core/pom.xml @@ -15,8 +15,33 @@ <dependency> <groupId>pl.waw.ipipan.zil.summ</groupId> <artifactId>nicolas-model</artifactId> - <version>${project.version}</version> <scope>runtime</scope> </dependency> + + <dependency> + <groupId>pl.waw.ipipan.zil.summ</groupId> + <artifactId>pscapi</artifactId> + </dependency> + <dependency> + <groupId>pl.waw.ipipan.zil.multiservice</groupId> + <artifactId>utils</artifactId> + </dependency> + + <dependency> + <groupId>nz.ac.waikato.cms.weka</groupId> + <artifactId>weka-dev</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-csv</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> </dependencies> </project> \ No newline at end of file diff --git a/nicolas-core/src/main/java/pl/waw/ipipan/zil/summ/nicolas/mention/PrepareTrainingData.java b/nicolas-core/src/main/java/pl/waw/ipipan/zil/summ/nicolas/mention/PrepareTrainingData.java index 7c84f89..6aa49f6 100644 --- a/nicolas-core/src/main/java/pl/waw/ipipan/zil/summ/nicolas/mention/PrepareTrainingData.java +++ b/nicolas-core/src/main/java/pl/waw/ipipan/zil/summ/nicolas/mention/PrepareTrainingData.java @@ -3,8 +3,8 @@ package pl.waw.ipipan.zil.summ.nicolas.mention; import com.google.common.base.Charsets; import com.google.common.collect.Maps; import com.google.common.io.Files; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import pl.waw.ipipan.zil.multiservice.thrift.types.TMention; import pl.waw.ipipan.zil.multiservice.thrift.types.TText; import pl.waw.ipipan.zil.summ.nicolas.Constants; @@ -20,7 +20,7 @@ import java.util.Map; public class PrepareTrainingData { - private static final Logger LOG = LogManager.getLogger(PrepareTrainingData.class); + private static final Logger LOG = LoggerFactory.getLogger(PrepareTrainingData.class); public static final String PREPROCESSED_FULL_TEXTS_DIR_PATH = "src/main/resources/preprocessed_full_texts/dev"; public static final String OPTIMAL_SUMMARIES_DIR_PATH = "src/main/resources/optimal_summaries/dev"; diff --git a/nicolas-core/src/main/java/pl/waw/ipipan/zil/summ/nicolas/sentence/PrepareTrainingData.java b/nicolas-core/src/main/java/pl/waw/ipipan/zil/summ/nicolas/sentence/PrepareTrainingData.java index b7e2219..fb16339 100644 --- a/nicolas-core/src/main/java/pl/waw/ipipan/zil/summ/nicolas/sentence/PrepareTrainingData.java +++ b/nicolas-core/src/main/java/pl/waw/ipipan/zil/summ/nicolas/sentence/PrepareTrainingData.java @@ -3,8 +3,8 @@ package pl.waw.ipipan.zil.summ.nicolas.sentence; import com.google.common.base.Charsets; import com.google.common.collect.Maps; import com.google.common.io.Files; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import pl.waw.ipipan.zil.multiservice.thrift.types.TMention; import pl.waw.ipipan.zil.multiservice.thrift.types.TSentence; import pl.waw.ipipan.zil.multiservice.thrift.types.TText; @@ -25,7 +25,7 @@ import java.util.Set; public class PrepareTrainingData { - private static final Logger LOG = LogManager.getLogger(PrepareTrainingData.class); + private static final Logger LOG = LoggerFactory.getLogger(PrepareTrainingData.class); private static final String PREPROCESSED_FULL_TEXTS_DIR_PATH = "src/main/resources/preprocessed_full_texts/dev"; private static final String OPTIMAL_SUMMARIES_DIR_PATH = "src/main/resources/optimal_summaries/dev"; diff --git a/pom.xml b/pom.xml index 8dd469f..6484758 100644 --- a/pom.xml +++ b/pom.xml @@ -6,9 +6,10 @@ <groupId>pl.waw.ipipan.zil.summ</groupId> <artifactId>nicolas-container</artifactId> - <packaging>pom</packaging> <version>1.0-SNAPSHOT</version> + <packaging>pom</packaging> + <modules> <module>nicolas-core</module> <module>nicolas-cli</module> @@ -20,6 +21,15 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <java.version.build>1.8</java.version.build> + + <pscapi.version>1.0</pscapi.version> + <utils.version>1.0</utils.version> + + <commons-csv.version>1.4</commons-csv.version> + <guava.version>19.0</guava.version> + <weka-dev.version>3.9.0</weka-dev.version> + <commons-lang3.version>3.5</commons-lang3.version> + <commons-io.version>2.5</commons-io.version> </properties> <prerequisites> @@ -34,44 +44,53 @@ </developer> </developers> - <dependencies> - <dependency> - <groupId>pl.waw.ipipan.zil.summ</groupId> - <artifactId>pscapi</artifactId> - <version>1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>pl.waw.ipipan.zil.multiservice</groupId> - <artifactId>utils</artifactId> - <version>1.0</version> - </dependency> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>pl.waw.ipipan.zil.summ</groupId> + <artifactId>nicolas-model</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>pl.waw.ipipan.zil.summ</groupId> + <artifactId>pscapi</artifactId> + <version>${pscapi.version}</version> + </dependency> + <dependency> + <groupId>pl.waw.ipipan.zil.multiservice</groupId> + <artifactId>utils</artifactId> + <version>${utils.version}</version> + </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-csv</artifactId> - <version>1.3</version> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>19.0</version> - </dependency> - <dependency> - <groupId>nz.ac.waikato.cms.weka</groupId> - <artifactId>weka-dev</artifactId> - <version>3.9.0</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.4</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.5</version> - </dependency> - </dependencies> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-csv</artifactId> + <version>${commons-csv.version}</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + </dependency> + <dependency> + <groupId>nz.ac.waikato.cms.weka</groupId> + <artifactId>weka-dev</artifactId> + <version>${weka-dev.version}</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commons-lang3.version}</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons-io.version}</version> + </dependency> + </dependencies> + </dependencyManagement> <build> <plugins> -- libgit2 0.22.2