diff options
| author | nickboldt | 2018-02-27 21:55:55 +0000 |
|---|---|---|
| committer | nickboldt | 2018-02-28 15:10:50 +0000 |
| commit | 92ec5d390bb67f831cd98b40fab165ec41a18775 (patch) | |
| tree | 4258e38deff6df6bbbcfca9c6b96c9b9e433271c | |
| parent | 2294a495b1cbb486ab1dc4964f498b0f6c319edb (diff) | |
| download | webtools.jsdt-92ec5d390bb67f831cd98b40fab165ec41a18775.tar.gz webtools.jsdt-92ec5d390bb67f831cd98b40fab165ec41a18775.tar.xz webtools.jsdt-92ec5d390bb67f831cd98b40fab165ec41a18775.zip | |
v2: generate missing sources; remove sources from sdk features; add missing IUs to update site (no nashhorn, integration, development stuff)
Signed-off-by: nickboldt <nboldt@redhat.com>
66 files changed, 165 insertions, 86 deletions
diff --git a/development/org.eclipse.wst.jsdt.debug.opera/META-INF/MANIFEST.MF b/development/org.eclipse.wst.jsdt.debug.opera/META-INF/MANIFEST.MF index f673fd957..584a2035d 100644 --- a/development/org.eclipse.wst.jsdt.debug.opera/META-INF/MANIFEST.MF +++ b/development/org.eclipse.wst.jsdt.debug.opera/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.wst.jsdt.debug.opera;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 0.1.1.qualifier Bundle-Activator: org.eclipse.wst.jsdt.debug.opera.OperaPlugin Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime, diff --git a/development/org.eclipse.wst.jsdt.debug.opera/build.properties b/development/org.eclipse.wst.jsdt.debug.opera/build.properties index 7cbd1598a..64014ecfc 100644 --- a/development/org.eclipse.wst.jsdt.debug.opera/build.properties +++ b/development/org.eclipse.wst.jsdt.debug.opera/build.properties @@ -1,4 +1,7 @@ +source.. = src/ output.. = bin/ +src.includes = * +src.excludes = src bin.includes = plugin.xml,\ OSGI-INF/,\ META-INF/ diff --git a/development/org.eclipse.wst.jsdt.debug.opera/pom.xml b/development/org.eclipse.wst.jsdt.debug.opera/pom.xml index 07008c63d..082f461e9 100644 --- a/development/org.eclipse.wst.jsdt.debug.opera/pom.xml +++ b/development/org.eclipse.wst.jsdt.debug.opera/pom.xml @@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.jsdt.development</groupId> <artifactId>org.eclipse.wst.jsdt.debug.opera</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>0.1.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/features/org.eclipse.wst.jsdt_sdk.feature/build.properties b/features/org.eclipse.wst.jsdt_sdk.feature/build.properties index 0245614e8..c4e3c7a83 100644 --- a/features/org.eclipse.wst.jsdt_sdk.feature/build.properties +++ b/features/org.eclipse.wst.jsdt_sdk.feature/build.properties @@ -1,5 +1,3 @@ bin.includes = feature.xml,\ feature.properties,\ - -generate.feature@org.eclipse.wst.jsdt.feature.source = org.eclipse.wst.jsdt.feature diff --git a/features/org.eclipse.wst.jsdt_sdk.feature/feature.xml b/features/org.eclipse.wst.jsdt_sdk.feature/feature.xml index 97e9c6c73..7ffa3d084 100644 --- a/features/org.eclipse.wst.jsdt_sdk.feature/feature.xml +++ b/features/org.eclipse.wst.jsdt_sdk.feature/feature.xml @@ -2,7 +2,7 @@ <feature
id="org.eclipse.wst.jsdt_sdk.feature"
label="%featureName"
- version="2.1.0.qualifier"
+ version="2.1.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
@@ -19,27 +19,9 @@ %license
</license>
- <includes
- id="org.eclipse.wst.jsdt.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.wst.jsdt.feature.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.wst.jsdt.nodejs.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.wst.jsdt.nodejs.feature.source"
- version="0.0.0"/>
-
- <plugin
- id="org.mozilla.javascript.source"
- download-size="0"
- install-size="0"
- version="1.7.5.qualifier"
- unpack="false"/>
+ <requires>
+ <import feature="org.eclipse.wst.jsdt.feature"/>
+ <import feature="org.eclipse.wst.jsdt.nodejs.feature"/>
+ </requires>
</feature>
diff --git a/features/org.eclipse.wst.jsdt_sdk.feature/pom.xml b/features/org.eclipse.wst.jsdt_sdk.feature/pom.xml index 56403feb9..0b43d8217 100644 --- a/features/org.eclipse.wst.jsdt_sdk.feature/pom.xml +++ b/features/org.eclipse.wst.jsdt_sdk.feature/pom.xml @@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.jsdt.features</groupId> <artifactId>org.eclipse.wst.jsdt_sdk.feature</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>2.1.1-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/features/org.eclipse.wst.jsdt_tests.feature/feature.xml b/features/org.eclipse.wst.jsdt_tests.feature/feature.xml index a8f668e9e..6b42444e2 100644 --- a/features/org.eclipse.wst.jsdt_tests.feature/feature.xml +++ b/features/org.eclipse.wst.jsdt_tests.feature/feature.xml @@ -2,7 +2,7 @@ <feature
id="org.eclipse.wst.jsdt_tests.feature"
label="%featureName"
- version="2.1.1.qualifier"
+ version="2.1.2.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
diff --git a/features/org.eclipse.wst.jsdt_tests.feature/pom.xml b/features/org.eclipse.wst.jsdt_tests.feature/pom.xml index 7e47bf187..974d1e95c 100644 --- a/features/org.eclipse.wst.jsdt_tests.feature/pom.xml +++ b/features/org.eclipse.wst.jsdt_tests.feature/pom.xml @@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.jsdt.features</groupId> <artifactId>org.eclipse.wst.jsdt_tests.feature</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/.classpath b/itests/org.eclipse.wst.jsdt.integration.tests/.classpath index 1f0469022..1f0469022 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/.classpath +++ b/itests/org.eclipse.wst.jsdt.integration.tests/.classpath diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/.project b/itests/org.eclipse.wst.jsdt.integration.tests/.project index f057ec385..f057ec385 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/.project +++ b/itests/org.eclipse.wst.jsdt.integration.tests/.project diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/META-INF/MANIFEST.MF b/itests/org.eclipse.wst.jsdt.integration.tests/META-INF/MANIFEST.MF index 2f7d2b182..8b5d01e0f 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/META-INF/MANIFEST.MF +++ b/itests/org.eclipse.wst.jsdt.integration.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.jsdt.integration.tests; singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.1.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.junit, diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/about.html b/itests/org.eclipse.wst.jsdt.integration.tests/about.html index 1890cfa83..1890cfa83 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/about.html +++ b/itests/org.eclipse.wst.jsdt.integration.tests/about.html diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/build.properties b/itests/org.eclipse.wst.jsdt.integration.tests/build.properties index 0f1dfd516..26b8ddbbc 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/build.properties +++ b/itests/org.eclipse.wst.jsdt.integration.tests/build.properties @@ -4,5 +4,8 @@ bin.includes = .,\ about.html,\ plugin.xml,\ resources/ -source.. = src/ jars.compile.order = . +source.. = src/ +output.. = bin/ +src.includes = * +src.excludes = src diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/pom.xml b/itests/org.eclipse.wst.jsdt.integration.tests/pom.xml index 077b2f3ba..f6167ab17 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/pom.xml +++ b/itests/org.eclipse.wst.jsdt.integration.tests/pom.xml @@ -22,9 +22,11 @@ <groupId>org.eclipse.webtools.jsdt.tests</groupId> <artifactId>org.eclipse.wst.jsdt.integration.tests</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + <!-- TODO: update to use Red Deer 2.0 from Eclipse instead of 1.2 from JBoss --> + <properties> <suiteClass>org.eclipse.wst.jsdt.integration.tests.JSDTIntegrationTests</suiteClass> <skipIntegrationTests>true</skipIntegrationTests> diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/.gitignore b/itests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/.gitignore index 7a8193e60..7a8193e60 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/.gitignore +++ b/itests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/.gitignore diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/.project b/itests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/.project index ef631df5a..ef631df5a 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/.project +++ b/itests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/.project diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/LICENSE b/itests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/LICENSE index f735bee0e..f735bee0e 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/LICENSE +++ b/itests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/LICENSE diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/README.MD b/itests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/README.MD index 1fc36a41d..1fc36a41d 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/README.MD +++ b/itests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/README.MD diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/book.js b/itests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/book.js index 06321400e..06321400e 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/book.js +++ b/itests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/book.js diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/index.js b/itests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/index.js index 50eb47ef9..50eb47ef9 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/index.js +++ b/itests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/index.js diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/package.json b/itests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/package.json index 038e4b0cd..038e4b0cd 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/package.json +++ b/itests/org.eclipse.wst.jsdt.integration.tests/resources/jsdt-node-test-project/package.json diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/JSDTIntegrationTests.java b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/JSDTIntegrationTests.java index 930e01034..930e01034 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/JSDTIntegrationTests.java +++ b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/JSDTIntegrationTests.java diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/bower/BowerInitTest.java b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/bower/BowerInitTest.java index cdb582d71..cdb582d71 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/bower/BowerInitTest.java +++ b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/bower/BowerInitTest.java diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/bower/BowerUpdateTest.java b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/bower/BowerUpdateTest.java index 08e50dcb4..08e50dcb4 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/bower/BowerUpdateTest.java +++ b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/bower/BowerUpdateTest.java diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/common/JSTTestBase.java b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/common/JSTTestBase.java index 9cfb2e0be..9cfb2e0be 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/common/JSTTestBase.java +++ b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/common/JSTTestBase.java diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/condition/CursorPositionIsOnLine.java b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/condition/CursorPositionIsOnLine.java index 78260c614..78260c614 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/condition/CursorPositionIsOnLine.java +++ b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/condition/CursorPositionIsOnLine.java diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/condition/TreeContainsItem.java b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/condition/TreeContainsItem.java index f0b9abd94..f0b9abd94 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/condition/TreeContainsItem.java +++ b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/condition/TreeContainsItem.java diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/wizard/bower/BowerInitDialog.java b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/wizard/bower/BowerInitDialog.java index ff8f32758..ff8f32758 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/wizard/bower/BowerInitDialog.java +++ b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/wizard/bower/BowerInitDialog.java diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/wizard/js/NewJSFileWizardDialog.java b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/wizard/js/NewJSFileWizardDialog.java index 9cda73ba2..9cda73ba2 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/wizard/js/NewJSFileWizardDialog.java +++ b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/wizard/js/NewJSFileWizardDialog.java diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/wizard/js/NewJSFileWizardPage.java b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/wizard/js/NewJSFileWizardPage.java index e98d0acfb..e98d0acfb 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/wizard/js/NewJSFileWizardPage.java +++ b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/wizard/js/NewJSFileWizardPage.java diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/wizard/npm/NpmInitDialog.java b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/wizard/npm/NpmInitDialog.java index b36f8136a..b36f8136a 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/wizard/npm/NpmInitDialog.java +++ b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/internal/wizard/npm/NpmInitDialog.java diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/nodejs/NodeJSDebuggerTest.java b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/nodejs/NodeJSDebuggerTest.java index fa0399932..fa0399932 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/nodejs/NodeJSDebuggerTest.java +++ b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/nodejs/NodeJSDebuggerTest.java diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/nodejs/NodeJSLauncherTest.java b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/nodejs/NodeJSLauncherTest.java index 56f182251..56f182251 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/nodejs/NodeJSLauncherTest.java +++ b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/nodejs/NodeJSLauncherTest.java diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/npm/NpmInitTest.java b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/npm/NpmInitTest.java index 70c44826a..70c44826a 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/npm/NpmInitTest.java +++ b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/npm/NpmInitTest.java diff --git a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/npm/NpmShortcutsTest.java b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/npm/NpmShortcutsTest.java index 8d2a0a635..8d2a0a635 100644 --- a/tests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/npm/NpmShortcutsTest.java +++ b/itests/org.eclipse.wst.jsdt.integration.tests/src/org/eclipse/wst/jsdt/integration/tests/npm/NpmShortcutsTest.java diff --git a/itests/pom.xml b/itests/pom.xml new file mode 100644 index 000000000..740e520c8 --- /dev/null +++ b/itests/pom.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2014 Red Hat Inc. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Distribution License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/org/documents/edl-v10.php + + Contributors: + Mickael Istria (Red Hat Inc.) - initial implementation +--> + +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.webtools.jsdt</groupId> + <artifactId>jsdt-parent</artifactId> + <version>3.6.0-SNAPSHOT</version> + </parent> + + <artifactId>tests</artifactId> + <packaging>pom</packaging> + + <!-- for internal use only - tests may violate IP policy? --> + <modules> + <module>org.eclipse.wst.jsdt.integration.tests</module> + </modules> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho.version}</version> + <configuration> + <showEclipseLog>true</showEclipseLog> + <argLine>-Dorg.osgi.framework.bundle.parent=ext</argLine> + </configuration> + </plugin> + </plugins> + </build> +</project> @@ -60,8 +60,11 @@ <modules> <module>bundles</module> <module>nodejs</module> + <!-- old code, do not build <module>development</module> --> + <!-- to be removed, do not build <module>nashorn</module> --> <module>docs</module> <module>tests</module> + <!-- internal use only, do not build <module>itests</module> --> <module>features</module> <module>site</module> </modules> diff --git a/site/category.xml b/site/category.xml index ba96be13e..b44f6c45c 100644 --- a/site/category.xml +++ b/site/category.xml @@ -1,32 +1,61 @@ <?xml version="1.0" encoding="UTF-8"?> <site> - <feature id="org.eclipse.wst.jsdt.feature"> - <category name="JSDT"/> - </feature> - <feature id="org.eclipse.wst.jsdt.nodejs.feature"> - <category name="JSDT"/> - </feature> - <feature id="org.eclipse.wst.jsdt_sdk.feature"> - <category name="JSDT"/> - </feature> - <feature id="org.eclipse.wst.jsdt_tests.feature"> - <category name="JSDT"/> - </feature> - - <bundle id="org.eclipse.wst.jsdt.debug.rhino.ui"/> - - <!-- required by downstream webservices repo : org.eclipse.jst.web_ui.feature.feature.group --> - <bundle id="org.eclipse.wst.jsdt.debug.rhino.ui"/> - - <feature id="org.eclipse.wst.jsdt.chromium.debug.feature"> - <category name="JSDT - Incubation"/> - </feature> - <feature id="org.eclipse.wst.jsdt.chromium_sdk.feature"> - <category name="JSDT - Incubation"/> - </feature> - <feature id="org.eclipse.wst.jsdt.chromium_tests.feature"> - <category name="JSDT - Incubation"/> - </feature> - <category-def name="JSDT" label="JavaScript Development Tools"/> - <category-def name="JSDT - Incubation" label="JSDT - Incubating and experimental plugins"/> + <feature id="org.eclipse.wst.jsdt.feature"><category name="wtp"/></feature> + <feature id="org.eclipse.wst.jsdt.nodejs.feature"><category name="wtp"/></feature> + <feature id="org.eclipse.wst.jsdt_sdk.feature"><category name="wtp"/></feature> + <feature id="org.eclipse.wst.jsdt_tests.feature"><category name="wtp"/></feature> + + <!-- do not include thse plugins + org.eclipse.wst.jsdt.astview + org.eclipse.wst.jsdt.debug.chrome + org.eclipse.wst.jsdt.debug.ie + org.eclipse.wst.jsdt.debug.jsd2 + org.eclipse.wst.jsdt.debug.node + org.eclipse.wst.jsdt.debug.opera + org.eclipse.wst.jsdt.jseview + org.eclipse.wst.jsdt.unittests + + org.eclipse.wst.jsdt.nashorn.api + org.eclipse.wst.jsdt.nashorn.extension + + org.eclipse.wst.jsdt.integration.tests + --> + + <bundle id="org.eclipse.wst.jsdt.debug.rhino.ui"><category name="wtp.bundles"/></bundle> + <bundle id="org.eclipse.wst.jsdt.chromium.wipbackend.protocol_1_0"><category name="wtp.bundles"/></bundle> + <bundle id="org.eclipse.wst.jsdt.js.common.tests"><category name="wtp.tests"/></bundle> + + <feature id="org.eclipse.wst.jsdt.chromium.debug.feature"><category name="wtp.incubation"/></feature> + <feature id="org.eclipse.wst.jsdt.chromium_sdk.feature"><category name="wtp.incubation"/></feature> + <feature id="org.eclipse.wst.jsdt.chromium_tests.feature"><category name="wtp.incubation"/></feature> + + <!-- sources --> + + <feature id="org.eclipse.wst.jsdt.feature.source"><category name="wtp.sources"/></feature> + <feature id="org.eclipse.wst.jsdt.nodejs.feature.source"><category name="wtp.sources"/></feature> + + <bundle id="org.eclipse.wst.jsdt.debug.rhino.ui.source"><category name="wtp.bundles.sources"/></bundle> + <bundle id="org.eclipse.wst.jsdt.chromium.wipbackend.protocol_1_0.source"><category name="wtp.bundles.sources"/></bundle> + <bundle id="org.eclipse.wst.jsdt.js.common.tests.source"><category name="wtp.tests.sources"/></bundle> + + <feature id="org.eclipse.wst.jsdt.chromium.debug.feature.source"><category name="wtp.incubation.sources"/></feature> + + <category-def name="wtp" label="Web Tools Platform (WTP)"><description>These features provide functionality with the executable code only and are recommended for most users.</description></category-def> + <category-def name="wtp.sdk" label="Web Tools Platform SDK (WTP SDK)"><description>These features provide functionality with the executable code and the source code and are recommended for those extending or debugging WTP.</description></category-def> + + <category-def name="wtp.sources" label="Web Tools Platform (WTP) Sources"><description>These features provide sources.</description></category-def> + <category-def name="wtp.sdk.sources" label="Web Tools Platform SDK (WTP SDK) Sources"><description>These features provide sources.</description></category-def> + + <category-def name="wtp.bundles" label="Web Tools Platform (WTP) Bundles"><description>These bundles are most likely include in features, but are provided here for completeness.</description></category-def> + <category-def name="wtp.bundles.sdk" label="Web Tools Platform SDK (WTP SDK) Bundles"><description>These bundles are most likely include in features, but are provided here for completeness.</description></category-def> + + <category-def name="wtp.incubation" label="Web Tools Platform (WTP) Incubation"><description>These features provide incubating functionality with the executable code only and are recommended for most users.</description></category-def> + <category-def name="wtp.incubation.sources" label="Web Tools Platform (WTP) Incubation Sources"><description>These features provide incubating sources.</description></category-def> + + <category-def name="wtp.bundles.sources" label="Web Tools Platform (WTP) Bundle Sources"><description>These bundles provide sources.</description></category-def> + <category-def name="wtp.bundles.sdk.sources" label="Web Tools Platform SDK (WTP SDK) Bundle Sources"><description>These bundles provide sources.</description></category-def> + + <category-def name="wtp.tests" label="Web Tools Platform Tests (WTP Tests)"><description>These features provide unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least their PDE Targets.</description></category-def> + <category-def name="wtp.tests.sources" label="Web Tools Platform Tests (WTP Tests) Sources"><description>These sources provide unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least their PDE Targets.</description></category-def> + </site> diff --git a/tests/org.eclipse.wst.jsdt.chromium.debug.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.jsdt.chromium.debug.core.tests/META-INF/MANIFEST.MF index 5cd8e2246..c8696d3df 100644 --- a/tests/org.eclipse.wst.jsdt.chromium.debug.core.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.jsdt.chromium.debug.core.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Chromium JavaScript Remote Debugger Core Tests Bundle-Vendor: Eclipse Web Tools Platform Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.wst.jsdt.chromium.debug.core.tests -Bundle-Version: 0.5.200.qualifier +Bundle-Version: 0.5.201.qualifier Fragment-Host: org.eclipse.wst.jsdt.chromium.debug.core;bundle-version="0.1.0.0" Require-Bundle: org.eclipse.core.runtime, org.eclipse.wst.jsdt.chromium.debug.core;bundle-version="[0.5.0,0.6.0)", diff --git a/tests/org.eclipse.wst.jsdt.chromium.debug.core.tests/build.properties b/tests/org.eclipse.wst.jsdt.chromium.debug.core.tests/build.properties index d944674ba..978c0b363 100644 --- a/tests/org.eclipse.wst.jsdt.chromium.debug.core.tests/build.properties +++ b/tests/org.eclipse.wst.jsdt.chromium.debug.core.tests/build.properties @@ -1,5 +1,7 @@ source.. = src/ output.. = bin/ +src.includes = * +src.excludes = src bin.includes = META-INF/,\ .,\ about.html,\ diff --git a/tests/org.eclipse.wst.jsdt.chromium.debug.core.tests/pom.xml b/tests/org.eclipse.wst.jsdt.chromium.debug.core.tests/pom.xml index 49fe30b15..a3610e11b 100644 --- a/tests/org.eclipse.wst.jsdt.chromium.debug.core.tests/pom.xml +++ b/tests/org.eclipse.wst.jsdt.chromium.debug.core.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.webtools.jsdt.tests</groupId> <artifactId>org.eclipse.wst.jsdt.chromium.debug.core.tests</artifactId> - <version>0.5.200-SNAPSHOT</version> + <version>0.5.201-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project> diff --git a/tests/org.eclipse.wst.jsdt.chromium.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.jsdt.chromium.tests/META-INF/MANIFEST.MF index bb51c18f4..8c5603654 100755 --- a/tests/org.eclipse.wst.jsdt.chromium.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.jsdt.chromium.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: ChromeDevTools SDK Tests Bundle-Vendor: Eclipse Web Tools Platform Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.wst.jsdt.chromium.tests -Bundle-Version: 0.5.200.qualifier +Bundle-Version: 0.5.201.qualifier Fragment-Host: org.eclipse.wst.jsdt.chromium;bundle-version="0.1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.wst.jsdt.chromium.wipbackend.dev;bundle-version="[0.4.0,0.6.0)", diff --git a/tests/org.eclipse.wst.jsdt.chromium.tests/build.properties b/tests/org.eclipse.wst.jsdt.chromium.tests/build.properties index c13efc6a5..4dfad8c35 100755 --- a/tests/org.eclipse.wst.jsdt.chromium.tests/build.properties +++ b/tests/org.eclipse.wst.jsdt.chromium.tests/build.properties @@ -2,6 +2,8 @@ source.. = src/,\ src-dynamic-impl/bridge/,\ src-dynamic-impl/parser/ output.. = bin/ +src.includes = * +src.excludes = src bin.includes = META-INF/,\ .,\ plugin.properties,\ diff --git a/tests/org.eclipse.wst.jsdt.chromium.tests/pom.xml b/tests/org.eclipse.wst.jsdt.chromium.tests/pom.xml index 2a391402d..57736ade8 100644 --- a/tests/org.eclipse.wst.jsdt.chromium.tests/pom.xml +++ b/tests/org.eclipse.wst.jsdt.chromium.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.webtools.jsdt.tests</groupId> <artifactId>org.eclipse.wst.jsdt.chromium.tests</artifactId> - <version>0.5.200-SNAPSHOT</version> + <version>0.5.201-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project> diff --git a/tests/org.eclipse.wst.jsdt.core.tests.compiler/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.jsdt.core.tests.compiler/META-INF/MANIFEST.MF index d2d9c17bb..d035448d3 100644 --- a/tests/org.eclipse.wst.jsdt.core.tests.compiler/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.jsdt.core.tests.compiler/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.jsdt.core.tests.compiler; singleton:=true -Bundle-Version: 2.0.200.qualifier +Bundle-Version: 2.0.201.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", diff --git a/tests/org.eclipse.wst.jsdt.core.tests.compiler/build.properties b/tests/org.eclipse.wst.jsdt.core.tests.compiler/build.properties index 5717ad8b8..f0e07d76a 100644 --- a/tests/org.eclipse.wst.jsdt.core.tests.compiler/build.properties +++ b/tests/org.eclipse.wst.jsdt.core.tests.compiler/build.properties @@ -13,6 +13,8 @@ bin.includes = test.xml,\ plugin.properties,\ META-INF/,\ about.html -src.includes = test.xml source.. = src/ +output.. = bin/ +src.includes = * +src.excludes = src jars.compile.order = . diff --git a/tests/org.eclipse.wst.jsdt.core.tests.compiler/pom.xml b/tests/org.eclipse.wst.jsdt.core.tests.compiler/pom.xml index 5e9458534..16448eb70 100644 --- a/tests/org.eclipse.wst.jsdt.core.tests.compiler/pom.xml +++ b/tests/org.eclipse.wst.jsdt.core.tests.compiler/pom.xml @@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.jsdt.tests</groupId> <artifactId>org.eclipse.wst.jsdt.core.tests.compiler</artifactId> - <version>2.0.200-SNAPSHOT</version> + <version>2.0.201-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.jsdt.core.tests.model/META-INF/MANIFEST.MF index 825055736..03ede9bd0 100644 --- a/tests/org.eclipse.wst.jsdt.core.tests.model/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.jsdt.core.tests.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.jsdt.core.tests.model; singleton:=true -Bundle-Version: 2.0.200.qualifier +Bundle-Version: 2.0.201.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.wst.jsdt.core.tests, diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/build.properties b/tests/org.eclipse.wst.jsdt.core.tests.model/build.properties index 1d377c30f..68649c054 100644 --- a/tests/org.eclipse.wst.jsdt.core.tests.model/build.properties +++ b/tests/org.eclipse.wst.jsdt.core.tests.model/build.properties @@ -17,3 +17,6 @@ bin.includes = plugin.xml,\ about.html,\ testresources/ source.. = src/ +output.. = bin/ +src.includes = * +src.excludes = src diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/pom.xml b/tests/org.eclipse.wst.jsdt.core.tests.model/pom.xml index 3592087e5..a5da04760 100644 --- a/tests/org.eclipse.wst.jsdt.core.tests.model/pom.xml +++ b/tests/org.eclipse.wst.jsdt.core.tests.model/pom.xml @@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.jsdt.tests</groupId> <artifactId>org.eclipse.wst.jsdt.core.tests.model</artifactId> - <version>2.0.200-SNAPSHOT</version> + <version>2.0.201-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/tests/org.eclipse.wst.jsdt.debug.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.jsdt.debug.core.tests/META-INF/MANIFEST.MF index c1d603a9b..f923451e9 100644 --- a/tests/org.eclipse.wst.jsdt.debug.core.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.jsdt.debug.core.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.wst.jsdt.debug.core.tests;singleton:=true -Bundle-Version: 1.0.400.qualifier +Bundle-Version: 1.0.401.qualifier Bundle-Activator: org.eclipse.wst.debug.core.tests.JSDTDebugTestPlugin Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime, diff --git a/tests/org.eclipse.wst.jsdt.debug.core.tests/build.properties b/tests/org.eclipse.wst.jsdt.debug.core.tests/build.properties index 04bf5353e..169875270 100644 --- a/tests/org.eclipse.wst.jsdt.debug.core.tests/build.properties +++ b/tests/org.eclipse.wst.jsdt.debug.core.tests/build.properties @@ -10,6 +10,8 @@ ############################################################################### source.. = src/ output.. = bin/ +src.includes = * +src.excludes = src bin.includes = META-INF/,\ .,\ OSGI-INF/l10n/bundle.properties,\ @@ -17,4 +19,3 @@ bin.includes = META-INF/,\ test.xml,\ testsource/,\ OSGI-INF/ -src.includes = about.html diff --git a/tests/org.eclipse.wst.jsdt.debug.core.tests/pom.xml b/tests/org.eclipse.wst.jsdt.debug.core.tests/pom.xml index 64ee7be36..0fc2fcd65 100644 --- a/tests/org.eclipse.wst.jsdt.debug.core.tests/pom.xml +++ b/tests/org.eclipse.wst.jsdt.debug.core.tests/pom.xml @@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.jsdt.tests</groupId> <artifactId>org.eclipse.wst.jsdt.debug.core.tests</artifactId> - <version>1.0.400-SNAPSHOT</version> + <version>1.0.401-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/META-INF/MANIFEST.MF index fa6912895..87eac5d2c 100644 --- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.wst.jsdt.debug.rhino.tests;singleton:=true -Bundle-Version: 1.0.700.qualifier +Bundle-Version: 1.0.701.qualifier Require-Bundle: org.eclipse.core.runtime, org.junit;bundle-version="3.8.2", org.eclipse.wst.jsdt.debug.core, diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/build.properties b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/build.properties index 2a4605cc4..a32d8cc13 100644 --- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/build.properties +++ b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/build.properties @@ -8,8 +8,6 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -source.. = src/ -output.. = bin/ bin.includes = META-INF/,\ .,\ test.xml,\ @@ -17,4 +15,7 @@ bin.includes = META-INF/,\ about.html,\ scripts/,\ OSGI-INF/ -src.includes = about.html +source.. = src/ +output.. = bin/ +src.includes = * +src.excludes = src diff --git a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/pom.xml b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/pom.xml index c49d2fd26..8f0b25334 100644 --- a/tests/org.eclipse.wst.jsdt.debug.rhino.tests/pom.xml +++ b/tests/org.eclipse.wst.jsdt.debug.rhino.tests/pom.xml @@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.jsdt.tests</groupId> <artifactId>org.eclipse.wst.jsdt.debug.rhino.tests</artifactId> - <version>1.0.700-SNAPSHOT</version> + <version>1.0.701-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/tests/org.eclipse.wst.jsdt.js.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.jsdt.js.common.tests/META-INF/MANIFEST.MF index e6abc4fea..efdfe9790 100644 --- a/tests/org.eclipse.wst.jsdt.js.common.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.jsdt.js.common.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JSDT Common JavaScript Tools (npm / bower / gulp / grunt) Unit Test Plugin Bundle-SymbolicName: org.eclipse.wst.jsdt.js.common.tests;singleton:=true -Bundle-Version: 1.0.200.qualifier +Bundle-Version: 1.0.201.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit, org.eclipse.core.runtime, diff --git a/tests/org.eclipse.wst.jsdt.js.common.tests/build.properties b/tests/org.eclipse.wst.jsdt.js.common.tests/build.properties index 990eb12b0..8cc1709b5 100644 --- a/tests/org.eclipse.wst.jsdt.js.common.tests/build.properties +++ b/tests/org.eclipse.wst.jsdt.js.common.tests/build.properties @@ -1,5 +1,7 @@ source.. = src/ output.. = bin/ +src.includes = * +src.excludes = src bin.includes = META-INF/,\ resources/,\ . diff --git a/tests/org.eclipse.wst.jsdt.js.common.tests/pom.xml b/tests/org.eclipse.wst.jsdt.js.common.tests/pom.xml index 8c261fd4e..767612366 100644 --- a/tests/org.eclipse.wst.jsdt.js.common.tests/pom.xml +++ b/tests/org.eclipse.wst.jsdt.js.common.tests/pom.xml @@ -21,7 +21,7 @@ <groupId>org.eclipse.webtools.jsdt.tests</groupId> <artifactId>org.eclipse.wst.jsdt.js.common.tests</artifactId> - <version>1.0.200-SNAPSHOT</version> + <version>1.0.201-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/tests/org.eclipse.wst.jsdt.js.node.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.jsdt.js.node.common.tests/META-INF/MANIFEST.MF index d4f57f306..d00a86dfd 100644 --- a/tests/org.eclipse.wst.jsdt.js.node.common.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.jsdt.js.node.common.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JSDT Node.js Common plugin JUnit tests Bundle-SymbolicName: org.eclipse.wst.jsdt.js.node.common.tests;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.1.qualifier Fragment-Host: org.eclipse.wst.jsdt.js.node.common;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit diff --git a/tests/org.eclipse.wst.jsdt.js.node.common.tests/build.properties b/tests/org.eclipse.wst.jsdt.js.node.common.tests/build.properties index 17daa5b49..c0d21b67e 100644 --- a/tests/org.eclipse.wst.jsdt.js.node.common.tests/build.properties +++ b/tests/org.eclipse.wst.jsdt.js.node.common.tests/build.properties @@ -1,5 +1,7 @@ source.. = src/ output.. = bin/ +src.includes = * +src.excludes = src bin.includes = META-INF/,\ .,\ about.html diff --git a/tests/org.eclipse.wst.jsdt.js.node.common.tests/pom.xml b/tests/org.eclipse.wst.jsdt.js.node.common.tests/pom.xml index 10fa7b3c4..8c83f142e 100644 --- a/tests/org.eclipse.wst.jsdt.js.node.common.tests/pom.xml +++ b/tests/org.eclipse.wst.jsdt.js.node.common.tests/pom.xml @@ -21,7 +21,7 @@ <groupId>org.eclipse.webtools.jsdt.tests</groupId> <artifactId>org.eclipse.wst.jsdt.js.node.common.tests</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/tests/org.eclipse.wst.jsdt.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.jsdt.ui.tests/META-INF/MANIFEST.MF index 8a700828e..e521fc5f6 100644 --- a/tests/org.eclipse.wst.jsdt.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.jsdt.ui.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.jsdt.ui.tests; singleton:=true -Bundle-Version: 1.1.500.qualifier +Bundle-Version: 1.1.501.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", diff --git a/tests/org.eclipse.wst.jsdt.ui.tests/build.properties b/tests/org.eclipse.wst.jsdt.ui.tests/build.properties index a23fd4a9f..783213082 100644 --- a/tests/org.eclipse.wst.jsdt.ui.tests/build.properties +++ b/tests/org.eclipse.wst.jsdt.ui.tests/build.properties @@ -17,4 +17,7 @@ bin.includes = test.xml,\ icons/,\ testresources/ source.. = src/ +output.. = bin/ +src.includes = * +src.excludes = src jars.compile.order = . diff --git a/tests/org.eclipse.wst.jsdt.ui.tests/pom.xml b/tests/org.eclipse.wst.jsdt.ui.tests/pom.xml index 70a274746..9cffe25fd 100644 --- a/tests/org.eclipse.wst.jsdt.ui.tests/pom.xml +++ b/tests/org.eclipse.wst.jsdt.ui.tests/pom.xml @@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.jsdt.tests</groupId> <artifactId>org.eclipse.wst.jsdt.ui.tests</artifactId> - <version>1.1.500-SNAPSHOT</version> + <version>1.1.501-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/tests/pom.xml b/tests/pom.xml index 4a21470f1..ee89e32c2 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -32,7 +32,6 @@ <module>org.eclipse.wst.jsdt.chromium.debug.core.tests</module> <module>org.eclipse.wst.jsdt.js.common.tests</module> <module>org.eclipse.wst.jsdt.js.node.common.tests</module> - <module>org.eclipse.wst.jsdt.integration.tests</module> </modules> <build> <plugins> |