From 77bc4e69dbf72d1157d4805ef4186f16730552ec Mon Sep 17 00:00:00 2001 From: Patrick Plitzner Date: Mon, 27 Mar 2017 16:26:10 +0200 Subject: [PATCH] ref #6539 Fix taxeditor build (temporary) - disable macosx build - remove /bin folder from source generation (a zip cannot include itself) --- eu.etaxonomy.taxeditor.webapp/build.properties | 5 +++-- pom.xml | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/eu.etaxonomy.taxeditor.webapp/build.properties b/eu.etaxonomy.taxeditor.webapp/build.properties index a5a7a9f2d..a8ba0ac03 100644 --- a/eu.etaxonomy.taxeditor.webapp/build.properties +++ b/eu.etaxonomy.taxeditor.webapp/build.properties @@ -1,5 +1,5 @@ -source.. = src/main/java/,\ - src/main/resources/ +source.. = src/main/java/,\ + src/main/resources/ bin.includes = META-INF/,\ .,\ lib/,\ @@ -8,3 +8,4 @@ bin.includes = META-INF/,\ lib/mysql-connector-java-5.1.38.jar,\ lib/postgresql-9.4-1206-jdbc4.jar,\ lib/jdbc4-2.0.jar +output.. = bin/ diff --git a/pom.xml b/pom.xml index 93dc31946..a6e4ef896 100644 --- a/pom.xml +++ b/pom.xml @@ -211,11 +211,11 @@ ${tycho.version} - - macosx - cocoa - x86_64 - + + + + + win32 win32 -- 2.34.1