Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcbrun2012-03-07 05:59:02 -0500
committercbrun2012-03-07 05:59:51 -0500
commitb6de506da15d3181dea32eed5554ef16a555f790 (patch)
treee22143494d19d1429e1e5b4862a170e6bdeb1cd0
parent3668908274e7a87280e0430793e43e479c35926b (diff)
downloadorg.eclipse.emf.compare-b6de506da15d3181dea32eed5554ef16a555f790.tar.gz
org.eclipse.emf.compare-b6de506da15d3181dea32eed5554ef16a555f790.tar.xz
org.eclipse.emf.compare-b6de506da15d3181dea32eed5554ef16a555f790.zip
Fixing build.properties (again) to make Tycho 0.14 happy
-rw-r--r--README.textile2
-rw-r--r--packaging/org.eclipse.emf.compare.diff.nl1/build.properties2
-rw-r--r--packaging/org.eclipse.emf.compare.match.nl1/build.properties2
-rw-r--r--packaging/org.eclipse.emf.compare.nl1/build.properties2
-rw-r--r--packaging/org.eclipse.emf.compare.ui.nl1/build.properties4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/build.properties2
6 files changed, 3 insertions, 11 deletions
diff --git a/README.textile b/README.textile
index 38dc6d8f5..abc01fa31 100644
--- a/README.textile
+++ b/README.textile
@@ -6,5 +6,5 @@ mvn clean package -Pindigo
checking the tests
-mvn verify -Pindigo --fail-at-end
+mvn verify -Pindigo --fail-at-end -Dmaven.test.failure.ignore=true
diff --git a/packaging/org.eclipse.emf.compare.diff.nl1/build.properties b/packaging/org.eclipse.emf.compare.diff.nl1/build.properties
index 8e8696b5c..a4f15491d 100644
--- a/packaging/org.eclipse.emf.compare.diff.nl1/build.properties
+++ b/packaging/org.eclipse.emf.compare.diff.nl1/build.properties
@@ -3,9 +3,7 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
src/org/eclipse/emf/compare/diff/emfcomparediffmessages_fr.properties,\
- bin/,\
plugin_fr.properties
src.includes = plugin_fr.properties,\
src/,\
- bin/,\
META-INF/
diff --git a/packaging/org.eclipse.emf.compare.match.nl1/build.properties b/packaging/org.eclipse.emf.compare.match.nl1/build.properties
index 8bd792078..53123b9bf 100644
--- a/packaging/org.eclipse.emf.compare.match.nl1/build.properties
+++ b/packaging/org.eclipse.emf.compare.match.nl1/build.properties
@@ -2,10 +2,8 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- bin/,\
plugin_fr.properties,\
src/org/eclipse/emf/compare/match/emfcomparematchmessages_fr.properties
src.includes = src/,\
plugin_fr.properties,\
- bin/,\
META-INF/
diff --git a/packaging/org.eclipse.emf.compare.nl1/build.properties b/packaging/org.eclipse.emf.compare.nl1/build.properties
index 57d465469..8b75b53c9 100644
--- a/packaging/org.eclipse.emf.compare.nl1/build.properties
+++ b/packaging/org.eclipse.emf.compare.nl1/build.properties
@@ -4,8 +4,6 @@ bin.includes = META-INF/,\
.,\
plugin_fr.properties,\
src/org/eclipse/emf/compare/emfcomparemessages_fr.properties,\
- bin/
src.includes = plugin_fr.properties,\
src/,\
- bin/,\
META-INF/
diff --git a/packaging/org.eclipse.emf.compare.ui.nl1/build.properties b/packaging/org.eclipse.emf.compare.ui.nl1/build.properties
index f16ee1e7f..392736f42 100644
--- a/packaging/org.eclipse.emf.compare.ui.nl1/build.properties
+++ b/packaging/org.eclipse.emf.compare.ui.nl1/build.properties
@@ -2,8 +2,6 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- bin/,\
plugin_fr.properties,\
src/org/eclipse/emf/compare/ui/emfcompareuimessages_fr.properties
-src.includes = plugin_fr.properties,\
- bin/
+src.includes = plugin_fr.properties
diff --git a/plugins/org.eclipse.emf.compare.tests/build.properties b/plugins/org.eclipse.emf.compare.tests/build.properties
index 64f116019..a619dd398 100644
--- a/plugins/org.eclipse.emf.compare.tests/build.properties
+++ b/plugins/org.eclipse.emf.compare.tests/build.properties
@@ -19,6 +19,6 @@ bin.includes = plugin.xml,\
about.html,\
test.xml,\
inputs/,\
- xpected/
+ expected/
src.includes = about.html

Back to the top