diff options
119 files changed, 765 insertions, 600 deletions
diff --git a/bundles/org.eclipse.jst.jsp.core/pom.xml b/bundles/org.eclipse.jst.jsp.core/pom.xml index 3fe6c69e48..41600169d8 100644 --- a/bundles/org.eclipse.jst.jsp.core/pom.xml +++ b/bundles/org.eclipse.jst.jsp.core/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.jst.jsp.ui/pom.xml b/bundles/org.eclipse.jst.jsp.ui/pom.xml index ea326d6113..d8ef8c11bd 100644 --- a/bundles/org.eclipse.jst.jsp.ui/pom.xml +++ b/bundles/org.eclipse.jst.jsp.ui/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.jst.standard.schemas/pom.xml b/bundles/org.eclipse.jst.standard.schemas/pom.xml index 360294d468..710ee8082d 100644 --- a/bundles/org.eclipse.jst.standard.schemas/pom.xml +++ b/bundles/org.eclipse.jst.standard.schemas/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wst.css.core/pom.xml b/bundles/org.eclipse.wst.css.core/pom.xml index 98c6dc29ba..8bb11b9748 100644 --- a/bundles/org.eclipse.wst.css.core/pom.xml +++ b/bundles/org.eclipse.wst.css.core/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wst.css.ui/pom.xml b/bundles/org.eclipse.wst.css.ui/pom.xml index cce5f66d07..c7473f40cc 100644 --- a/bundles/org.eclipse.wst.css.ui/pom.xml +++ b/bundles/org.eclipse.wst.css.ui/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wst.dtd.core/pom.xml b/bundles/org.eclipse.wst.dtd.core/pom.xml index 4664c99427..929f92a7b1 100644 --- a/bundles/org.eclipse.wst.dtd.core/pom.xml +++ b/bundles/org.eclipse.wst.dtd.core/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wst.dtd.ui/pom.xml b/bundles/org.eclipse.wst.dtd.ui/pom.xml index 6dc19f9470..ae3f5131bd 100644 --- a/bundles/org.eclipse.wst.dtd.ui/pom.xml +++ b/bundles/org.eclipse.wst.dtd.ui/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wst.html.core/pom.xml b/bundles/org.eclipse.wst.html.core/pom.xml index 0c29332597..3e76832e81 100644 --- a/bundles/org.eclipse.wst.html.core/pom.xml +++ b/bundles/org.eclipse.wst.html.core/pom.xml @@ -14,10 +14,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> <groupId>org.eclipse.webtools.sourceediting</groupId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wst.html.ui/pom.xml b/bundles/org.eclipse.wst.html.ui/pom.xml index 88b6c790ca..74379f39b6 100644 --- a/bundles/org.eclipse.wst.html.ui/pom.xml +++ b/bundles/org.eclipse.wst.html.ui/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wst.jsdt.web.core/pom.xml b/bundles/org.eclipse.wst.jsdt.web.core/pom.xml index 6645a5a7ef..d070010b5f 100644 --- a/bundles/org.eclipse.wst.jsdt.web.core/pom.xml +++ b/bundles/org.eclipse.wst.jsdt.web.core/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/pom.xml b/bundles/org.eclipse.wst.jsdt.web.support.jsp/pom.xml index b423cefe63..8bfe861d02 100644 --- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/pom.xml +++ b/bundles/org.eclipse.wst.jsdt.web.support.jsp/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/pom.xml b/bundles/org.eclipse.wst.jsdt.web.ui/pom.xml index 16d8ea7b86..e0379fb190 100644 --- a/bundles/org.eclipse.wst.jsdt.web.ui/pom.xml +++ b/bundles/org.eclipse.wst.jsdt.web.ui/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wst.sse.core/pom.xml b/bundles/org.eclipse.wst.sse.core/pom.xml index 54c50a3d98..620531c367 100644 --- a/bundles/org.eclipse.wst.sse.core/pom.xml +++ b/bundles/org.eclipse.wst.sse.core/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wst.sse.ui/pom.xml b/bundles/org.eclipse.wst.sse.ui/pom.xml index 7adb0cd9d4..190e9f6b12 100644 --- a/bundles/org.eclipse.wst.sse.ui/pom.xml +++ b/bundles/org.eclipse.wst.sse.ui/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wst.standard.schemas/pom.xml b/bundles/org.eclipse.wst.standard.schemas/pom.xml index f8724329e3..b530cc22d9 100644 --- a/bundles/org.eclipse.wst.standard.schemas/pom.xml +++ b/bundles/org.eclipse.wst.standard.schemas/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wst.xml.core/pom.xml b/bundles/org.eclipse.wst.xml.core/pom.xml index e6eb974080..0ffaec791f 100644 --- a/bundles/org.eclipse.wst.xml.core/pom.xml +++ b/bundles/org.eclipse.wst.xml.core/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wst.xml.ui/pom.xml b/bundles/org.eclipse.wst.xml.ui/pom.xml index b26fb87449..3730e26d3a 100644 --- a/bundles/org.eclipse.wst.xml.ui/pom.xml +++ b/bundles/org.eclipse.wst.xml.ui/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wst.xsd.core/pom.xml b/bundles/org.eclipse.wst.xsd.core/pom.xml index 7e4d546a05..211dce32ad 100644 --- a/bundles/org.eclipse.wst.xsd.core/pom.xml +++ b/bundles/org.eclipse.wst.xsd.core/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wst.xsd.ui/pom.xml b/bundles/org.eclipse.wst.xsd.ui/pom.xml index 08f46ca644..eddb669042 100644 --- a/bundles/org.eclipse.wst.xsd.ui/pom.xml +++ b/bundles/org.eclipse.wst.xsd.ui/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wtp.javascript.capabilities/pom.xml b/bundles/org.eclipse.wtp.javascript.capabilities/pom.xml index 8abe2abce6..c6bd8a8215 100644 --- a/bundles/org.eclipse.wtp.javascript.capabilities/pom.xml +++ b/bundles/org.eclipse.wtp.javascript.capabilities/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wtp.web.capabilities/pom.xml b/bundles/org.eclipse.wtp.web.capabilities/pom.xml index 7bacf46a53..c40a00364b 100644 --- a/bundles/org.eclipse.wtp.web.capabilities/pom.xml +++ b/bundles/org.eclipse.wtp.web.capabilities/pom.xml @@ -14,10 +14,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> <groupId>org.eclipse.webtools.sourceediting</groupId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/org.eclipse.wtp.xml.capabilities/pom.xml b/bundles/org.eclipse.wtp.xml.capabilities/pom.xml index 870930e5d3..ad5855da1d 100644 --- a/bundles/org.eclipse.wtp.xml.capabilities/pom.xml +++ b/bundles/org.eclipse.wtp.xml.capabilities/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>bundles</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/bundles/pom.xml b/bundles/pom.xml new file mode 100644 index 0000000000..a12a9d9dbb --- /dev/null +++ b/bundles/pom.xml @@ -0,0 +1,49 @@ +<?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.sourceediting</groupId> + <artifactId>sourceediting-parent</artifactId> + <version>3.6.0-SNAPSHOT</version> + </parent> + + <artifactId>bundles</artifactId> + <packaging>pom</packaging> + + <modules> + <module>org.eclipse.jst.jsp.core</module> + <module>org.eclipse.jst.jsp.ui</module> + <module>org.eclipse.jst.standard.schemas</module> + <module>org.eclipse.wst.css.core</module> + <module>org.eclipse.wst.css.ui</module> + <module>org.eclipse.wst.dtd.core</module> + <module>org.eclipse.wst.dtd.ui</module> + <module>org.eclipse.wst.html.core</module> + <module>org.eclipse.wst.html.ui</module> + <module>org.eclipse.wst.jsdt.web.core</module> + <module>org.eclipse.wst.jsdt.web.support.jsp</module> + <module>org.eclipse.wst.jsdt.web.ui</module> + <module>org.eclipse.wst.sse.core</module> + <module>org.eclipse.wst.sse.ui</module> + <module>org.eclipse.wst.standard.schemas</module> + <module>org.eclipse.wst.xml.core</module> + <module>org.eclipse.wst.xml.ui</module> + <module>org.eclipse.wst.xsd.core</module> + <module>org.eclipse.wst.xsd.ui</module> + <module>org.eclipse.wtp.javascript.capabilities</module> + <module>org.eclipse.wtp.web.capabilities</module> + <module>org.eclipse.wtp.xml.capabilities</module> + </modules> +</project> diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/pom.xml b/docs/org.eclipse.jst.jsp.ui.infopop/pom.xml index 1c05ceb977..1463f27444 100644 --- a/docs/org.eclipse.jst.jsp.ui.infopop/pom.xml +++ b/docs/org.eclipse.jst.jsp.ui.infopop/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>docs</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/docs/org.eclipse.wst.doc.user/pom.xml b/docs/org.eclipse.wst.doc.user/pom.xml index e02b8f31b0..a5a0cfa1b5 100644 --- a/docs/org.eclipse.wst.doc.user/pom.xml +++ b/docs/org.eclipse.wst.doc.user/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>docs</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/pom.xml b/docs/org.eclipse.wst.dtd.ui.infopop/pom.xml index 1d9b327662..00e40518e1 100644 --- a/docs/org.eclipse.wst.dtd.ui.infopop/pom.xml +++ b/docs/org.eclipse.wst.dtd.ui.infopop/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>docs</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/pom.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/pom.xml index 91b4e29b8e..4677992b8c 100644 --- a/docs/org.eclipse.wst.dtdeditor.doc.user/pom.xml +++ b/docs/org.eclipse.wst.dtdeditor.doc.user/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>docs</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/docs/org.eclipse.wst.html.ui.infopop/pom.xml b/docs/org.eclipse.wst.html.ui.infopop/pom.xml index b1da89e8fd..fc898d085e 100644 --- a/docs/org.eclipse.wst.html.ui.infopop/pom.xml +++ b/docs/org.eclipse.wst.html.ui.infopop/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>docs</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/docs/org.eclipse.wst.sse.doc.user/pom.xml b/docs/org.eclipse.wst.sse.doc.user/pom.xml index 81e7027e9f..3f43fb69bd 100644 --- a/docs/org.eclipse.wst.sse.doc.user/pom.xml +++ b/docs/org.eclipse.wst.sse.doc.user/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>docs</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/docs/org.eclipse.wst.sse.ui.infopop/pom.xml b/docs/org.eclipse.wst.sse.ui.infopop/pom.xml index 36c6c9e094..933738f91f 100644 --- a/docs/org.eclipse.wst.sse.ui.infopop/pom.xml +++ b/docs/org.eclipse.wst.sse.ui.infopop/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>docs</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/docs/org.eclipse.wst.webtools.doc.user/pom.xml b/docs/org.eclipse.wst.webtools.doc.user/pom.xml index 8ca2d69495..c130851ed5 100644 --- a/docs/org.eclipse.wst.webtools.doc.user/pom.xml +++ b/docs/org.eclipse.wst.webtools.doc.user/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>docs</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/docs/org.eclipse.wst.xml.ui.infopop/pom.xml b/docs/org.eclipse.wst.xml.ui.infopop/pom.xml index 7dcece2d0f..009f9d9a50 100644 --- a/docs/org.eclipse.wst.xml.ui.infopop/pom.xml +++ b/docs/org.eclipse.wst.xml.ui.infopop/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>docs</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/pom.xml b/docs/org.eclipse.wst.xmleditor.doc.user/pom.xml index a268d1afc1..d33f31b8c9 100644 --- a/docs/org.eclipse.wst.xmleditor.doc.user/pom.xml +++ b/docs/org.eclipse.wst.xmleditor.doc.user/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>docs</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/pom.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/pom.xml index c07898e066..eba300a282 100644 --- a/docs/org.eclipse.wst.xsdeditor.doc.user/pom.xml +++ b/docs/org.eclipse.wst.xsdeditor.doc.user/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>docs</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/docs/pom.xml b/docs/pom.xml new file mode 100644 index 0000000000..46c6309b2b --- /dev/null +++ b/docs/pom.xml @@ -0,0 +1,38 @@ +<?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.sourceediting</groupId> + <artifactId>sourceediting-parent</artifactId> + <version>3.6.0-SNAPSHOT</version> + </parent> + + <artifactId>docs</artifactId> + <packaging>pom</packaging> + + <modules> + <module>org.eclipse.jst.jsp.ui.infopop</module> + <module>org.eclipse.wst.doc.user</module> + <module>org.eclipse.wst.dtdeditor.doc.user</module> + <module>org.eclipse.wst.dtd.ui.infopop</module> + <module>org.eclipse.wst.html.ui.infopop</module> + <module>org.eclipse.wst.sse.doc.user</module> + <module>org.eclipse.wst.sse.ui.infopop</module> + <module>org.eclipse.wst.webtools.doc.user</module> + <module>org.eclipse.wst.xmleditor.doc.user</module> + <module>org.eclipse.wst.xml.ui.infopop</module> + <module>org.eclipse.wst.xsdeditor.doc.user</module> + </modules> +</project> diff --git a/features/org.eclipse.wst.web_core.feature.patch/pom.xml b/features/org.eclipse.wst.web_core.feature.patch/pom.xml index a95d74aa5d..3b8a0d49a1 100644 --- a/features/org.eclipse.wst.web_core.feature.patch/pom.xml +++ b/features/org.eclipse.wst.web_core.feature.patch/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>features</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/features/org.eclipse.wst.web_core.feature/pom.xml b/features/org.eclipse.wst.web_core.feature/pom.xml index 6f94ddacdc..c35c8b6bd9 100644 --- a/features/org.eclipse.wst.web_core.feature/pom.xml +++ b/features/org.eclipse.wst.web_core.feature/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>features</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/features/org.eclipse.wst.web_sdk.feature/pom.xml b/features/org.eclipse.wst.web_sdk.feature/pom.xml index aa29237085..b063677de5 100644 --- a/features/org.eclipse.wst.web_sdk.feature/pom.xml +++ b/features/org.eclipse.wst.web_sdk.feature/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>features</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/features/org.eclipse.wst.web_tests.feature/pom.xml b/features/org.eclipse.wst.web_tests.feature/pom.xml index 23d8f28d2a..379ce0c914 100644 --- a/features/org.eclipse.wst.web_tests.feature/pom.xml +++ b/features/org.eclipse.wst.web_tests.feature/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>features</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/features/org.eclipse.wst.web_ui.feature.patch/pom.xml b/features/org.eclipse.wst.web_ui.feature.patch/pom.xml index b226831b74..5961b474a8 100644 --- a/features/org.eclipse.wst.web_ui.feature.patch/pom.xml +++ b/features/org.eclipse.wst.web_ui.feature.patch/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>features</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/features/org.eclipse.wst.web_ui.feature/pom.xml b/features/org.eclipse.wst.web_ui.feature/pom.xml index 07060f5dce..214f1d5e47 100644 --- a/features/org.eclipse.wst.web_ui.feature/pom.xml +++ b/features/org.eclipse.wst.web_ui.feature/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>features</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/features/org.eclipse.wst.web_userdoc.feature/pom.xml b/features/org.eclipse.wst.web_userdoc.feature/pom.xml index 3a8a272429..c3794d150c 100644 --- a/features/org.eclipse.wst.web_userdoc.feature/pom.xml +++ b/features/org.eclipse.wst.web_userdoc.feature/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>features</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/features/org.eclipse.wst.xml_core.feature/pom.xml b/features/org.eclipse.wst.xml_core.feature/pom.xml index ffeae40f88..7c78addb47 100644 --- a/features/org.eclipse.wst.xml_core.feature/pom.xml +++ b/features/org.eclipse.wst.xml_core.feature/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>features</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/features/org.eclipse.wst.xml_sdk.feature/pom.xml b/features/org.eclipse.wst.xml_sdk.feature/pom.xml index 489f5a95c9..75cb7000a2 100644 --- a/features/org.eclipse.wst.xml_sdk.feature/pom.xml +++ b/features/org.eclipse.wst.xml_sdk.feature/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>features</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/features/org.eclipse.wst.xml_tests.feature/pom.xml b/features/org.eclipse.wst.xml_tests.feature/pom.xml index 72156e69fb..74653d12de 100644 --- a/features/org.eclipse.wst.xml_tests.feature/pom.xml +++ b/features/org.eclipse.wst.xml_tests.feature/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>features</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/features/org.eclipse.wst.xml_ui.feature.patch/pom.xml b/features/org.eclipse.wst.xml_ui.feature.patch/pom.xml index 19f27af472..f95fbe7a3e 100644 --- a/features/org.eclipse.wst.xml_ui.feature.patch/pom.xml +++ b/features/org.eclipse.wst.xml_ui.feature.patch/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>features</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/features/org.eclipse.wst.xml_ui.feature/pom.xml b/features/org.eclipse.wst.xml_ui.feature/pom.xml index 1251c83e71..aee3ac8244 100644 --- a/features/org.eclipse.wst.xml_ui.feature/pom.xml +++ b/features/org.eclipse.wst.xml_ui.feature/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>features</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/features/org.eclipse.wst.xml_userdoc.feature/pom.xml b/features/org.eclipse.wst.xml_userdoc.feature/pom.xml index 93a1e657a3..afed8a97cb 100644 --- a/features/org.eclipse.wst.xml_userdoc.feature/pom.xml +++ b/features/org.eclipse.wst.xml_userdoc.feature/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>features</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/features/pom.xml b/features/pom.xml new file mode 100644 index 0000000000..9ad9290b41 --- /dev/null +++ b/features/pom.xml @@ -0,0 +1,37 @@ +<?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.sourceediting</groupId> + <artifactId>sourceediting-parent</artifactId> + <version>3.6.0-SNAPSHOT</version> + </parent> + + <artifactId>features</artifactId> + <packaging>pom</packaging> + + <modules> + <module>org.eclipse.wst.web_core.feature</module> + <module>org.eclipse.wst.web_sdk.feature</module> + <module>org.eclipse.wst.web_ui.feature</module> + <module>org.eclipse.wst.web_userdoc.feature</module> + <module>org.eclipse.wst.xml_core.feature</module> + <module>org.eclipse.wst.xml_sdk.feature</module> + <module>org.eclipse.wst.xml_ui.feature</module> + <module>org.eclipse.wst.xml_userdoc.feature</module> + <module>org.eclipse.wst.web_tests.feature</module> + <module>org.eclipse.wst.xml_tests.feature</module> + </modules> +</project> @@ -22,7 +22,7 @@ </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting</artifactId> + <artifactId>sourceediting-parent</artifactId> <version>3.6.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -31,74 +31,50 @@ </properties> <modules> - <module>docs/org.eclipse.jst.jsp.ui.infopop</module> - <module>docs/org.eclipse.wst.doc.user</module> - <module>docs/org.eclipse.wst.dtdeditor.doc.user</module> - <module>docs/org.eclipse.wst.dtd.ui.infopop</module> - <module>docs/org.eclipse.wst.html.ui.infopop</module> - <module>docs/org.eclipse.wst.sse.doc.user</module> - <module>docs/org.eclipse.wst.sse.ui.infopop</module> - <module>docs/org.eclipse.wst.webtools.doc.user</module> - <module>docs/org.eclipse.wst.xmleditor.doc.user</module> - <module>docs/org.eclipse.wst.xml.ui.infopop</module> - <module>docs/org.eclipse.wst.xsdeditor.doc.user</module> - - <module>features/org.eclipse.wst.web_core.feature</module> - <module>features/org.eclipse.wst.web_sdk.feature</module> - <module>features/org.eclipse.wst.web_ui.feature</module> - <module>features/org.eclipse.wst.web_userdoc.feature</module> - <module>features/org.eclipse.wst.xml_core.feature</module> - <module>features/org.eclipse.wst.xml_sdk.feature</module> - <module>features/org.eclipse.wst.xml_ui.feature</module> - <module>features/org.eclipse.wst.xml_userdoc.feature</module> - <module>features/org.eclipse.wst.web_tests.feature</module> - <module>features/org.eclipse.wst.xml_tests.feature</module> - - <module>bundles/org.eclipse.jst.jsp.core</module> - <module>bundles/org.eclipse.jst.jsp.ui</module> - <module>bundles/org.eclipse.jst.standard.schemas</module> - <module>bundles/org.eclipse.wst.css.core</module> - <module>bundles/org.eclipse.wst.css.ui</module> - <module>bundles/org.eclipse.wst.dtd.core</module> - <module>bundles/org.eclipse.wst.dtd.ui</module> - <module>bundles/org.eclipse.wst.html.core</module> - <module>bundles/org.eclipse.wst.html.ui</module> - <module>bundles/org.eclipse.wst.jsdt.web.core</module> - <module>bundles/org.eclipse.wst.jsdt.web.support.jsp</module> - <module>bundles/org.eclipse.wst.jsdt.web.ui</module> - <module>bundles/org.eclipse.wst.sse.core</module> - <module>bundles/org.eclipse.wst.sse.ui</module> - <module>bundles/org.eclipse.wst.standard.schemas</module> - <module>bundles/org.eclipse.wst.xml.core</module> - <module>bundles/org.eclipse.wst.xml.ui</module> - <module>bundles/org.eclipse.wst.xsd.core</module> - <module>bundles/org.eclipse.wst.xsd.ui</module> - <module>bundles/org.eclipse.wtp.javascript.capabilities</module> - <module>bundles/org.eclipse.wtp.web.capabilities</module> - <module>bundles/org.eclipse.wtp.xml.capabilities</module> - - <module>tests/org.eclipse.jst.jsp.core.tests</module> - <module>tests/org.eclipse.jst.jsp.tests.encoding</module> - <module>tests/org.eclipse.jst.jsp.ui.tests</module> - <module>tests/org.eclipse.wst.css.core.tests</module> - <module>tests/org.eclipse.wst.css.tests.encoding</module> - <module>tests/org.eclipse.wst.css.ui.tests</module> - <module>tests/org.eclipse.wst.dtd.core.tests</module> - <module>tests/org.eclipse.wst.dtd.ui.tests</module> - <module>tests/org.eclipse.wst.html.core.tests</module> - <module>tests/org.eclipse.wst.html.tests.encoding</module> - <module>tests/org.eclipse.wst.html.ui.tests</module> - <module>tests/org.eclipse.wst.jsdt.web.core.tests</module> - <module>tests/org.eclipse.wst.jsdt.web.ui.tests</module> - <module>tests/org.eclipse.wst.sse.core.tests</module> - <module>tests/org.eclipse.wst.sse.ui.tests</module> - <module>tests/org.eclipse.wst.xml.catalog.tests</module> - <module>tests/org.eclipse.wst.xml.core.tests</module> - <module>tests/org.eclipse.wst.xml.tests.encoding</module> - <module>tests/org.eclipse.wst.xml.ui.tests</module> - <module>tests/org.eclipse.wst.xml.validation.tests</module> - <module>tests/org.eclipse.wst.xsd.core.tests</module> - <module>tests/org.eclipse.wst.xsd.ui.tests</module> - <module>tests/org.eclipse.wst.xsd.validation.tests</module> + <module>bundles</module> + <module>docs</module> + <module>tests</module> + <module>features</module> </modules> + + <profiles> + <profile> + <id>build-individual-bundles</id> + <modules> + <module>site</module> + </modules> + </profile> + </profiles> + + <!-- build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <testFailureIgnore>true</testFailureIgnore> + </configuration> + </plugin> + </plugins> + </build --> + + <repositories> + <!-- Additional dependencies --> + <repository> + <id>org.eclipse.e4.ui-snapshots</id> + <url>http://download.eclipse.org/e4/snapshots/org.eclipse.e4.ui</url> + <layout>p2</layout> + </repository> + <!-- To reference parent pom --> + <repository> + <id>Webtools Repository - Releases</id> + <name>Webtools Repository - Releases</name> + <url>https://repo.eclipse.org/content/repositories/webtools-releases/</url> + </repository> + <repository> + <id>Webtools Repository - Snapshots</id> + <name>Webtools Repository - Snapshots</name> + <url>https://repo.eclipse.org/content/repositories/webtools-snapshots/</url> + </repository> + </repositories> </project> diff --git a/site/category.xml b/site/category.xml new file mode 100644 index 0000000000..36a14e8830 --- /dev/null +++ b/site/category.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<site> + <category-def name="SourceEditing" label="WTP SourceEditing">Editors to efficiently develop XML/HTNML/JSP</category-def> + <feature id="org.eclipse.wst.web_core.feature" version="0.0.0"> + <category name="WST Web Core"/> + </feature> + <feature id="org.eclipse.wst.web_sdk.feature" version="0.0.0"> + <category name="Eclipse Web Developer Tools SDK"/> + </feature> + <feature id="org.eclipse.wst.web_tests.feature" version="0.0.0"> + <category name="WST Web Tests"/> + </feature> + <feature id="org.eclipse.wst.web_ui.feature" version="0.0.0"> + <category name="Eclipse Web Developer Tools"/> + </feature> + <feature id="org.eclipse.wst.web_userdoc.feature" version="0.0.0"> + <category name="Eclipse Web Developer Tools User Documentation"/> + </feature> + <feature id="org.eclipse.wst.xml_core.feature" version="0.0.0"> + <category name="WST XML Core"/> + </feature> + <feature id="org.eclipse.wst.xml_sdk.feature" version="0.0.0"> + <category name="Eclipse XML Editors and Tools SDK"/> + </feature> + <feature id="org.eclipse.wst.xml_tests.feature" version="0.0.0"> + <category name="WST XML Tests"/> + </feature> + <feature id="org.eclipse.wst.xml_ui.feature" version="0.0.0"> + <category name="Eclipse XML Editors and Tools"/> + </feature> + <feature id="org.eclipse.wst.xml_userdoc.feature" version="0.0.0"> + <category name="Eclipse XML Editors and Tools User Documentation"/> + </feature> +</site> diff --git a/site/pom.xml b/site/pom.xml new file mode 100644 index 0000000000..2b3211962b --- /dev/null +++ b/site/pom.xml @@ -0,0 +1,25 @@ +<?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.sourceediting</groupId> + <artifactId>sourceediting-parent</artifactId> + <version>3.6.0-SNAPSHOT</version> + </parent> + + <groupId>org.eclipse.webtools.sourceediting</groupId> + <artifactId>site</artifactId> + <packaging>eclipse-repository</packaging> +</project> diff --git a/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF index aaf224284c..fd94ecb5fd 100644 --- a/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.jsp.core.tests;singleton:=true Bundle-Version: 1.0.900.qualifier -Bundle-ClassPath: jspcoretests.jar Bundle-Activator: org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/tests/org.eclipse.jst.jsp.core.tests/build.properties b/tests/org.eclipse.jst.jsp.core.tests/build.properties index 8167efeffe..5654480295 100644 --- a/tests/org.eclipse.jst.jsp.core.tests/build.properties +++ b/tests/org.eclipse.jst.jsp.core.tests/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2004, 2006 IBM Corporation and others. +# Copyright (c) 2004, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -9,16 +9,14 @@ # IBM Corporation - initial API and implementation ############################################################################### bin.includes = test.xml,\ - jspcoretests.jar,\ + .,\ META-INF/,\ about.html,\ testfiles/,\ plugin.properties,\ src/org/eclipse/jst/jsp/css/core/tests/testfiles/,\ about_files/ -jars.compile.order = jspcoretests.jar -source.jspcoretests.jar = src/ -output.jspcoretests.jar = bin/ +source.. = src/ src.includes = test.xml,\ testfiles/,\ about.html,\ diff --git a/tests/org.eclipse.jst.jsp.core.tests/pom.xml b/tests/org.eclipse.jst.jsp.core.tests/pom.xml index 3b65b441a0..f3aa9e25b6 100644 --- a/tests/org.eclipse.jst.jsp.core.tests/pom.xml +++ b/tests/org.eclipse.jst.jsp.core.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> @@ -32,65 +31,66 @@ <build> <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho.version}</version> - <configuration> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.dtd.core</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.xsd.core</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.standard.schemas</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.jst.standard.schemas</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.pde.core</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>javax.servlet</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>javax.servlet.jsp</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.osgi.compatibility.state</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.update.configurator</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.jst.j2ee.core</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> - </configuration> - </plugin> - </plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.dtd.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.xsd.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.standard.schemas</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jst.standard.schemas</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.pde.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>javax.servlet</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>javax.servlet.jsp</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.osgi.compatibility.state</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.update.configurator</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jst.j2ee.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + </plugins> </build> </project> diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF index 8784ffdc68..6975b145e7 100644 --- a/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.jsp.tests.encoding Bundle-Version: 1.0.500.qualifier -Bundle-ClassPath: jspencodingtests.jar Bundle-Activator: org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties b/tests/org.eclipse.jst.jsp.tests.encoding/build.properties index 42878d2230..4789bc2a25 100644 --- a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties +++ b/tests/org.eclipse.jst.jsp.tests.encoding/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2005, 2006 IBM Corporation and others. +# Copyright (c) 2005, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -8,9 +8,7 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -source.jspencodingtests.jar = src/ -output.jspencodingtests.jar = bin/ -bin.includes = jspencodingtests.jar,\ +bin.includes = .,\ testfiles/,\ test.xml,\ META-INF/,\ @@ -18,3 +16,4 @@ bin.includes = jspencodingtests.jar,\ plugin.properties src.includes = testfiles/,\ test.xml +source.. = src/ diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/pom.xml b/tests/org.eclipse.jst.jsp.tests.encoding/pom.xml index 3eb26a3f39..28988f1482 100644 --- a/tests/org.eclipse.jst.jsp.tests.encoding/pom.xml +++ b/tests/org.eclipse.jst.jsp.tests.encoding/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF index 6d64045267..2114f394ff 100644 --- a/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.jsp.ui.tests; singleton:=true Bundle-Version: 1.0.800.qualifier -Bundle-ClassPath: jspuitests.jar Bundle-Activator: org.eclipse.jst.jsp.ui.tests.JSPUITestsPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/tests/org.eclipse.jst.jsp.ui.tests/build.properties b/tests/org.eclipse.jst.jsp.ui.tests/build.properties index 9739698999..38bf47b922 100644 --- a/tests/org.eclipse.jst.jsp.ui.tests/build.properties +++ b/tests/org.eclipse.jst.jsp.ui.tests/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2004, 2009 IBM Corporation and others. +# Copyright (c) 2004, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -13,14 +13,13 @@ bin.includes = plugin.xml,\ test.xml,\ projecttestfiles/,\ testfiles/,\ - jspuitests.jar,\ + .,\ META-INF/,\ about.html,\ plugin.properties,\ text.tests/,\ jface.text.tests/ -jars.compile.order = jspuitests.jar -source.jspuitests.jar = src/,\ - text.tests/,\ - jface.text.tests/ -output.jspuitests.jar = bin/ +src.includes = test.xml +source.. = src/,\ + text.tests/,\ + jface.text.tests/ diff --git a/tests/org.eclipse.jst.jsp.ui.tests/pom.xml b/tests/org.eclipse.jst.jsp.ui.tests/pom.xml index 6631629233..a75a523204 100644 --- a/tests/org.eclipse.jst.jsp.ui.tests/pom.xml +++ b/tests/org.eclipse.jst.jsp.ui.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> @@ -39,35 +38,43 @@ <configuration> <useUIHarness>true</useUIHarness> <useUIThread>true</useUIThread> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.equinox.event</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.dtd.ui</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.standard.schemas</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <!-- A JSF template proposal is contributed and expected by the unit tests --> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.jst.jsf.ui</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <!-- This is needed after adding the jsf.ui dependency --> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.jst.jee.ejb</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.equinox.event</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.dtd.ui</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.standard.schemas</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <!-- A JSF template proposal is contributed and expected by the unit tests --> + <type>eclipse-plugin</type> + <id>org.eclipse.jst.jsf.ui</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <!-- This is needed after adding the jsf.ui dependency --> + <type>eclipse-plugin</type> + <id>org.eclipse.jst.jee.ejb</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> </configuration> </plugin> </plugins> diff --git a/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF index f2a30c846c..ca91da6080 100644 --- a/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.css.core.tests;singleton:=true Bundle-Version: 1.0.900.qualifier -Bundle-ClassPath: csscoretests.jar Bundle-Activator: org.eclipse.wst.css.core.tests.CSSCoreTestsPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/tests/org.eclipse.wst.css.core.tests/build.properties b/tests/org.eclipse.wst.css.core.tests/build.properties index d5f3897795..e70f99d668 100644 --- a/tests/org.eclipse.wst.css.core.tests/build.properties +++ b/tests/org.eclipse.wst.css.core.tests/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2004, 2006 IBM Corporation and others. +# Copyright (c) 2004, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -9,12 +9,11 @@ # IBM Corporation - initial API and implementation ############################################################################### bin.includes = test.xml,\ - csscoretests.jar,\ + .,\ src/,\ META-INF/,\ about.html,\ plugin.properties,\ testfiles/ -jars.compile.order = csscoretests.jar -source.csscoretests.jar = src/ -output.csscoretests.jar = bin/ +source.. = src/ + diff --git a/tests/org.eclipse.wst.css.core.tests/pom.xml b/tests/org.eclipse.wst.css.core.tests/pom.xml index 7952f0ed7c..c4e0b75042 100644 --- a/tests/org.eclipse.wst.css.core.tests/pom.xml +++ b/tests/org.eclipse.wst.css.core.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF index ec374ccd2f..2ee194d8f1 100644 --- a/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.css.tests.encoding Bundle-Version: 1.0.600.qualifier -Bundle-ClassPath: cssencodingtests.jar Bundle-Activator: org.eclipse.wst.css.tests.encoding.CSSEncodingTestsPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/tests/org.eclipse.wst.css.tests.encoding/build.properties b/tests/org.eclipse.wst.css.tests.encoding/build.properties index 3c69e5174f..1ad1e6dbc0 100644 --- a/tests/org.eclipse.wst.css.tests.encoding/build.properties +++ b/tests/org.eclipse.wst.css.tests.encoding/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2005, 2006 IBM Corporation and others. +# Copyright (c) 2005, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -8,13 +8,11 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -bin.includes = cssencodingtests.jar,\ +bin.includes = .,\ testfiles/,\ test.xml,\ META-INF/,\ about.html,\ plugin.properties -src.includes = cssencodingtests.jar -source.cssencodingtests.jar = src/ -output.cssencodingtests.jar = bin/ -
\ No newline at end of file +source.. = src/ + diff --git a/tests/org.eclipse.wst.css.tests.encoding/pom.xml b/tests/org.eclipse.wst.css.tests.encoding/pom.xml index ca75dc8316..12c3c2f7ac 100644 --- a/tests/org.eclipse.wst.css.tests.encoding/pom.xml +++ b/tests/org.eclipse.wst.css.tests.encoding/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF index 59141b414f..d672c92949 100644 --- a/tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF @@ -21,6 +21,5 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.resources, org.eclipse.ui.ide Eclipse-LazyStart: true -Bundle-ClassPath: cssuitests.jar Bundle-RequiredExecutionEnvironment: J2SE-1.4 Import-Package: org.eclipse.core.resources diff --git a/tests/org.eclipse.wst.css.ui.tests/build.properties b/tests/org.eclipse.wst.css.ui.tests/build.properties index 841a8852cb..d5652149ce 100644 --- a/tests/org.eclipse.wst.css.ui.tests/build.properties +++ b/tests/org.eclipse.wst.css.ui.tests/build.properties @@ -1,11 +1,19 @@ +############################################################################### +# Copyright (c) 2005, 2015 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### bin.includes = META-INF/,\ - cssuitests.jar,\ + .,\ about.html,\ src/,\ test.xml,\ testresources/,\ plugin.properties,\ plugin.xml -jars.compile.order = cssuitests.jar -source.cssuitests.jar = src/ -output.cssuitests.jar = bin/ +source.. = src/ diff --git a/tests/org.eclipse.wst.css.ui.tests/pom.xml b/tests/org.eclipse.wst.css.ui.tests/pom.xml index 64feceb812..b27db032e1 100644 --- a/tests/org.eclipse.wst.css.ui.tests/pom.xml +++ b/tests/org.eclipse.wst.css.ui.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/tests/org.eclipse.wst.dtd.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.dtd.core.tests/META-INF/MANIFEST.MF index a163154619..76237ac3ea 100644 --- a/tests/org.eclipse.wst.dtd.core.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.dtd.core.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.dtd.core.tests;singleton:=true Bundle-Version: 1.0.300.qualifier -Bundle-ClassPath: dtdcoretests.jar Bundle-Activator: org.eclipse.wst.dtd.core.tests.internal.DTDCoreTestsPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/tests/org.eclipse.wst.dtd.core.tests/build.properties b/tests/org.eclipse.wst.dtd.core.tests/build.properties index d4984f13eb..4de0f2a07b 100644 --- a/tests/org.eclipse.wst.dtd.core.tests/build.properties +++ b/tests/org.eclipse.wst.dtd.core.tests/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2008 IBM Corporation and others. +# Copyright (c) 2008, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -8,12 +8,11 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -source.dtdcoretests.jar = src/ -output.dtdcoretests.jar = bin/ -bin.includes = dtdcoretests.jar,\ +bin.includes = .,\ resources/,\ test.xml,\ META-INF/,\ about.html,\ plugin.properties +source.. = src/ diff --git a/tests/org.eclipse.wst.dtd.core.tests/pom.xml b/tests/org.eclipse.wst.dtd.core.tests/pom.xml index 0f7409ad78..5e44af1b3b 100644 --- a/tests/org.eclipse.wst.dtd.core.tests/pom.xml +++ b/tests/org.eclipse.wst.dtd.core.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF index 34a6967706..3f535dd2c4 100644 --- a/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.dtd.ui.tests;singleton:=true Bundle-Version: 1.0.600.qualifier -Bundle-ClassPath: dtduitests.jar Bundle-Activator: org.eclipse.wst.dtd.ui.tests.internal.DTDUITestsPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/tests/org.eclipse.wst.dtd.ui.tests/build.properties b/tests/org.eclipse.wst.dtd.ui.tests/build.properties index 2d246a2a5e..b14c8cddcf 100644 --- a/tests/org.eclipse.wst.dtd.ui.tests/build.properties +++ b/tests/org.eclipse.wst.dtd.ui.tests/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2005, 2006 IBM Corporation and others. +# Copyright (c) 2005, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -8,13 +8,12 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -source.dtduitests.jar = src/ -output.dtduitests.jar = bin/ -bin.includes = dtduitests.jar,\ +bin.includes = .,\ test.xml,\ META-INF/,\ about.html,\ plugin.properties,\ testresources/,\ plugin.xml +source.. = src/ diff --git a/tests/org.eclipse.wst.dtd.ui.tests/pom.xml b/tests/org.eclipse.wst.dtd.ui.tests/pom.xml index 0427524626..55c7fab152 100644 --- a/tests/org.eclipse.wst.dtd.ui.tests/pom.xml +++ b/tests/org.eclipse.wst.dtd.ui.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF index 6951840282..788d94ab22 100644 --- a/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.html.core.tests;singleton:=true Bundle-Version: 1.0.900.qualifier -Bundle-ClassPath: htmlcoretests.jar Bundle-Activator: org.eclipse.wst.html.core.tests.HTMLCoreTestsPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/tests/org.eclipse.wst.html.core.tests/build.properties b/tests/org.eclipse.wst.html.core.tests/build.properties index 20e12f7d35..4f1cab00fc 100644 --- a/tests/org.eclipse.wst.html.core.tests/build.properties +++ b/tests/org.eclipse.wst.html.core.tests/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2004, 2005 IBM Corporation and others. +# Copyright (c) 2004, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -8,12 +8,11 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -source.htmlcoretests.jar = src/ -output.htmlcoretests.jar = bin/ -bin.includes = htmlcoretests.jar,\ +bin.includes = .,\ test.xml,\ ParserResults2004-12-10-22-23-47/,\ META-INF/,\ about.html,\ plugin.properties,\ testresources/ +source.. = src/ diff --git a/tests/org.eclipse.wst.html.core.tests/pom.xml b/tests/org.eclipse.wst.html.core.tests/pom.xml index c05efecd3a..637d88a7b6 100644 --- a/tests/org.eclipse.wst.html.core.tests/pom.xml +++ b/tests/org.eclipse.wst.html.core.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> @@ -34,16 +33,17 @@ <plugins> <plugin> <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho.version}</version> + <artifactId>target-platform-configuration</artifactId> <configuration> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.dtd.core</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.dtd.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> </configuration> </plugin> </plugins> diff --git a/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF index 4d31f22368..03f44a3ab9 100644 --- a/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.html.tests.encoding Bundle-Version: 1.0.500.qualifier -Bundle-ClassPath: htmlencodingtests.jar Bundle-Activator: org.eclipse.wst.html.tests.encoding.HTMLEncodingTestsPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/tests/org.eclipse.wst.html.tests.encoding/build.properties b/tests/org.eclipse.wst.html.tests.encoding/build.properties index 5d9a3eb973..ec86045a01 100644 --- a/tests/org.eclipse.wst.html.tests.encoding/build.properties +++ b/tests/org.eclipse.wst.html.tests.encoding/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2005, 2006 IBM Corporation and others. +# Copyright (c) 2005, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -8,12 +8,10 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -source.htmlencodingtests.jar = src/ -output.htmlencodingtests.jar = bin/ -bin.includes = htmlencodingtests.jar,\ +bin.includes = .,\ testfiles/,\ test.xml,\ META-INF/,\ about.html,\ plugin.properties - +source.. = src/ diff --git a/tests/org.eclipse.wst.html.tests.encoding/pom.xml b/tests/org.eclipse.wst.html.tests.encoding/pom.xml index 9ba04db991..d18c2a8312 100644 --- a/tests/org.eclipse.wst.html.tests.encoding/pom.xml +++ b/tests/org.eclipse.wst.html.tests.encoding/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF index 63c22c8a03..42d1f67bce 100644 --- a/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.html.ui.tests; singleton:=true Bundle-Version: 1.0.600.qualifier -Bundle-ClassPath: htmluitests.jar Bundle-Activator: org.eclipse.wst.html.ui.tests.HTMLUITestsPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/tests/org.eclipse.wst.html.ui.tests/build.properties b/tests/org.eclipse.wst.html.ui.tests/build.properties index bc8c81a527..c619ca2dc2 100644 --- a/tests/org.eclipse.wst.html.ui.tests/build.properties +++ b/tests/org.eclipse.wst.html.ui.tests/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2004, 2006 IBM Corporation and others. +# Copyright (c) 2004, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -10,12 +10,10 @@ ############################################################################### bin.includes = plugin.xml,\ test.xml,\ - htmluitests.jar,\ + .,\ META-INF/,\ about.html,\ icons/,\ plugin.properties,\ testresources/ -jars.compile.order = htmluitests.jar -source.htmluitests.jar = src/ -output.htmluitests.jar = bin/ +source.. = src/ diff --git a/tests/org.eclipse.wst.html.ui.tests/pom.xml b/tests/org.eclipse.wst.html.ui.tests/pom.xml index e428d3a95e..da5c6b7676 100644 --- a/tests/org.eclipse.wst.html.ui.tests/pom.xml +++ b/tests/org.eclipse.wst.html.ui.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/tests/org.eclipse.wst.jsdt.web.core.tests/pom.xml b/tests/org.eclipse.wst.jsdt.web.core.tests/pom.xml index a2b85e47dc..f0d07e2111 100644 --- a/tests/org.eclipse.wst.jsdt.web.core.tests/pom.xml +++ b/tests/org.eclipse.wst.jsdt.web.core.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> @@ -34,16 +33,17 @@ <plugins> <plugin> <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho.version}</version> + <artifactId>target-platform-configuration</artifactId> <configuration> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.jst.jsp.core</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jst.jsp.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> </configuration> </plugin> </plugins> diff --git a/tests/org.eclipse.wst.jsdt.web.ui.tests/pom.xml b/tests/org.eclipse.wst.jsdt.web.ui.tests/pom.xml index cb95af712f..736e27c325 100644 --- a/tests/org.eclipse.wst.jsdt.web.ui.tests/pom.xml +++ b/tests/org.eclipse.wst.jsdt.web.ui.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> @@ -39,23 +38,31 @@ <configuration> <useUIHarness>true</useUIHarness> <useUIThread>true</useUIThread> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.equinox.event</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.jst.jsp.core</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>com.ibm.icu</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.equinox.event</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jst.jsp.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>com.ibm.icu</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> </configuration> </plugin> </plugins> diff --git a/tests/org.eclipse.wst.sse.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.sse.core.tests/META-INF/MANIFEST.MF index f1079ae0e9..f9bad8df8a 100644 --- a/tests/org.eclipse.wst.sse.core.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.sse.core.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.sse.core.tests Bundle-Version: 1.0.601.qualifier -Bundle-ClassPath: ssemodeltests.jar Bundle-Activator: org.eclipse.wst.sse.core.tests.SSEModelTestsPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/tests/org.eclipse.wst.sse.core.tests/build.properties b/tests/org.eclipse.wst.sse.core.tests/build.properties index 885af09575..f1b5be0c42 100644 --- a/tests/org.eclipse.wst.sse.core.tests/build.properties +++ b/tests/org.eclipse.wst.sse.core.tests/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2004, 2006 IBM Corporation and others. +# Copyright (c) 2004, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -8,11 +8,10 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -bin.includes = ssemodeltests.jar,\ +bin.includes = .,\ test.xml,\ META-INF/,\ about.html,\ plugin.properties,\ resources/ -source.ssemodeltests.jar = src/ -output.ssemodeltests.jar = bin/ +source.. = src/ diff --git a/tests/org.eclipse.wst.sse.core.tests/pom.xml b/tests/org.eclipse.wst.sse.core.tests/pom.xml index c9ed811622..7fb6b4bb85 100644 --- a/tests/org.eclipse.wst.sse.core.tests/pom.xml +++ b/tests/org.eclipse.wst.sse.core.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> @@ -34,16 +33,17 @@ <plugins> <plugin> <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho.version}</version> + <artifactId>target-platform-configuration</artifactId> <configuration> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.xml.core</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.xml.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> </configuration> </plugin> </plugins> diff --git a/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF index ead9cb7297..b8e4dcc839 100644 --- a/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.sse.ui.tests; singleton:=true Bundle-Version: 1.0.600.qualifier -Bundle-ClassPath: sseeditortests.jar Bundle-Activator: org.eclipse.wst.sse.ui.tests.SSETestsPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/tests/org.eclipse.wst.sse.ui.tests/build.properties b/tests/org.eclipse.wst.sse.ui.tests/build.properties index 4292fe37d7..481962c66e 100644 --- a/tests/org.eclipse.wst.sse.ui.tests/build.properties +++ b/tests/org.eclipse.wst.sse.ui.tests/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2004, 2009 IBM Corporation and others. +# Copyright (c) 2004, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -8,13 +8,13 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -source.sseeditortests.jar = src/,\ - jface.text.tests/,\ - text.tests/ -output.sseeditortests.jar = bin/ bin.includes = plugin.xml,\ - sseeditortests.jar,\ + .,\ test.xml,\ META-INF/,\ about.html,\ plugin.properties +src.includes = test.xml +source.. = src/,\ + text.tests/,\ + jface.text.tests/ diff --git a/tests/org.eclipse.wst.sse.ui.tests/pom.xml b/tests/org.eclipse.wst.sse.ui.tests/pom.xml index 4204e9063b..713cfc844f 100644 --- a/tests/org.eclipse.wst.sse.ui.tests/pom.xml +++ b/tests/org.eclipse.wst.sse.ui.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> @@ -39,23 +38,31 @@ <configuration> <useUIHarness>true</useUIHarness> <useUIThread>true</useUIThread> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.equinox.event</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.xml.core</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.xml.ui</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.equinox.event</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.xml.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.xml.ui</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> </configuration> </plugin> </plugins> diff --git a/tests/org.eclipse.wst.xml.catalog.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.catalog.tests/META-INF/MANIFEST.MF index 686b1858a1..670d731299 100644 --- a/tests/org.eclipse.wst.xml.catalog.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.xml.catalog.tests/META-INF/MANIFEST.MF @@ -15,5 +15,4 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.xsd, org.eclipse.wst.common.uriresolver Bundle-ActivationPolicy: lazy -Bundle-ClassPath: catalogtests.jar Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/tests/org.eclipse.wst.xml.catalog.tests/build.properties b/tests/org.eclipse.wst.xml.catalog.tests/build.properties index 39ddc13944..9ed779409f 100644 --- a/tests/org.eclipse.wst.xml.catalog.tests/build.properties +++ b/tests/org.eclipse.wst.xml.catalog.tests/build.properties @@ -1,10 +1,18 @@ -source.catalogtests.jar = src/ -output.catalogtests.jar = bin/ +############################################################################### +# Copyright (c) 2004, 2015 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### bin.includes = data/,\ plugin.xml,\ test.xml,\ META-INF/,\ - catalogtests.jar,\ + .,\ about.html,\ plugin.properties - +source.. = src/ diff --git a/tests/org.eclipse.wst.xml.catalog.tests/pom.xml b/tests/org.eclipse.wst.xml.catalog.tests/pom.xml index 5ee1ddd7ed..64e7a13466 100644 --- a/tests/org.eclipse.wst.xml.catalog.tests/pom.xml +++ b/tests/org.eclipse.wst.xml.catalog.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF index 07ace5a7c4..b76bd29b18 100644 --- a/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.xml.core.tests; singleton:=true Bundle-Version: 1.0.800.qualifier -Bundle-ClassPath: ssemodelxmltests.jar Bundle-Activator: org.eclipse.wst.xml.core.tests.SSEModelXMLTestsPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/tests/org.eclipse.wst.xml.core.tests/build.properties b/tests/org.eclipse.wst.xml.core.tests/build.properties index e1f4a55700..0b672def4a 100644 --- a/tests/org.eclipse.wst.xml.core.tests/build.properties +++ b/tests/org.eclipse.wst.xml.core.tests/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2004, 2005 IBM Corporation and others. +# Copyright (c) 2004, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -8,13 +8,12 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -source.ssemodelxmltests.jar = src/ -output.ssemodelxmltests.jar = bin/ bin.includes = plugin.xml,\ - ssemodelxmltests.jar,\ + .,\ test.xml,\ testfiles.zip,\ projecttestfiles/,\ META-INF/,\ about.html,\ plugin.properties +source.. = src/ diff --git a/tests/org.eclipse.wst.xml.core.tests/pom.xml b/tests/org.eclipse.wst.xml.core.tests/pom.xml index 06c3bb7894..719d2c2d97 100644 --- a/tests/org.eclipse.wst.xml.core.tests/pom.xml +++ b/tests/org.eclipse.wst.xml.core.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> @@ -34,36 +33,37 @@ <plugins> <plugin> <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho.version}</version> + <artifactId>target-platform-configuration</artifactId> <configuration> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.jdt.core</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.dtd.core</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.xsd.core</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.standard.schemas</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.jst.standard.schemas</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jdt.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.dtd.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.xsd.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.standard.schemas</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jst.standard.schemas</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> </configuration> </plugin> </plugins> diff --git a/tests/org.eclipse.wst.xml.tests.encoding/.classpath b/tests/org.eclipse.wst.xml.tests.encoding/.classpath index 76c602712b..3019948a0b 100644 --- a/tests/org.eclipse.wst.xml.tests.encoding/.classpath +++ b/tests/org.eclipse.wst.xml.tests.encoding/.classpath @@ -5,6 +5,7 @@ <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con"> <accessrules> <accessrule kind="accessible" pattern="org/eclipse/wst/**"/> + <accessrule kind="accessible" pattern="org/eclipse/jst/**"/> </accessrules> </classpathentry> <classpathentry kind="output" path="bin"/> diff --git a/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF index 1970af3cfc..f6e92c31be 100644 --- a/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.xml.tests.encoding Bundle-Version: 1.0.600.qualifier -Bundle-ClassPath: tests.jar Bundle-Activator: org.eclipse.wst.xml.tests.encoding.TestsPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/tests/org.eclipse.wst.xml.tests.encoding/build.properties b/tests/org.eclipse.wst.xml.tests.encoding/build.properties index 8d554ab967..789f0a3229 100644 --- a/tests/org.eclipse.wst.xml.tests.encoding/build.properties +++ b/tests/org.eclipse.wst.xml.tests.encoding/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2004, 2006 IBM Corporation and others. +# Copyright (c) 2004, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -8,12 +8,14 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -bin.includes = tests.jar,\ +bin.includes = .,\ testfiles/,\ testfiles.zip,\ test.xml,\ META-INF/,\ about.html,\ plugin.properties -source.tests.jar = src/ -output.tests.jar = bin/ +source.. = src/ +src.includes = testfiles/,\ + test.xml + diff --git a/tests/org.eclipse.wst.xml.tests.encoding/pom.xml b/tests/org.eclipse.wst.xml.tests.encoding/pom.xml index c67b4a88b8..6b7b663555 100644 --- a/tests/org.eclipse.wst.xml.tests.encoding/pom.xml +++ b/tests/org.eclipse.wst.xml.tests.encoding/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> @@ -32,30 +31,31 @@ <build> <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho.version}</version> - <configuration> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.jdt.core</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.jst.jsp.core</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>com.ibm.icu</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> - </configuration> - </plugin> - </plugins> - </build> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jdt.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jst.jsp.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>com.ibm.icu</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF index ad64b0939a..fd7c535a29 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.xml.ui.tests; singleton:=true Bundle-Version: 1.0.700.qualifier -Bundle-ClassPath: xmluitests.jar Bundle-Activator: org.eclipse.wst.xml.ui.tests.XMLUITestsPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/tests/org.eclipse.wst.xml.ui.tests/build.properties b/tests/org.eclipse.wst.xml.ui.tests/build.properties index 4d50253652..4ed74258ee 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/build.properties +++ b/tests/org.eclipse.wst.xml.ui.tests/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2004, 2006 IBM Corporation and others. +# Copyright (c) 2004, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -10,12 +10,10 @@ ############################################################################### bin.includes = plugin.xml,\ test.xml,\ - xmluitests.jar,\ + .,\ META-INF/,\ plugin.properties,\ about.html,\ testresources/,\ icons/ -jars.compile.order = xmluitests.jar -source.xmluitests.jar = src/ -output.xmluitests.jar = bin/ +source.. = src/ diff --git a/tests/org.eclipse.wst.xml.ui.tests/pom.xml b/tests/org.eclipse.wst.xml.ui.tests/pom.xml index 937cbba8f8..7dcdb0f77e 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/pom.xml +++ b/tests/org.eclipse.wst.xml.ui.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> @@ -39,43 +38,51 @@ <configuration> <useUIHarness>true</useUIHarness> <useUIThread>true</useUIThread> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.equinox.event</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.dtd.core</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.dtd.ui</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.xsd.core</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.xsd.ui</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.jst.jsp.core</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.jst.jsp.ui</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.equinox.event</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.dtd.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.dtd.ui</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.xsd.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.xsd.ui</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jst.jsp.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jst.jsp.ui</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> </configuration> </plugin> </plugins> diff --git a/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF index bb27781af1..e3cd5f0ae8 100644 --- a/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.xml.validation.tests Bundle-Version: 1.0.601.qualifier -Bundle-ClassPath: validatexmltests.jar Bundle-Activator: org.eclipse.wst.xml.validation.tests.internal.XMLValidatorTestsPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/tests/org.eclipse.wst.xml.validation.tests/build.properties b/tests/org.eclipse.wst.xml.validation.tests/build.properties index 70b0b164d0..6052d7f474 100644 --- a/tests/org.eclipse.wst.xml.validation.tests/build.properties +++ b/tests/org.eclipse.wst.xml.validation.tests/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2005, 2006 IBM Corporation and others. +# Copyright (c) 2005, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -10,9 +10,8 @@ ############################################################################### bin.includes = test.xml,\ testresources/,\ - validatexmltests.jar,\ + .,\ META-INF/,\ about.html,\ plugin.properties -source.validatexmltests.jar = src/ -bin.excludes = testresources/.cvsignore +source.. = src/ diff --git a/tests/org.eclipse.wst.xml.validation.tests/pom.xml b/tests/org.eclipse.wst.xml.validation.tests/pom.xml index dda945b87c..d11ab67964 100644 --- a/tests/org.eclipse.wst.xml.validation.tests/pom.xml +++ b/tests/org.eclipse.wst.xml.validation.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> @@ -34,26 +33,27 @@ <plugins> <plugin> <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho.version}</version> + <artifactId>target-platform-configuration</artifactId> <configuration> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.jst.standard.schemas</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.xsd.core</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>com.ibm.icu</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jst.standard.schemas</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.xsd.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>com.ibm.icu</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> </configuration> </plugin> </plugins> diff --git a/tests/org.eclipse.wst.xsd.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsd.core.tests/META-INF/MANIFEST.MF index 7c542d7ebb..b021d5f0b9 100644 --- a/tests/org.eclipse.wst.xsd.core.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.xsd.core.tests/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Localization: plugin Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.xsd.core.tests Bundle-Version: 1.0.600.qualifier -Bundle-ClassPath: xsdcoretests.jar Bundle-Activator: org.eclipse.wst.xsd.core.tests.internal.XSDCoreTestsPlugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", diff --git a/tests/org.eclipse.wst.xsd.core.tests/build.properties b/tests/org.eclipse.wst.xsd.core.tests/build.properties index 26df8139c5..7655204e69 100644 --- a/tests/org.eclipse.wst.xsd.core.tests/build.properties +++ b/tests/org.eclipse.wst.xsd.core.tests/build.properties @@ -1,8 +1,17 @@ +############################################################################### +# Copyright (c) 2008, 2015 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### bin.includes = META-INF/,\ - xsdcoretests.jar,\ + .,\ plugin.properties,\ about.html,\ testresources/,\ test.xml -source.xsdcoretests.jar = src/ -output.xsdcoretests.jar = bin/ +source.. = src/ diff --git a/tests/org.eclipse.wst.xsd.core.tests/pom.xml b/tests/org.eclipse.wst.xsd.core.tests/pom.xml index 6f73270383..76d7f8d8bd 100644 --- a/tests/org.eclipse.wst.xsd.core.tests/pom.xml +++ b/tests/org.eclipse.wst.xsd.core.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> @@ -34,21 +33,22 @@ <plugins> <plugin> <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho.version}</version> + <artifactId>target-platform-configuration</artifactId> <configuration> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.standard.schemas</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.jst.standard.schemas</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.wst.standard.schemas</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jst.standard.schemas</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> </configuration> </plugin> </plugins> diff --git a/tests/org.eclipse.wst.xsd.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsd.ui.tests/META-INF/MANIFEST.MF index 199e55e349..f43e242ebb 100644 --- a/tests/org.eclipse.wst.xsd.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.xsd.ui.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.xsd.ui.tests Bundle-Version: 1.0.100.qualifier -Bundle-ClassPath: xsduitests.jar Bundle-Activator: org.eclipse.wst.xsd.ui.tests.Activator Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", diff --git a/tests/org.eclipse.wst.xsd.ui.tests/build.properties b/tests/org.eclipse.wst.xsd.ui.tests/build.properties index 9d56d8d2ae..2d644af024 100644 --- a/tests/org.eclipse.wst.xsd.ui.tests/build.properties +++ b/tests/org.eclipse.wst.xsd.ui.tests/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2008 IBM Corporation and others. +# Copyright (c) 2008, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -13,9 +13,6 @@ bin.includes = META-INF/,\ testresources/,\ plugin.properties,\ test.xml,\ - xsduitests.jar,\ + .,\ about.html -jars.compile.order = xsduitests.jar -source.xsduitests.jar = src/ -output.xsduitests.jar = bin/ - +source.. = src/ diff --git a/tests/org.eclipse.wst.xsd.ui.tests/pom.xml b/tests/org.eclipse.wst.xsd.ui.tests/pom.xml index 8ca65b6e45..4ed89f5845 100644 --- a/tests/org.eclipse.wst.xsd.ui.tests/pom.xml +++ b/tests/org.eclipse.wst.xsd.ui.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF index 30faa1c1be..045cda9c82 100644 --- a/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.xsd.validation.tests Bundle-Version: 1.0.501.qualifier -Bundle-ClassPath: validatexsdtests.jar Bundle-Activator: org.eclipse.wst.xsd.validation.tests.internal.XSDValidationTestsPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/tests/org.eclipse.wst.xsd.validation.tests/build.properties b/tests/org.eclipse.wst.xsd.validation.tests/build.properties index c6cfeaf731..0fb253b2ec 100644 --- a/tests/org.eclipse.wst.xsd.validation.tests/build.properties +++ b/tests/org.eclipse.wst.xsd.validation.tests/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2005, 2006 IBM Corporation and others. +# Copyright (c) 2005, 2015 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -8,10 +8,10 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -bin.includes = validatexsdtests.jar,\ +bin.includes = .,\ test.xml,\ testresources/,\ META-INF/,\ about.html,\ plugin.properties -source.validatexsdtests.jar = src/ +source.. = src/ diff --git a/tests/org.eclipse.wst.xsd.validation.tests/pom.xml b/tests/org.eclipse.wst.xsd.validation.tests/pom.xml index 8ca3c4080f..f0f818d447 100644 --- a/tests/org.eclipse.wst.xsd.validation.tests/pom.xml +++ b/tests/org.eclipse.wst.xsd.validation.tests/pom.xml @@ -15,9 +15,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.webtools.sourceediting</groupId> - <artifactId>org.eclipse.webtools.sourceediting.tests</artifactId> + <artifactId>tests</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../</relativePath> </parent> <groupId>org.eclipse.webtools.sourceediting</groupId> diff --git a/tests/pom.xml b/tests/pom.xml new file mode 100644 index 0000000000..99f5ea4e56 --- /dev/null +++ b/tests/pom.xml @@ -0,0 +1,50 @@ +<?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.sourceediting</groupId> + <artifactId>sourceediting-parent</artifactId> + <version>3.6.0-SNAPSHOT</version> + </parent> + + <artifactId>tests</artifactId> + <packaging>pom</packaging> + + <modules> + <module>org.eclipse.jst.jsp.core.tests</module> + <module>org.eclipse.jst.jsp.tests.encoding</module> + <module>org.eclipse.jst.jsp.ui.tests</module> + <module>org.eclipse.wst.css.core.tests</module> + <module>org.eclipse.wst.css.tests.encoding</module> + <module>org.eclipse.wst.css.ui.tests</module> + <module>org.eclipse.wst.dtd.core.tests</module> + <module>org.eclipse.wst.dtd.ui.tests</module> + <module>org.eclipse.wst.html.core.tests</module> + <module>org.eclipse.wst.html.tests.encoding</module> + <module>org.eclipse.wst.html.ui.tests</module> + <module>org.eclipse.wst.jsdt.web.core.tests</module> + <module>org.eclipse.wst.jsdt.web.ui.tests</module> + <module>org.eclipse.wst.sse.core.tests</module> + <module>org.eclipse.wst.sse.ui.tests</module> + <module>org.eclipse.wst.xml.catalog.tests</module> + <module>org.eclipse.wst.xml.core.tests</module> + <module>org.eclipse.wst.xml.tests.encoding</module> + <module>org.eclipse.wst.xml.ui.tests</module> + <module>org.eclipse.wst.xml.validation.tests</module> + <module>org.eclipse.wst.xsd.core.tests</module> + <module>org.eclipse.wst.xsd.ui.tests</module> + <module>org.eclipse.wst.xsd.validation.tests</module> + </modules> +</project> |