Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin Dahyabhai2020-01-22 04:22:29 +0000
committerGerrit Code Review @ Eclipse.org2020-01-22 04:22:29 +0000
commitbdab692deca3daacb163e6b783d319d0ba5becc1 (patch)
tree634ca6161675ce71be0760382c7009ca2e13ffe0
parentf362fd01e9eadc1df10225f2b93c9f70f7ada2df (diff)
parent32c4e835b9959e80e9c2006f87ca53a8c4945c89 (diff)
downloadwebtools.sourceediting-bdab692deca3daacb163e6b783d319d0ba5becc1.tar.gz
webtools.sourceediting-bdab692deca3daacb163e6b783d319d0ba5becc1.tar.xz
webtools.sourceediting-bdab692deca3daacb163e6b783d319d0ba5becc1.zip
Merge "[nobug] add hamcrest dependency to json test bundle"
-rw-r--r--json/tests/org.eclipse.wst.json.core.tests/META-INF/MANIFEST.MF3
-rw-r--r--json/tests/org.eclipse.wst.json.core.tests/build.properties4
-rw-r--r--json/tests/org.eclipse.wst.json.core.tests/bundle.properties15
3 files changed, 19 insertions, 3 deletions
diff --git a/json/tests/org.eclipse.wst.json.core.tests/META-INF/MANIFEST.MF b/json/tests/org.eclipse.wst.json.core.tests/META-INF/MANIFEST.MF
index a14a8b11cc..1f5873dfde 100644
--- a/json/tests/org.eclipse.wst.json.core.tests/META-INF/MANIFEST.MF
+++ b/json/tests/org.eclipse.wst.json.core.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.wst.sse.core,
com.ibm.icu,
org.eclipse.core.resources,
- org.junit;bundle-version="4.11.0",
+ org.junit;bundle-version="4.12.0",
+ org.hamcrest.core;bundle-version="1.3.0",
org.eclipse.wst.validation,
org.eclipse.wst.json.core
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/json/tests/org.eclipse.wst.json.core.tests/build.properties b/json/tests/org.eclipse.wst.json.core.tests/build.properties
index d69e97b734..20ff5de217 100644
--- a/json/tests/org.eclipse.wst.json.core.tests/build.properties
+++ b/json/tests/org.eclipse.wst.json.core.tests/build.properties
@@ -1,10 +1,10 @@
source.. = src/
output.. = bin/
bin.includes = .,\
- plugin.properties,\
+ bundle.properties,\
META-INF/,\
plugin.xml,\
OSGI-INF/,\
about.html,\
bin/
-
+additional.bundles = org.hamcrest.core \ No newline at end of file
diff --git a/json/tests/org.eclipse.wst.json.core.tests/bundle.properties b/json/tests/org.eclipse.wst.json.core.tests/bundle.properties
new file mode 100644
index 0000000000..998afeccb2
--- /dev/null
+++ b/json/tests/org.eclipse.wst.json.core.tests/bundle.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2016,2020 Angelo Zerr and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# Angelo Zerr <angelo.zerr@gmail.com> - Initial API and implementation
+# Patrik Suzzi <psuzzi@gmail.com> - Bug 487050
+###############################################################################
+providerName=Eclipse Web Tools Platform
+Bundle-Name=Eclipse JSON Editor and Tool Tests

Back to the top