# HG changeset patch # User Tom Gottfried # Date 1481643761 -3600 # Node ID 6ef05e62e3b3d7ff3748f9ebb326fee5ffee5a32 # Parent 93918aca306edff218482a4a707f462798d23851 Cleanup GeoTools dependencies, add missing library for tests. diff -r 93918aca306e -r 6ef05e62e3b3 pom.xml --- a/pom.xml Tue Dec 13 16:21:12 2016 +0100 +++ b/pom.xml Tue Dec 13 16:42:41 2016 +0100 @@ -133,16 +133,19 @@ gt-referencing 14.5 - org.geotools gt-epsg-hsql 14.5 - org.geotools - gt-main + gt-api + 14.5 + + + org.geotools + gt-opengis 14.5 diff -r 93918aca306e -r 6ef05e62e3b3 src/test/java/de/intevation/lada/BaseTest.java --- a/src/test/java/de/intevation/lada/BaseTest.java Tue Dec 13 16:21:12 2016 +0100 +++ b/src/test/java/de/intevation/lada/BaseTest.java Tue Dec 13 16:42:41 2016 +0100 @@ -46,21 +46,21 @@ public static WebArchive createDeployment() throws Exception { File[] files = Maven.resolver().loadPomFromFile("pom.xml") .importRuntimeAndTestDependencies().resolve().withTransitivity().asFile(); - File antlr = null; - for (File f : files) { - logger.debug(f.getName()); - if (f.getName().contains("antlr4")) { - antlr = f; - } - } + WebArchive archive = ShrinkWrap.create(WebArchive.class, ARCHIVE_NAME) .addPackages(true, Package.getPackage("de.intevation.lada")) .addAsResource("log4j.properties", "log4j.properties") .addAsResource("shibboleth.properties", "shibboleth.properties") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") - .addAsLibrary(antlr) .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml"); + for (File f : files) { + if (f.getName().contains("antlr4") + || f.getName().contains("gt-opengis") + ) { + archive.addAsLibrary(f); + } + } return archive; }