aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Valovy2014-07-11 09:19:11 (EDT)
committerTomas Kraus2014-07-11 09:31:09 (EDT)
commit09e0ffcc3f824db822f3234e8d6272f11c86db53 (patch)
tree099635f92ed99bd33025fa36c10844577089427e
parent18e4f68acaf3a9a9876eb4d1bb47080305b75933 (diff)
downloadeclipselink.runtime-09e0ffcc3f824db822f3234e8d6272f11c86db53.zip
eclipselink.runtime-09e0ffcc3f824db822f3234e8d6272f11c86db53.tar.gz
eclipselink.runtime-09e0ffcc3f824db822f3234e8d6272f11c86db53.tar.bz2
Bug #431803: Fix of OS specific bug - added placeholders in order to commit two empty dirs.
Git doesn't commit empty directories. When the two directories is missing, it will cause failures on non-UNIX environments. Signed-off-by: Marcel Valovy <marcel.valovy@oracle.com>
-rw-r--r--buildsystem/compdeps/antbuild.xml2
-rw-r--r--moxy/eclipselink.moxy.test/resource/org/eclipse/persistence/testing/jaxb/beanvalidation/rt/.gitignore6
-rw-r--r--plugins/tmpfix.osgi.aux/.gitignore6
3 files changed, 13 insertions, 1 deletions
diff --git a/buildsystem/compdeps/antbuild.xml b/buildsystem/compdeps/antbuild.xml
index 82ab506..90d6b73 100644
--- a/buildsystem/compdeps/antbuild.xml
+++ b/buildsystem/compdeps/antbuild.xml
@@ -193,7 +193,7 @@
src="${compdeps.2.common.plugins.dir}/jaxb-core_2.2.11.v201406210428.jar"
dest="${compdeps.2.common.plugins.dir}/tmpfix.osgi.core"
/>
- <mkdir dir="${compdeps.2.common.plugins.dir}/tmpfix.osgi.aux"/>
+
<jar update="false"
destfile="${compdeps.2.common.plugins.dir}/tmpfix.osgi.aux/jaxb-core_2.2.11.v201406210428.jar"
basedir="${compdeps.2.common.plugins.dir}/tmpfix.osgi.core"
diff --git a/moxy/eclipselink.moxy.test/resource/org/eclipse/persistence/testing/jaxb/beanvalidation/rt/.gitignore b/moxy/eclipselink.moxy.test/resource/org/eclipse/persistence/testing/jaxb/beanvalidation/rt/.gitignore
new file mode 100644
index 0000000..808cac8
--- /dev/null
+++ b/moxy/eclipselink.moxy.test/resource/org/eclipse/persistence/testing/jaxb/beanvalidation/rt/.gitignore
@@ -0,0 +1,6 @@
+# Git doesn't commit empty directories.
+# When this directory is missing, there will be failures caused on non-UNIX environments.
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore \ No newline at end of file
diff --git a/plugins/tmpfix.osgi.aux/.gitignore b/plugins/tmpfix.osgi.aux/.gitignore
new file mode 100644
index 0000000..808cac8
--- /dev/null
+++ b/plugins/tmpfix.osgi.aux/.gitignore
@@ -0,0 +1,6 @@
+# Git doesn't commit empty directories.
+# When this directory is missing, there will be failures caused on non-UNIX environments.
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore \ No newline at end of file