summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornickboldt2018-02-28 17:23:45 -0500
committernickboldt2018-03-01 17:10:40 -0500
commitec818afc1cec38bd51a7db2525fc85b909d002f8 (patch)
tree07ecb516cdf3f038eece27d8c411b3eff890bc7f
parenteb26d435fc7292c25f383e4e31239cd0026da7f8 (diff)
downloadwebtools.dali-ec818afc1cec38bd51a7db2525fc85b909d002f8.tar.gz
webtools.dali-ec818afc1cec38bd51a7db2525fc85b909d002f8.tar.xz
webtools.dali-ec818afc1cec38bd51a7db2525fc85b909d002f8.zip
Bug 531425 - add sources/tests/docs/features missing from dali update site;
move jpa_diagram_editor/development/ projects to jpa_diagram_editor/DEPRECATED/ as they're no longer required; reorg update site; add missing tests; remove branding.source plugins; remove org.eclipse.jpt.assembly.feature.source remove jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests since it fails to compile remove org.eclipse.jpt.jpa.gen.tests Signed-off-by: nickboldt <nboldt@redhat.com>
-rw-r--r--assembly/features/org.eclipse.jpt.assembly.feature/feature.xml43
-rw-r--r--assembly/features/org.eclipse.jpt.assembly.feature/pom.xml2
-rw-r--r--assembly/features/org.eclipse.jpt.tests.assembly.feature/feature.xml36
-rw-r--r--assembly/features/org.eclipse.jpt.tests.assembly.feature/pom.xml2
-rw-r--r--assembly/features/org.eclipse.jpt_sdk.assembly.feature/feature.xml44
-rw-r--r--assembly/features/org.eclipse.jpt_sdk.assembly.feature/pom.xml2
-rw-r--r--common/features/org.eclipse.jpt.common.eclipselink_sdk.feature/feature.xml12
-rw-r--r--common/features/org.eclipse.jpt.common.eclipselink_sdk.feature/pom.xml2
-rw-r--r--common/features/org.eclipse.jpt.common_sdk.feature/feature.xml13
-rw-r--r--common/features/org.eclipse.jpt.common_sdk.feature/pom.xml2
-rw-r--r--common/plugins/org.eclipse.jpt.common.branding/META-INF/MANIFEST.MF2
-rw-r--r--common/plugins/org.eclipse.jpt.common.branding/build.properties4
-rw-r--r--common/plugins/org.eclipse.jpt.common.branding/pom.xml2
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF2
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/build.properties2
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/pom.xml2
-rw-r--r--common/plugins/org.eclipse.jpt.common.eclipselink.branding/META-INF/MANIFEST.MF2
-rw-r--r--common/plugins/org.eclipse.jpt.common.eclipselink.branding/build.properties4
-rw-r--r--common/plugins/org.eclipse.jpt.common.eclipselink.branding/pom.xml2
-rw-r--r--common/plugins/org.eclipse.jpt.common.eclipselink.core/META-INF/MANIFEST.MF2
-rw-r--r--common/plugins/org.eclipse.jpt.common.eclipselink.core/build.properties3
-rw-r--r--common/plugins/org.eclipse.jpt.common.eclipselink.core/pom.xml2
-rw-r--r--common/plugins/org.eclipse.jpt.common.ui/META-INF/MANIFEST.MF2
-rw-r--r--common/plugins/org.eclipse.jpt.common.ui/build.properties2
-rw-r--r--common/plugins/org.eclipse.jpt.common.ui/pom.xml2
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/META-INF/MANIFEST.MF2
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/build.properties2
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/pom.xml2
-rw-r--r--common/tests/org.eclipse.jpt.common.core.tests/META-INF/MANIFEST.MF2
-rw-r--r--common/tests/org.eclipse.jpt.common.core.tests/build.properties2
-rw-r--r--common/tests/org.eclipse.jpt.common.core.tests/pom.xml2
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/META-INF/MANIFEST.MF2
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/build.properties2
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/pom.xml2
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/META-INF/MANIFEST.MF2
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/build.properties2
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/pom.xml2
-rw-r--r--jaxb/features/org.eclipse.jpt.dbws.eclipselink_sdk.feature/feature.xml13
-rw-r--r--jaxb/features/org.eclipse.jpt.dbws.eclipselink_sdk.feature/pom.xml2
-rw-r--r--jaxb/features/org.eclipse.jpt.jaxb.eclipselink_sdk.feature/feature.xml13
-rw-r--r--jaxb/features/org.eclipse.jpt.jaxb.eclipselink_sdk.feature/pom.xml2
-rw-r--r--jaxb/features/org.eclipse.jpt.jaxb_sdk.feature/feature.xml13
-rw-r--r--jaxb/features/org.eclipse.jpt.jaxb_sdk.feature/pom.xml2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.branding/META-INF/MANIFEST.MF2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.branding/build.properties4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.branding/pom.xml2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/META-INF/MANIFEST.MF2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/build.properties2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/pom.xml2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/META-INF/MANIFEST.MF2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/build.properties2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/pom.xml2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.branding/META-INF/MANIFEST.MF2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.branding/build.properties4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.branding/pom.xml2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/META-INF/MANIFEST.MF2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/build.properties2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/pom.xml2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core/META-INF/MANIFEST.MF2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core/build.properties2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core/pom.xml2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.branding/META-INF/MANIFEST.MF2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.branding/build.properties4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.branding/pom.xml2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/META-INF/MANIFEST.MF2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/build.properties2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/pom.xml2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/build.properties2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/pom.xml2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/META-INF/MANIFEST.MF2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/build.properties2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/pom.xml2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/META-INF/MANIFEST.MF2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/build.properties3
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/pom.xml2
-rw-r--r--jaxb/tests/org.eclipse.jpt.jaxb.core.tests/META-INF/MANIFEST.MF2
-rw-r--r--jaxb/tests/org.eclipse.jpt.jaxb.core.tests/build.properties2
-rw-r--r--jaxb/tests/org.eclipse.jpt.jaxb.core.tests/pom.xml2
-rw-r--r--jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/META-INF/MANIFEST.MF2
-rw-r--r--jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/build.properties2
-rw-r--r--jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/pom.xml2
-rw-r--r--jpa/features/org.eclipse.jpt.jpa.eclipselink_sdk.feature/feature.xml13
-rw-r--r--jpa/features/org.eclipse.jpt.jpa.eclipselink_sdk.feature/pom.xml2
-rw-r--r--jpa/features/org.eclipse.jpt.jpa_sdk.feature/feature.xml19
-rw-r--r--jpa/features/org.eclipse.jpt.jpa_sdk.feature/pom.xml2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.isv/META-INF/MANIFEST.MF2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.isv/build.properties2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.isv/pom.xml2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF2
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/build.properties9
-rw-r--r--jpa/plugins/org.eclipse.jpt.doc.user/pom.xml2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.annotate/META-INF/MANIFEST.MF2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.annotate/build.properties4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.annotate/pom.xml2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.branding/META-INF/MANIFEST.MF2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.branding/build.properties4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.branding/pom.xml2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/META-INF/MANIFEST.MF2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/build.properties3
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/pom.xml2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.db.ui/META-INF/MANIFEST.MF2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.db.ui/build.properties2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.db.ui/pom.xml2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.db/META-INF/MANIFEST.MF2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.db/build.properties2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.db/pom.xml2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.branding/META-INF/MANIFEST.MF2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.branding/build.properties4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.branding/pom.xml2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/META-INF/MANIFEST.MF2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/build.properties2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/pom.xml2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/META-INF/MANIFEST.MF2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/build.properties4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/pom.xml2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/META-INF/MANIFEST.MF2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/build.properties2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/pom.xml2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.gen/META-INF/MANIFEST.MF2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.gen/build.properties2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.gen/pom.xml2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/META-INF/MANIFEST.MF2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/build.properties4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/pom.xml2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/META-INF/MANIFEST.MF2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/build.properties2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/pom.xml2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/META-INF/MANIFEST.MF2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/build.properties2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.core.tests/pom.xml2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.db.tests/META-INF/MANIFEST.MF2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.db.tests/build.properties2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.db.tests/pom.xml2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/META-INF/MANIFEST.MF2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/build.properties2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/pom.xml2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.gen.tests/META-INF/MANIFEST.MF2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.gen.tests/build.properties2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.gen.tests/pom.xml2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.ui.tests/META-INF/MANIFEST.MF2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.ui.tests/build.properties2
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.ui.tests/pom.xml2
-rw-r--r--jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.releng/.project (renamed from jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/.project)0
-rw-r--r--jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml (renamed from jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml)0
-rw-r--r--jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.releng/resources/javax.persistence_2.0.4.v201112161009.jar (renamed from jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/resources/javax.persistence_2.0.4.v201112161009.jar)bin127873 -> 127873 bytes
-rw-r--r--jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.repository/.project (renamed from jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository/.project)0
-rw-r--r--jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.repository/category.xml (renamed from jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository/category.xml)0
-rw-r--r--jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.repository/pom.xml (renamed from jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository/pom.xml)0
-rw-r--r--jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/feature.xml13
-rw-r--r--jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/pom.xml2
-rw-r--r--jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.branding/META-INF/MANIFEST.MF2
-rw-r--r--jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.branding/build.properties4
-rw-r--r--jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.branding/pom.xml2
-rw-r--r--jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.doc.user/META-INF/MANIFEST.MF2
-rw-r--r--jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.doc.user/build.properties12
-rw-r--r--jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.doc.user/pom.xml2
-rw-r--r--jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/META-INF/MANIFEST.MF2
-rw-r--r--jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/build.properties2
-rw-r--r--jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/pom.xml2
-rw-r--r--jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/META-INF/MANIFEST.MF2
-rw-r--r--jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/build.properties2
-rw-r--r--jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/pom.xml2
-rw-r--r--jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/META-INF/MANIFEST.MF2
-rw-r--r--jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/build.properties2
-rw-r--r--jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/pom.xml2
-rw-r--r--pom.xml9
-rw-r--r--site/category.xml218
168 files changed, 406 insertions, 393 deletions
diff --git a/assembly/features/org.eclipse.jpt.assembly.feature/feature.xml b/assembly/features/org.eclipse.jpt.assembly.feature/feature.xml
index 32e0f5492..58cf24888 100644
--- a/assembly/features/org.eclipse.jpt.assembly.feature/feature.xml
+++ b/assembly/features/org.eclipse.jpt.assembly.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jpt.assembly.feature"
label="%featureName"
- version="2.3.1.qualifier"
+ version="2.3.2.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.license"
@@ -25,36 +25,15 @@
<discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
</url>
- <includes
- id="org.eclipse.jpt.common.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.common.eclipselink.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.jpa.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.jpa.eclipselink.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.jaxb.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.jaxb.eclipselink.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.dbws.eclipselink.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.jpadiagrameditor.feature"
- version="0.0.0"/>
+ <requires>
+ <import feature="org.eclipse.jpt.common.feature"/>
+ <import feature="org.eclipse.jpt.common.eclipselink.feature"/>
+ <import feature="org.eclipse.jpt.jpa.feature"/>
+ <import feature="org.eclipse.jpt.jpa.eclipselink.feature"/>
+ <import feature="org.eclipse.jpt.jaxb.feature"/>
+ <import feature="org.eclipse.jpt.jaxb.eclipselink.feature"/>
+ <import feature="org.eclipse.jpt.dbws.eclipselink.feature"/>
+ <import feature="org.eclipse.jpt.jpadiagrameditor.feature"/>
+ </requires>
</feature>
diff --git a/assembly/features/org.eclipse.jpt.assembly.feature/pom.xml b/assembly/features/org.eclipse.jpt.assembly.feature/pom.xml
index 3008daeea..04c494a30 100644
--- a/assembly/features/org.eclipse.jpt.assembly.feature/pom.xml
+++ b/assembly/features/org.eclipse.jpt.assembly.feature/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.assembly.feature</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/assembly/features/org.eclipse.jpt.tests.assembly.feature/feature.xml b/assembly/features/org.eclipse.jpt.tests.assembly.feature/feature.xml
index 63a9e741b..0d18a31cf 100644
--- a/assembly/features/org.eclipse.jpt.tests.assembly.feature/feature.xml
+++ b/assembly/features/org.eclipse.jpt.tests.assembly.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jpt.tests.assembly.feature"
label="%featureName"
- version="2.3.1.qualifier"
+ version="2.3.2.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
@@ -23,29 +23,13 @@
<update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
</url>
- <includes
- id="org.eclipse.jpt.common.tests.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.jpa.tests.feature"
- version="0.0.0"/>
-
- <!-- disable this test feature since it requires org.eclipse.jpt.jpa.eclipselink.core.tests and org.eclipse.jpt.jpa.core.tests -->
- <!-- <includes
- id="org.eclipse.jpt.jpa.eclipselink.tests.feature"
- version="0.0.0"/> -->
-
- <includes
- id="org.eclipse.jpt.jaxb.tests.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.jaxb.eclipselink.tests.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.jpadiagrameditor.tests.feature"
- version="0.0.0"/>
-
+ <requires>
+ <!-- disable this test feature since it requires org.eclipse.jpt.jpa.eclipselink.core.tests and org.eclipse.jpt.jpa.core.tests -->
+ <!-- <import feature="org.eclipse.jpt.jpa.eclipselink.tests.feature"/> -->
+ <import feature="org.eclipse.jpt.common.tests.feature"/>
+ <import feature="org.eclipse.jpt.jpa.tests.feature"/>
+ <import feature="org.eclipse.jpt.jaxb.tests.feature"/>
+ <import feature="org.eclipse.jpt.jaxb.eclipselink.tests.feature"/>
+ <import feature="org.eclipse.jpt.jpadiagrameditor.tests.feature"/>
+ </requires>
</feature>
diff --git a/assembly/features/org.eclipse.jpt.tests.assembly.feature/pom.xml b/assembly/features/org.eclipse.jpt.tests.assembly.feature/pom.xml
index acfe1eaf2..b1765c9f5 100644
--- a/assembly/features/org.eclipse.jpt.tests.assembly.feature/pom.xml
+++ b/assembly/features/org.eclipse.jpt.tests.assembly.feature/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.tests.assembly.feature</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/assembly/features/org.eclipse.jpt_sdk.assembly.feature/feature.xml b/assembly/features/org.eclipse.jpt_sdk.assembly.feature/feature.xml
index d1f1637c0..6de26d248 100644
--- a/assembly/features/org.eclipse.jpt_sdk.assembly.feature/feature.xml
+++ b/assembly/features/org.eclipse.jpt_sdk.assembly.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jpt_sdk.assembly.feature"
label="%featureName"
- version="2.3.1.qualifier"
+ version="2.3.2.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.license"
@@ -25,36 +25,14 @@
<discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
</url>
- <includes
- id="org.eclipse.jpt.common_sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.common.eclipselink_sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.jpa_sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.jpa.eclipselink_sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.jaxb_sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.jaxb.eclipselink_sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.dbws.eclipselink_sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.jpadiagrameditor_sdk.feature"
- version="0.0.0"/>
-
+ <requires>
+ <import feature="org.eclipse.jpt.common_sdk.feature"/>
+ <import feature="org.eclipse.jpt.common.eclipselink_sdk.feature"/>
+ <import feature="org.eclipse.jpt.jpa_sdk.feature"/>
+ <import feature="org.eclipse.jpt.jpa.eclipselink_sdk.feature"/>
+ <import feature="org.eclipse.jpt.jaxb_sdk.feature"/>
+ <import feature="org.eclipse.jpt.jaxb.eclipselink_sdk.feature"/>
+ <import feature="org.eclipse.jpt.dbws.eclipselink_sdk.feature"/>
+ <import feature="org.eclipse.jpt.jpadiagrameditor_sdk.feature"/>
+ </requires>
</feature>
diff --git a/assembly/features/org.eclipse.jpt_sdk.assembly.feature/pom.xml b/assembly/features/org.eclipse.jpt_sdk.assembly.feature/pom.xml
index 7f0afd1ea..640b04d65 100644
--- a/assembly/features/org.eclipse.jpt_sdk.assembly.feature/pom.xml
+++ b/assembly/features/org.eclipse.jpt_sdk.assembly.feature/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt_sdk.assembly.feature</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/common/features/org.eclipse.jpt.common.eclipselink_sdk.feature/feature.xml b/common/features/org.eclipse.jpt.common.eclipselink_sdk.feature/feature.xml
index 6f6c1bf9b..d0160b134 100644
--- a/common/features/org.eclipse.jpt.common.eclipselink_sdk.feature/feature.xml
+++ b/common/features/org.eclipse.jpt.common.eclipselink_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jpt.common.eclipselink_sdk.feature"
label="%featureName"
- version="1.3.200.qualifier"
+ version="1.3.201.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
@@ -19,12 +19,8 @@
%license
</license>
- <includes
- id="org.eclipse.jpt.common.eclipselink.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.common.eclipselink.feature.source"
- version="0.0.0"/>
+ <requires>
+ <import feature="org.eclipse.jpt.common.eclipselink.feature"/>
+ </requires>
</feature>
diff --git a/common/features/org.eclipse.jpt.common.eclipselink_sdk.feature/pom.xml b/common/features/org.eclipse.jpt.common.eclipselink_sdk.feature/pom.xml
index c6beed252..8e4ac956b 100644
--- a/common/features/org.eclipse.jpt.common.eclipselink_sdk.feature/pom.xml
+++ b/common/features/org.eclipse.jpt.common.eclipselink_sdk.feature/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.common.eclipselink_sdk.feature</artifactId>
- <version>1.3.200-SNAPSHOT</version>
+ <version>1.3.201-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/common/features/org.eclipse.jpt.common_sdk.feature/feature.xml b/common/features/org.eclipse.jpt.common_sdk.feature/feature.xml
index 22a3756a2..4cfcedd03 100644
--- a/common/features/org.eclipse.jpt.common_sdk.feature/feature.xml
+++ b/common/features/org.eclipse.jpt.common_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jpt.common_sdk.feature"
label="%featureName"
- version="1.5.100.qualifier"
+ version="1.5.101.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
@@ -19,12 +19,7 @@
%license
</license>
- <includes
- id="org.eclipse.jpt.common.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.common.feature.source"
- version="0.0.0"/>
-
+ <requires>
+ <import feature="org.eclipse.jpt.common.feature"/>
+ </requires>
</feature>
diff --git a/common/features/org.eclipse.jpt.common_sdk.feature/pom.xml b/common/features/org.eclipse.jpt.common_sdk.feature/pom.xml
index 9b132ccd0..be82244c0 100644
--- a/common/features/org.eclipse.jpt.common_sdk.feature/pom.xml
+++ b/common/features/org.eclipse.jpt.common_sdk.feature/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.common_sdk.feature</artifactId>
- <version>1.5.100-SNAPSHOT</version>
+ <version>1.5.101-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/common/plugins/org.eclipse.jpt.common.branding/META-INF/MANIFEST.MF b/common/plugins/org.eclipse.jpt.common.branding/META-INF/MANIFEST.MF
index dc5e23b4c..e529c2809 100644
--- a/common/plugins/org.eclipse.jpt.common.branding/META-INF/MANIFEST.MF
+++ b/common/plugins/org.eclipse.jpt.common.branding/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jpt.common.branding;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %providerName
diff --git a/common/plugins/org.eclipse.jpt.common.branding/build.properties b/common/plugins/org.eclipse.jpt.common.branding/build.properties
index 6c20e3b02..b57ce326b 100644
--- a/common/plugins/org.eclipse.jpt.common.branding/build.properties
+++ b/common/plugins/org.eclipse.jpt.common.branding/build.properties
@@ -15,3 +15,7 @@ bin.includes = META-INF/,\
about.properties,\
icons/,\
plugin.properties
+source.. = src/
+output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/common/plugins/org.eclipse.jpt.common.branding/pom.xml b/common/plugins/org.eclipse.jpt.common.branding/pom.xml
index d1b24f454..eaf3e2678 100644
--- a/common/plugins/org.eclipse.jpt.common.branding/pom.xml
+++ b/common/plugins/org.eclipse.jpt.common.branding/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.common.branding</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF b/common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF
index ae45440de..354bcbe44 100644
--- a/common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF
+++ b/common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.common.core;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.1.qualifier
Bundle-Activator: org.eclipse.jpt.common.core.internal.plugin.JptCommonCorePlugin
Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.jpt.common.core.internal.bundleexclude"
Bundle-ClassPath: .
diff --git a/common/plugins/org.eclipse.jpt.common.core/build.properties b/common/plugins/org.eclipse.jpt.common.core/build.properties
index 6c6431410..50661ca3f 100644
--- a/common/plugins/org.eclipse.jpt.common.core/build.properties
+++ b/common/plugins/org.eclipse.jpt.common.core/build.properties
@@ -22,3 +22,5 @@ bin.includes = .,\
jars.compile.order = .
bin.excludes = model/src/,\
model/DaliEmfFormatter.xml
+src.includes = *
+src.excludes = src
diff --git a/common/plugins/org.eclipse.jpt.common.core/pom.xml b/common/plugins/org.eclipse.jpt.common.core/pom.xml
index f275c09da..da6ea6493 100644
--- a/common/plugins/org.eclipse.jpt.common.core/pom.xml
+++ b/common/plugins/org.eclipse.jpt.common.core/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.common.core</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.branding/META-INF/MANIFEST.MF b/common/plugins/org.eclipse.jpt.common.eclipselink.branding/META-INF/MANIFEST.MF
index ceb25628c..09e32bfcc 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.branding/META-INF/MANIFEST.MF
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.branding/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jpt.common.eclipselink.branding;singleton:=true
-Bundle-Version: 1.3.100.qualifier
+Bundle-Version: 1.3.101.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %providerName
diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.branding/build.properties b/common/plugins/org.eclipse.jpt.common.eclipselink.branding/build.properties
index 6c20e3b02..b57ce326b 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.branding/build.properties
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.branding/build.properties
@@ -15,3 +15,7 @@ bin.includes = META-INF/,\
about.properties,\
icons/,\
plugin.properties
+source.. = src/
+output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.branding/pom.xml b/common/plugins/org.eclipse.jpt.common.eclipselink.branding/pom.xml
index 9d778cdfe..4bf0f15b1 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.branding/pom.xml
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.branding/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.common.eclipselink.branding</artifactId>
- <version>1.3.100-SNAPSHOT</version>
+ <version>1.3.101-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.core/META-INF/MANIFEST.MF b/common/plugins/org.eclipse.jpt.common.eclipselink.core/META-INF/MANIFEST.MF
index 386f71d93..f78c0a5ec 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.core/META-INF/MANIFEST.MF
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.common.eclipselink.core;singleton:=true
-Bundle-Version: 1.3.200.qualifier
+Bundle-Version: 1.3.201.qualifier
Bundle-Activator: org.eclipse.jpt.common.eclipselink.core.internal.plugin.JptCommonEclipseLinkCorePlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.core/build.properties b/common/plugins/org.eclipse.jpt.common.eclipselink.core/build.properties
index d5ecbb969..f836c33f9 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.core/build.properties
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/build.properties
@@ -16,4 +16,5 @@ bin.includes = .,\
plugin.xml,\
plugin.properties,\
schemas/
-src.includes = schemas/
+src.includes = *
+src.excludes = src
diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.core/pom.xml b/common/plugins/org.eclipse.jpt.common.eclipselink.core/pom.xml
index d26964697..dfaca445f 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.core/pom.xml
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.common.eclipselink.core</artifactId>
- <version>1.3.200-SNAPSHOT</version>
+ <version>1.3.201-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/common/plugins/org.eclipse.jpt.common.ui/META-INF/MANIFEST.MF b/common/plugins/org.eclipse.jpt.common.ui/META-INF/MANIFEST.MF
index fcd35c895..47302e719 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/META-INF/MANIFEST.MF
+++ b/common/plugins/org.eclipse.jpt.common.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.common.ui;singleton:=true
-Bundle-Version: 1.4.200.qualifier
+Bundle-Version: 1.4.201.qualifier
Bundle-Activator: org.eclipse.jpt.common.ui.internal.plugin.JptCommonUiPlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/common/plugins/org.eclipse.jpt.common.ui/build.properties b/common/plugins/org.eclipse.jpt.common.ui/build.properties
index 60d75fdfc..be4f196f5 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/build.properties
+++ b/common/plugins/org.eclipse.jpt.common.ui/build.properties
@@ -18,3 +18,5 @@ bin.includes = .,\
plugin.properties,\
.options
jars.compile.order = .
+src.includes = *
+src.excludes = src
diff --git a/common/plugins/org.eclipse.jpt.common.ui/pom.xml b/common/plugins/org.eclipse.jpt.common.ui/pom.xml
index 23fcb0422..d07f7024f 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/pom.xml
+++ b/common/plugins/org.eclipse.jpt.common.ui/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.common.ui</artifactId>
- <version>1.4.200-SNAPSHOT</version>
+ <version>1.4.201-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/common/plugins/org.eclipse.jpt.common.utility/META-INF/MANIFEST.MF b/common/plugins/org.eclipse.jpt.common.utility/META-INF/MANIFEST.MF
index ab1726a45..ddbca3a77 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/META-INF/MANIFEST.MF
+++ b/common/plugins/org.eclipse.jpt.common.utility/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.common.utility;singleton:=true
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.1.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Localization: plugin
diff --git a/common/plugins/org.eclipse.jpt.common.utility/build.properties b/common/plugins/org.eclipse.jpt.common.utility/build.properties
index d0244655e..c9634d21c 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/build.properties
+++ b/common/plugins/org.eclipse.jpt.common.utility/build.properties
@@ -13,3 +13,5 @@ bin.includes = .,\
META-INF/,\
about.html,\
plugin.properties
+src.includes = *
+src.excludes = src
diff --git a/common/plugins/org.eclipse.jpt.common.utility/pom.xml b/common/plugins/org.eclipse.jpt.common.utility/pom.xml
index ba3f37c78..8f2b1176b 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/pom.xml
+++ b/common/plugins/org.eclipse.jpt.common.utility/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.common.utility</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/common/tests/org.eclipse.jpt.common.core.tests/META-INF/MANIFEST.MF b/common/tests/org.eclipse.jpt.common.core.tests/META-INF/MANIFEST.MF
index 120bd5755..225cfa383 100644
--- a/common/tests/org.eclipse.jpt.common.core.tests/META-INF/MANIFEST.MF
+++ b/common/tests/org.eclipse.jpt.common.core.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.common.core.tests;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.1.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Localization: plugin
diff --git a/common/tests/org.eclipse.jpt.common.core.tests/build.properties b/common/tests/org.eclipse.jpt.common.core.tests/build.properties
index 9cd29bcb3..02319a65b 100644
--- a/common/tests/org.eclipse.jpt.common.core.tests/build.properties
+++ b/common/tests/org.eclipse.jpt.common.core.tests/build.properties
@@ -14,3 +14,5 @@ bin.includes = .,\
plugin.properties
source.. = src/
output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/common/tests/org.eclipse.jpt.common.core.tests/pom.xml b/common/tests/org.eclipse.jpt.common.core.tests/pom.xml
index d3d6b5cd8..a4c2dcf6d 100644
--- a/common/tests/org.eclipse.jpt.common.core.tests/pom.xml
+++ b/common/tests/org.eclipse.jpt.common.core.tests/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.common.core.tests</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/META-INF/MANIFEST.MF b/common/tests/org.eclipse.jpt.common.ui.tests/META-INF/MANIFEST.MF
index 577d989aa..90a657f78 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/META-INF/MANIFEST.MF
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.common.ui.tests;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.1.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Localization: plugin
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/build.properties b/common/tests/org.eclipse.jpt.common.ui.tests/build.properties
index 68d2e421f..3d4b3a9eb 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/build.properties
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/build.properties
@@ -9,6 +9,8 @@
################################################################################
source.. = src/
output.. = bin/
+src.includes = *
+src.excludes = src
bin.includes = .,\
META-INF/,\
plugin.properties
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/pom.xml b/common/tests/org.eclipse.jpt.common.ui.tests/pom.xml
index 7797f4bb1..aa7a26bcf 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/pom.xml
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.common.ui.tests</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/META-INF/MANIFEST.MF b/common/tests/org.eclipse.jpt.common.utility.tests/META-INF/MANIFEST.MF
index 9660c0552..599462a61 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/META-INF/MANIFEST.MF
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.common.utility.tests;singleton:=true
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.1.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Localization: plugin
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/build.properties b/common/tests/org.eclipse.jpt.common.utility.tests/build.properties
index ebe9c08ef..23b1658bb 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/build.properties
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/build.properties
@@ -9,6 +9,8 @@
################################################################################
source.. = src/
output.. = bin/
+src.includes = *
+src.excludes = src
bin.includes = .,\
META-INF/,\
about.html,\
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/pom.xml b/common/tests/org.eclipse.jpt.common.utility.tests/pom.xml
index 1271471fe..9484e86c3 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/pom.xml
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.common.utility.tests</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
diff --git a/jaxb/features/org.eclipse.jpt.dbws.eclipselink_sdk.feature/feature.xml b/jaxb/features/org.eclipse.jpt.dbws.eclipselink_sdk.feature/feature.xml
index c32d431e6..4dbf0346d 100644
--- a/jaxb/features/org.eclipse.jpt.dbws.eclipselink_sdk.feature/feature.xml
+++ b/jaxb/features/org.eclipse.jpt.dbws.eclipselink_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jpt.dbws.eclipselink_sdk.feature"
label="%featureName"
- version="1.2.200.qualifier"
+ version="1.2.201.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
@@ -19,12 +19,7 @@
%license
</license>
- <includes
- id="org.eclipse.jpt.dbws.eclipselink.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.dbws.eclipselink.feature.source"
- version="0.0.0"/>
-
+ <requires>
+ <import feature="org.eclipse.jpt.dbws.eclipselink.feature"/>
+ </requires>
</feature>
diff --git a/jaxb/features/org.eclipse.jpt.dbws.eclipselink_sdk.feature/pom.xml b/jaxb/features/org.eclipse.jpt.dbws.eclipselink_sdk.feature/pom.xml
index e798546d2..b2f555bb1 100644
--- a/jaxb/features/org.eclipse.jpt.dbws.eclipselink_sdk.feature/pom.xml
+++ b/jaxb/features/org.eclipse.jpt.dbws.eclipselink_sdk.feature/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.dbws.eclipselink_sdk.feature</artifactId>
- <version>1.2.200-SNAPSHOT</version>
+ <version>1.2.201-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/jaxb/features/org.eclipse.jpt.jaxb.eclipselink_sdk.feature/feature.xml b/jaxb/features/org.eclipse.jpt.jaxb.eclipselink_sdk.feature/feature.xml
index ec7571baf..8e97e0cb3 100644
--- a/jaxb/features/org.eclipse.jpt.jaxb.eclipselink_sdk.feature/feature.xml
+++ b/jaxb/features/org.eclipse.jpt.jaxb.eclipselink_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jpt.jaxb.eclipselink_sdk.feature"
label="%featureName"
- version="1.4.200.qualifier"
+ version="1.4.201.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
@@ -19,12 +19,7 @@
%license
</license>
- <includes
- id="org.eclipse.jpt.jaxb.eclipselink.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.jaxb.eclipselink.feature.source"
- version="0.0.0"/>
-
+ <requires>
+ <import feature="org.eclipse.jpt.jaxb.eclipselink.feature"/>
+ </requires>
</feature>
diff --git a/jaxb/features/org.eclipse.jpt.jaxb.eclipselink_sdk.feature/pom.xml b/jaxb/features/org.eclipse.jpt.jaxb.eclipselink_sdk.feature/pom.xml
index 7acb3485c..b82a2d127 100644
--- a/jaxb/features/org.eclipse.jpt.jaxb.eclipselink_sdk.feature/pom.xml
+++ b/jaxb/features/org.eclipse.jpt.jaxb.eclipselink_sdk.feature/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jaxb.eclipselink_sdk.feature</artifactId>
- <version>1.4.200-SNAPSHOT</version>
+ <version>1.4.201-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/jaxb/features/org.eclipse.jpt.jaxb_sdk.feature/feature.xml b/jaxb/features/org.eclipse.jpt.jaxb_sdk.feature/feature.xml
index b81a3b798..713d86b7e 100644
--- a/jaxb/features/org.eclipse.jpt.jaxb_sdk.feature/feature.xml
+++ b/jaxb/features/org.eclipse.jpt.jaxb_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jpt.jaxb_sdk.feature"
label="%featureName"
- version="1.5.100.qualifier"
+ version="1.5.101.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
@@ -19,12 +19,7 @@
%license
</license>
- <includes
- id="org.eclipse.jpt.jaxb.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.jaxb.feature.source"
- version="0.0.0"/>
-
+ <requires>
+ <import feature="org.eclipse.jpt.jaxb.feature"/>
+ </requires>
</feature>
diff --git a/jaxb/features/org.eclipse.jpt.jaxb_sdk.feature/pom.xml b/jaxb/features/org.eclipse.jpt.jaxb_sdk.feature/pom.xml
index 1e3ea552f..cfd2a02ea 100644
--- a/jaxb/features/org.eclipse.jpt.jaxb_sdk.feature/pom.xml
+++ b/jaxb/features/org.eclipse.jpt.jaxb_sdk.feature/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jaxb_sdk.feature</artifactId>
- <version>1.5.100-SNAPSHOT</version>
+ <version>1.5.101-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.branding/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.branding/META-INF/MANIFEST.MF
index 17494b250..02e093018 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.branding/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.branding/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jpt.dbws.eclipselink.branding;singleton:=true
-Bundle-Version: 1.2.100.qualifier
+Bundle-Version: 1.2.101.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %providerName
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.branding/build.properties b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.branding/build.properties
index 6c20e3b02..b57ce326b 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.branding/build.properties
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.branding/build.properties
@@ -15,3 +15,7 @@ bin.includes = META-INF/,\
about.properties,\
icons/,\
plugin.properties
+source.. = src/
+output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.branding/pom.xml b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.branding/pom.xml
index c798fb0d7..556550d01 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.branding/pom.xml
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.branding/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.dbws.eclipselink.branding</artifactId>
- <version>1.2.100-SNAPSHOT</version>
+ <version>1.2.101-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/META-INF/MANIFEST.MF
index 5bb5efd5a..0470396ae 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.dbws.eclipselink.core.gen;singleton:=true
-Bundle-Version: 1.1.200.qualifier
+Bundle-Version: 1.1.201.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Localization: plugin
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/build.properties b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/build.properties
index 196d80932..97545e56c 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/build.properties
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/build.properties
@@ -15,3 +15,5 @@ bin.includes = .,\
about.html,\
plugin.properties
jars.compile.order = .
+src.includes = *
+src.excludes = src
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/pom.xml b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/pom.xml
index 22927b407..dd347e452 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/pom.xml
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.dbws.eclipselink.core.gen</artifactId>
- <version>1.1.200-SNAPSHOT</version>
+ <version>1.1.201-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/META-INF/MANIFEST.MF
index 924ce512d..88c28a033 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.dbws.eclipselink.ui;singleton:=true
-Bundle-Version: 1.1.200.qualifier
+Bundle-Version: 1.1.201.qualifier
Bundle-Activator: org.eclipse.jpt.dbws.eclipselink.ui.internal.plugin.JptDbwsEclipseLinkUiPlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/build.properties b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/build.properties
index 8d02a56ab..290810197 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/build.properties
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/build.properties
@@ -17,3 +17,5 @@ bin.includes = .,\
plugin.xml,\
plugin.properties
jars.compile.order = .
+src.includes = *
+src.excludes = src
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/pom.xml b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/pom.xml
index c06f084a9..af1229e59 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/pom.xml
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.dbws.eclipselink.ui</artifactId>
- <version>1.1.200-SNAPSHOT</version>
+ <version>1.1.201-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.branding/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.branding/META-INF/MANIFEST.MF
index 5bde222eb..6a8e6b6fa 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.branding/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.branding/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jpt.jaxb.branding;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %providerName
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.branding/build.properties b/jaxb/plugins/org.eclipse.jpt.jaxb.branding/build.properties
index f543f1cff..afe9098c9 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.branding/build.properties
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.branding/build.properties
@@ -14,3 +14,7 @@ bin.includes = META-INF/,\
about.properties,\
icons/,\
plugin.properties
+source.. = src/
+output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.branding/pom.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.branding/pom.xml
index ce65a3219..a37df93d4 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.branding/pom.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.branding/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jaxb.branding</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/META-INF/MANIFEST.MF
index c84ab034a..c36119531 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jaxb.core.schemagen;singleton:=true
-Bundle-Version: 1.1.200.qualifier
+Bundle-Version: 1.1.201.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Localization: plugin
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/build.properties b/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/build.properties
index 196d80932..97545e56c 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/build.properties
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/build.properties
@@ -15,3 +15,5 @@ bin.includes = .,\
about.html,\
plugin.properties
jars.compile.order = .
+src.includes = *
+src.excludes = src
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/pom.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/pom.xml
index 68d7b5d5d..dd82671d5 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/pom.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jaxb.core.schemagen</artifactId>
- <version>1.1.200-SNAPSHOT</version>
+ <version>1.1.201-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.core/META-INF/MANIFEST.MF
index 7144f2cfa..650560678 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jaxb.core;singleton:=true
-Bundle-Version: 1.4.100.qualifier
+Bundle-Version: 1.4.101.qualifier
Bundle-Activator: org.eclipse.jpt.jaxb.core.internal.plugin.JptJaxbCorePlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/build.properties b/jaxb/plugins/org.eclipse.jpt.jaxb.core/build.properties
index d1cda4a51..4be4f284b 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/build.properties
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/build.properties
@@ -17,3 +17,5 @@ bin.includes = .,\
plugin.properties,\
schema/
jars.compile.order = .
+src.includes = *
+src.excludes = src
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/pom.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.core/pom.xml
index 3c74632a2..dffcbc4a1 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/pom.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jaxb.core</artifactId>
- <version>1.4.100-SNAPSHOT</version>
+ <version>1.4.101-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.branding/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.branding/META-INF/MANIFEST.MF
index 8eda10093..f63679f3a 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.branding/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.branding/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jpt.jaxb.eclipselink.branding;singleton:=true
-Bundle-Version: 1.4.100.qualifier
+Bundle-Version: 1.4.101.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %providerName
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.branding/build.properties b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.branding/build.properties
index d6bd03a94..ee163726d 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.branding/build.properties
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.branding/build.properties
@@ -15,3 +15,7 @@ bin.includes = META-INF/,\
about.properties,\
icons/,\
plugin.properties
+source.. = src/
+output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.branding/pom.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.branding/pom.xml
index df2adb13c..dfbc91672 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.branding/pom.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.branding/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jaxb.eclipselink.branding</artifactId>
- <version>1.4.100-SNAPSHOT</version>
+ <version>1.4.101-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/META-INF/MANIFEST.MF
index 89564dc13..d5742bc31 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jaxb.eclipselink.core.schemagen;singleton:=true
-Bundle-Version: 1.2.200.qualifier
+Bundle-Version: 1.2.201.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Localization: plugin
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/build.properties b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/build.properties
index ff7c02bfa..7e42537cf 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/build.properties
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/build.properties
@@ -15,3 +15,5 @@ bin.includes = .,\
about.html,\
plugin.properties
jars.compile.order = .
+src.includes = *
+src.excludes = src
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/pom.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/pom.xml
index bba08c9f0..f4f0ead36 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/pom.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jaxb.eclipselink.core.schemagen</artifactId>
- <version>1.2.200-SNAPSHOT</version>
+ <version>1.2.201-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF
index 0d52959e3..38e314d4b 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jaxb.eclipselink.core;singleton:=true
-Bundle-Version: 1.3.200.qualifier
+Bundle-Version: 1.3.201.qualifier
Bundle-Activator: org.eclipse.jpt.jaxb.eclipselink.core.internal.plugin.JptJaxbEclipseLinkCorePlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/build.properties b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/build.properties
index efa481755..67f349ee9 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/build.properties
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/build.properties
@@ -19,3 +19,5 @@ bin.includes = .,\
model/
jars.compile.order = .
bin.excludes = model/src/
+src.includes = *
+src.excludes = src
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/pom.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/pom.xml
index 2821d4640..1a8432c1e 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/pom.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jaxb.eclipselink.core</artifactId>
- <version>1.3.200-SNAPSHOT</version>
+ <version>1.3.201-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/META-INF/MANIFEST.MF
index ed259361e..dbfa1dc12 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jaxb.eclipselink.ui;singleton:=true
-Bundle-Version: 1.4.200.qualifier
+Bundle-Version: 1.4.201.qualifier
Bundle-Activator: org.eclipse.jpt.jaxb.eclipselink.ui.internal.plugin.JptJaxbEclipseLinkUiPlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/build.properties b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/build.properties
index 021049679..e8b27846f 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/build.properties
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/build.properties
@@ -17,3 +17,5 @@ bin.includes = .,\
plugin.xml,\
plugin.properties
jars.compile.order = .
+src.includes = *
+src.excludes = src
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/pom.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/pom.xml
index 273505213..71b867b9d 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/pom.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jaxb.eclipselink.ui</artifactId>
- <version>1.4.200-SNAPSHOT</version>
+ <version>1.4.201-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/META-INF/MANIFEST.MF
index 103187e5d..7e89b76ac 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jaxb.ui;singleton:=true
-Bundle-Version: 1.5.100.qualifier
+Bundle-Version: 1.5.101.qualifier
Bundle-Activator: org.eclipse.jpt.jaxb.ui.internal.plugin.JptJaxbUiPlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/build.properties b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/build.properties
index 6995b0a92..3d46bf671 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/build.properties
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/build.properties
@@ -18,4 +18,5 @@ bin.includes = .,\
plugin.properties,\
schema/
jars.compile.order = .
- \ No newline at end of file
+src.includes = *
+src.excludes = src
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/pom.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/pom.xml
index b8b0ac965..aaba81d0a 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/pom.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jaxb.ui</artifactId>
- <version>1.5.100-SNAPSHOT</version>
+ <version>1.5.101-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/META-INF/MANIFEST.MF b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/META-INF/MANIFEST.MF
index ce15b890f..bf0fb0712 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/META-INF/MANIFEST.MF
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jaxb.core.tests;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.1.qualifier
Bundle-Activator: org.eclipse.jpt.jaxb.core.tests.internal.plugin.JptJaxbCoreTestsPlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/build.properties b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/build.properties
index 9cd29bcb3..02319a65b 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/build.properties
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/build.properties
@@ -14,3 +14,5 @@ bin.includes = .,\
plugin.properties
source.. = src/
output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/pom.xml b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/pom.xml
index 6359969bb..77cdfb435 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/pom.xml
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jaxb.core.tests</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/META-INF/MANIFEST.MF b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/META-INF/MANIFEST.MF
index 07dc59845..8073467b6 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/META-INF/MANIFEST.MF
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jaxb.eclipselink.core.tests;singleton:=true
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.1.101.qualifier
Bundle-Activator: org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.plugin.JptJaxbEclipseLinkCoreTestsPlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/build.properties b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/build.properties
index 9cd29bcb3..02319a65b 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/build.properties
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/build.properties
@@ -14,3 +14,5 @@ bin.includes = .,\
plugin.properties
source.. = src/
output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/pom.xml b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/pom.xml
index c784fe2aa..32c964470 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/pom.xml
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jaxb.eclipselink.core.tests</artifactId>
- <version>1.1.100-SNAPSHOT</version>
+ <version>1.1.101-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
diff --git a/jpa/features/org.eclipse.jpt.jpa.eclipselink_sdk.feature/feature.xml b/jpa/features/org.eclipse.jpt.jpa.eclipselink_sdk.feature/feature.xml
index 5f1ebc29f..4fb688a7b 100644
--- a/jpa/features/org.eclipse.jpt.jpa.eclipselink_sdk.feature/feature.xml
+++ b/jpa/features/org.eclipse.jpt.jpa.eclipselink_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jpt.jpa.eclipselink_sdk.feature"
label="%featureName"
- version="3.4.100.qualifier"
+ version="3.4.101.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
@@ -19,12 +19,7 @@
%license
</license>
- <includes
- id="org.eclipse.jpt.jpa.eclipselink.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.jpa.eclipselink.feature.source"
- version="0.0.0"/>
-
+ <requires>
+ <import feature="org.eclipse.jpt.jpa.eclipselink.feature"/>
+ </requires>
</feature>
diff --git a/jpa/features/org.eclipse.jpt.jpa.eclipselink_sdk.feature/pom.xml b/jpa/features/org.eclipse.jpt.jpa.eclipselink_sdk.feature/pom.xml
index 8d5d65b42..55b5b0120 100644
--- a/jpa/features/org.eclipse.jpt.jpa.eclipselink_sdk.feature/pom.xml
+++ b/jpa/features/org.eclipse.jpt.jpa.eclipselink_sdk.feature/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.eclipselink_sdk.feature</artifactId>
- <version>3.4.100-SNAPSHOT</version>
+ <version>3.4.101-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/jpa/features/org.eclipse.jpt.jpa_sdk.feature/feature.xml b/jpa/features/org.eclipse.jpt.jpa_sdk.feature/feature.xml
index 6c4e10c0c..a7107a542 100644
--- a/jpa/features/org.eclipse.jpt.jpa_sdk.feature/feature.xml
+++ b/jpa/features/org.eclipse.jpt.jpa_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jpt.jpa_sdk.feature"
label="%featureName"
- version="3.5.100.qualifier"
+ version="3.5.101.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
@@ -19,21 +19,10 @@
%license
</license>
- <includes
- id="org.eclipse.jpt.jpa.feature"
- version="0.0.0"/>
+ <requires>
+ <import feature="org.eclipse.jpt.jpa.feature"/>
+ </requires>
- <includes
- id="org.eclipse.jpt.jpa.feature.source"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.persistence.jpa.jpql.source"
- download-size="0"
- install-size="0"
- version="2.6.0.qualifier"
- unpack="false"/>
-
<plugin
id="org.eclipse.jpt.doc.isv"
download-size="0"
diff --git a/jpa/features/org.eclipse.jpt.jpa_sdk.feature/pom.xml b/jpa/features/org.eclipse.jpt.jpa_sdk.feature/pom.xml
index bc8135464..38d3dbf3d 100644
--- a/jpa/features/org.eclipse.jpt.jpa_sdk.feature/pom.xml
+++ b/jpa/features/org.eclipse.jpt.jpa_sdk.feature/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa_sdk.feature</artifactId>
- <version>3.5.100-SNAPSHOT</version>
+ <version>3.5.101-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.doc.isv/META-INF/MANIFEST.MF
index 3b3e8a60d..e500ac623 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jpt.doc.isv; singleton:=true
-Bundle-Version: 3.4.0.qualifier
+Bundle-Version: 3.4.1.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.help;bundle-version="[3.4.0,4.0.0)"
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties b/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties
index 6d84e6b1c..e28bbffde 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/build.properties
@@ -32,3 +32,5 @@ bin.includes = META-INF/,\
stylesheet.css
generateSourceBundle=false
+src.includes = *
+src.excludes = src
diff --git a/jpa/plugins/org.eclipse.jpt.doc.isv/pom.xml b/jpa/plugins/org.eclipse.jpt.doc.isv/pom.xml
index 4bf6427ce..e26e4a85d 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.isv/pom.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.isv/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.doc.isv</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF
index a2a5c0b77..a32ec31ce 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/META-INF/MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.doc.user;singleton:=true
-Bundle-Version: 3.2.100.qualifier
+Bundle-Version: 3.2.101.qualifier
Bundle-Localization: plugin
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/build.properties b/jpa/plugins/org.eclipse.jpt.doc.user/build.properties
index 352822c86..8dd25ac35 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/build.properties
@@ -16,10 +16,5 @@ bin.includes = *.htm,\
img/,\
plugin.properties,\
META-INF/
-src.includes = *.htm,\
- *.html,\
- *.xml,\
- *.ini,\
- cheatsheets/,\
- dcommon/,\
- img/ \ No newline at end of file
+src.includes = *
+src.excludes = src
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/pom.xml b/jpa/plugins/org.eclipse.jpt.doc.user/pom.xml
index 3c2717b8a..21692c45b 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/pom.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.doc.user</artifactId>
- <version>3.2.100-SNAPSHOT</version>
+ <version>3.2.101-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.annotate/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.jpa.annotate/META-INF/MANIFEST.MF
index 353d464ee..d2460c7b8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.annotate/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.jpa.annotate/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.101.qualifier
Bundle-SymbolicName: org.eclipse.jpt.jpa.annotate;singleton:=true
Bundle-Activator: org.eclipse.jpt.jpa.annotate.internal.plugin.JptJpaAnnotatePlugin
Bundle-ActivationPolicy: lazy
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.annotate/build.properties b/jpa/plugins/org.eclipse.jpt.jpa.annotate/build.properties
index 47a1b395c..0968129ad 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.annotate/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.jpa.annotate/build.properties
@@ -15,4 +15,6 @@ bin.includes = META-INF/,\
.,\
about.html,\
plugin.properties
-jars.compile.order = .
+jars.compile.order = .
+src.includes = *
+src.excludes = src
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.annotate/pom.xml b/jpa/plugins/org.eclipse.jpt.jpa.annotate/pom.xml
index 65d270324..17a5b6f6c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.annotate/pom.xml
+++ b/jpa/plugins/org.eclipse.jpt.jpa.annotate/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.annotate</artifactId>
- <version>1.0.100-SNAPSHOT</version>
+ <version>1.0.101-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.branding/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.jpa.branding/META-INF/MANIFEST.MF
index 7ed77acf7..2d9039ff6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.branding/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.jpa.branding/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jpt.jpa.branding;singleton:=true
-Bundle-Version: 3.4.0.qualifier
+Bundle-Version: 3.4.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %providerName
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.branding/build.properties b/jpa/plugins/org.eclipse.jpt.jpa.branding/build.properties
index c591724ee..6a46c7896 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.branding/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.jpa.branding/build.properties
@@ -14,3 +14,7 @@ bin.includes = META-INF/,\
about.properties,\
icons/,\
plugin.properties
+source.. = src/
+output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.branding/pom.xml b/jpa/plugins/org.eclipse.jpt.jpa.branding/pom.xml
index 8acf71c35..ee5f63610 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.branding/pom.xml
+++ b/jpa/plugins/org.eclipse.jpt.jpa.branding/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.branding</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.jpa.core/META-INF/MANIFEST.MF
index c40ba8854..37b207605 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpa.core;singleton:=true
-Bundle-Version: 3.5.0.qualifier
+Bundle-Version: 3.5.1.qualifier
Bundle-Activator: org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/build.properties b/jpa/plugins/org.eclipse.jpt.jpa.core/build.properties
index 801ad62b2..510205c21 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/build.properties
@@ -20,5 +20,6 @@ bin.includes = .,\
schema/,\
model/
jars.compile.order = .
-src.includes = dev-docs/
+src.includes = *
+src.excludes = src
bin.excludes = model/src/
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/pom.xml b/jpa/plugins/org.eclipse.jpt.jpa.core/pom.xml
index e332ddbaf..1d3a68803 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/pom.xml
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.db.ui/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.jpa.db.ui/META-INF/MANIFEST.MF
index 611be83a5..df7cef460 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.db.ui/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.jpa.db.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpa.db.ui;singleton:=true
-Bundle-Version: 2.1.200.qualifier
+Bundle-Version: 2.1.201.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Localization: plugin
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.db.ui/build.properties b/jpa/plugins/org.eclipse.jpt.jpa.db.ui/build.properties
index 41837ebdd..5a67f0cf0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.db.ui/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.jpa.db.ui/build.properties
@@ -14,3 +14,5 @@ bin.includes = .,\
about.html,\
plugin.properties
jars.compile.order = .
+src.includes = *
+src.excludes = src
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.db.ui/pom.xml b/jpa/plugins/org.eclipse.jpt.jpa.db.ui/pom.xml
index 8207dbd2f..7013ee4fc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.db.ui/pom.xml
+++ b/jpa/plugins/org.eclipse.jpt.jpa.db.ui/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.db.ui</artifactId>
- <version>2.1.200-SNAPSHOT</version>
+ <version>2.1.201-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.db/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.jpa.db/META-INF/MANIFEST.MF
index b81bbc67c..8c6375d31 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.db/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.jpa.db/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpa.db;singleton:=true
-Bundle-Version: 2.2.200.qualifier
+Bundle-Version: 2.2.201.qualifier
Bundle-Activator: org.eclipse.jpt.jpa.db.internal.plugin.JptJpaDbPlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.db/build.properties b/jpa/plugins/org.eclipse.jpt.jpa.db/build.properties
index a77a112c0..552c8c144 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.db/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.jpa.db/build.properties
@@ -15,3 +15,5 @@ bin.includes = .,\
plugin.xml,\
plugin.properties
jars.compile.order = .
+src.includes = *
+src.excludes = src
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.db/pom.xml b/jpa/plugins/org.eclipse.jpt.jpa.db/pom.xml
index 3d3f8d4a8..b027ebb43 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.db/pom.xml
+++ b/jpa/plugins/org.eclipse.jpt.jpa.db/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.db</artifactId>
- <version>2.2.200-SNAPSHOT</version>
+ <version>2.2.201-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.branding/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.branding/META-INF/MANIFEST.MF
index dbd64c25f..1bda55cf7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.branding/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.branding/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jpt.jpa.eclipselink.branding;singleton:=true
-Bundle-Version: 3.4.0.qualifier
+Bundle-Version: 3.4.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %providerName
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.branding/build.properties b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.branding/build.properties
index c591724ee..6a46c7896 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.branding/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.branding/build.properties
@@ -14,3 +14,7 @@ bin.includes = META-INF/,\
about.properties,\
icons/,\
plugin.properties
+source.. = src/
+output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.branding/pom.xml b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.branding/pom.xml
index e694abcb0..a1693ab88 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.branding/pom.xml
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.branding/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.eclipselink.branding</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/META-INF/MANIFEST.MF
index 569062690..f79f5ead6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpa.eclipselink.core.ddlgen;singleton:=true
-Bundle-Version: 2.2.200.qualifier
+Bundle-Version: 2.2.201.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Localization: plugin
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/build.properties b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/build.properties
index f6a257843..70921f747 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/build.properties
@@ -14,3 +14,5 @@ bin.includes = .,\
about.html,\
plugin.properties
jars.compile.order = .
+src.includes = *
+src.excludes = src
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/pom.xml b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/pom.xml
index 55dd0e602..d12e6df18 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/pom.xml
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.eclipselink.core.ddlgen</artifactId>
- <version>2.2.200-SNAPSHOT</version>
+ <version>2.2.201-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/META-INF/MANIFEST.MF
index 605aeebf7..164e4739e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpa.eclipselink.core;singleton:=true
-Bundle-Version: 2.4.100.qualifier
+Bundle-Version: 2.4.101.qualifier
Bundle-Activator: org.eclipse.jpt.jpa.eclipselink.core.internal.plugin.JptJpaEclipseLinkCorePlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/build.properties b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/build.properties
index 5c4361f50..7e72a5d70 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/build.properties
@@ -17,5 +17,5 @@ bin.includes = .,\
plugin.xml,\
plugin.properties
jars.compile.order = .
-src.includes = model/
-src.includes = model/
+src.includes = *
+src.excludes = src
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/pom.xml b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/pom.xml
index 305d73b59..c74042263 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/pom.xml
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.eclipselink.core</artifactId>
- <version>2.4.100-SNAPSHOT</version>
+ <version>2.4.101-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/META-INF/MANIFEST.MF
index 29e58f521..22864a280 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpa.eclipselink.ui;singleton:=true
-Bundle-Version: 2.4.100.qualifier
+Bundle-Version: 2.4.101.qualifier
Bundle-Activator: org.eclipse.jpt.jpa.eclipselink.ui.internal.plugin.JptJpaEclipseLinkUiPlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/build.properties b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/build.properties
index 18a62e43c..ddb710580 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/build.properties
@@ -16,3 +16,5 @@ bin.includes = .,\
plugin.xml,\
plugin.properties
jars.compile.order = .
+src.includes = *
+src.excludes = src
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/pom.xml b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/pom.xml
index 0bbdf2d95..ff8035ade 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/pom.xml
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.eclipselink.ui</artifactId>
- <version>2.4.100-SNAPSHOT</version>
+ <version>2.4.101-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.gen/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.jpa.gen/META-INF/MANIFEST.MF
index 1f06d3feb..7a6b4aa93 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.gen/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.jpa.gen/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpa.gen;singleton:=true
-Bundle-Version: 2.3.200.qualifier
+Bundle-Version: 2.3.201.qualifier
Bundle-Activator: org.eclipse.jpt.jpa.gen.internal.plugin.JptJpaGenPlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.gen/build.properties b/jpa/plugins/org.eclipse.jpt.jpa.gen/build.properties
index 4fe875d02..89c8e04d7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.gen/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.jpa.gen/build.properties
@@ -16,3 +16,5 @@ bin.includes = .,\
plugin.properties,\
templates/
jars.compile.order = .
+src.includes = *
+src.excludes = src
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.gen/pom.xml b/jpa/plugins/org.eclipse.jpt.jpa.gen/pom.xml
index 99e6c0459..c6a4431f9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.gen/pom.xml
+++ b/jpa/plugins/org.eclipse.jpt.jpa.gen/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.gen</artifactId>
- <version>2.3.200-SNAPSHOT</version>
+ <version>2.3.201-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.jpa.ui/META-INF/MANIFEST.MF
index 70209f9c7..cc0b8042b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpa.ui;singleton:=true
-Bundle-Version: 3.4.200.qualifier
+Bundle-Version: 3.4.201.qualifier
Bundle-Activator: org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/build.properties b/jpa/plugins/org.eclipse.jpt.jpa.ui/build.properties
index 302c80484..ee81158d8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/build.properties
@@ -19,5 +19,5 @@ bin.includes = .,\
.options,\
schema/
jars.compile.order = .
-src.includes = templates/
-
+src.includes = *
+src.excludes = src
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/pom.xml b/jpa/plugins/org.eclipse.jpt.jpa.ui/pom.xml
index ffbb4fc17..7d7ad0102 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/pom.xml
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.ui</artifactId>
- <version>3.4.200-SNAPSHOT</version>
+ <version>3.4.201-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/META-INF/MANIFEST.MF b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/META-INF/MANIFEST.MF
index a97dd8b21..79244c4c5 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/META-INF/MANIFEST.MF
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpa.core.tests.extension.resource;singleton:=true
-Bundle-Version: 3.4.0.qualifier
+Bundle-Version: 3.4.1.qualifier
Bundle-Activator: org.eclipse.jpt.jpa.core.tests.extension.resource.TestExtensionPlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/build.properties b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/build.properties
index 6a1163bc4..de5943b58 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/build.properties
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/build.properties
@@ -15,3 +15,5 @@ bin.includes = .,\
plugin.properties,\
about.html
jars.compile.order = .
+src.includes = *
+src.excludes = src
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/pom.xml b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/pom.xml
index 9f695832d..c6f8f4e13 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/pom.xml
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.core.tests.extension.resource</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/META-INF/MANIFEST.MF b/jpa/tests/org.eclipse.jpt.jpa.core.tests/META-INF/MANIFEST.MF
index 0eb61360b..5f7060a90 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/META-INF/MANIFEST.MF
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpa.core.tests;singleton:=true
-Bundle-Version: 3.5.0.qualifier
+Bundle-Version: 3.5.1.qualifier
Bundle-Activator: org.eclipse.jpt.jpa.core.tests.internal.plugin.JptJpaCoreTestsPlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/build.properties b/jpa/tests/org.eclipse.jpt.jpa.core.tests/build.properties
index 82227ce10..a51fcf90c 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/build.properties
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/build.properties
@@ -14,3 +14,5 @@ bin.includes = .,\
plugin.properties
source.. = src/
output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/pom.xml b/jpa/tests/org.eclipse.jpt.jpa.core.tests/pom.xml
index e3da57e7d..9796b50c7 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/pom.xml
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.core.tests</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
diff --git a/jpa/tests/org.eclipse.jpt.jpa.db.tests/META-INF/MANIFEST.MF b/jpa/tests/org.eclipse.jpt.jpa.db.tests/META-INF/MANIFEST.MF
index cf9613e90..96320cbd8 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.db.tests/META-INF/MANIFEST.MF
+++ b/jpa/tests/org.eclipse.jpt.jpa.db.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpa.db.tests;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.1.qualifier
Bundle-Activator: org.eclipse.jpt.jpa.db.tests.internal.plugin.JptJpaDbTestsPlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jpa/tests/org.eclipse.jpt.jpa.db.tests/build.properties b/jpa/tests/org.eclipse.jpt.jpa.db.tests/build.properties
index ba3874869..b0726dbc7 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.db.tests/build.properties
+++ b/jpa/tests/org.eclipse.jpt.jpa.db.tests/build.properties
@@ -14,3 +14,5 @@ bin.includes = .,\
plugin.properties,\
about.html,\
config/
+src.includes = *
+src.excludes = src
diff --git a/jpa/tests/org.eclipse.jpt.jpa.db.tests/pom.xml b/jpa/tests/org.eclipse.jpt.jpa.db.tests/pom.xml
index a5d7335f5..4d4070b10 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.db.tests/pom.xml
+++ b/jpa/tests/org.eclipse.jpt.jpa.db.tests/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.db.tests</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/META-INF/MANIFEST.MF b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/META-INF/MANIFEST.MF
index a5007f3b9..223901327 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/META-INF/MANIFEST.MF
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpa.eclipselink.core.tests;singleton:=true
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.4.1.qualifier
Bundle-Activator: org.eclipse.jpt.jpa.eclipselink.core.tests.internal.plugin.JptJpaEclipseLinkCoreTestsPlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/build.properties b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/build.properties
index 82227ce10..a51fcf90c 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/build.properties
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/build.properties
@@ -14,3 +14,5 @@ bin.includes = .,\
plugin.properties
source.. = src/
output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/pom.xml b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/pom.xml
index 1cec3fe69..9f449b825 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/pom.xml
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.eclipselink.core.tests</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
diff --git a/jpa/tests/org.eclipse.jpt.jpa.gen.tests/META-INF/MANIFEST.MF b/jpa/tests/org.eclipse.jpt.jpa.gen.tests/META-INF/MANIFEST.MF
index 40f8278d1..f05959c27 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.gen.tests/META-INF/MANIFEST.MF
+++ b/jpa/tests/org.eclipse.jpt.jpa.gen.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpa.gen.tests;singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Localization: plugin
diff --git a/jpa/tests/org.eclipse.jpt.jpa.gen.tests/build.properties b/jpa/tests/org.eclipse.jpt.jpa.gen.tests/build.properties
index 0473587c2..beb553202 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.gen.tests/build.properties
+++ b/jpa/tests/org.eclipse.jpt.jpa.gen.tests/build.properties
@@ -14,3 +14,5 @@ bin.includes = .,\
plugin.properties
source.. = src/
output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/jpa/tests/org.eclipse.jpt.jpa.gen.tests/pom.xml b/jpa/tests/org.eclipse.jpt.jpa.gen.tests/pom.xml
index 4cb8543b2..fa3301ffa 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.gen.tests/pom.xml
+++ b/jpa/tests/org.eclipse.jpt.jpa.gen.tests/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.gen.tests</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
diff --git a/jpa/tests/org.eclipse.jpt.jpa.ui.tests/META-INF/MANIFEST.MF b/jpa/tests/org.eclipse.jpt.jpa.ui.tests/META-INF/MANIFEST.MF
index d8e751d44..8d56eec47 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.ui.tests/META-INF/MANIFEST.MF
+++ b/jpa/tests/org.eclipse.jpt.jpa.ui.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpa.ui.tests;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.1.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Bundle-Localization: plugin
diff --git a/jpa/tests/org.eclipse.jpt.jpa.ui.tests/build.properties b/jpa/tests/org.eclipse.jpt.jpa.ui.tests/build.properties
index af0f798b8..a17b2efe4 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.ui.tests/build.properties
+++ b/jpa/tests/org.eclipse.jpt.jpa.ui.tests/build.properties
@@ -12,3 +12,5 @@ output.. = bin/
bin.includes = .,\
META-INF/,\
plugin.properties
+src.includes = *
+src.excludes = src
diff --git a/jpa/tests/org.eclipse.jpt.jpa.ui.tests/pom.xml b/jpa/tests/org.eclipse.jpt.jpa.ui.tests/pom.xml
index e03d5873a..34046e408 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.ui.tests/pom.xml
+++ b/jpa/tests/org.eclipse.jpt.jpa.ui.tests/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpa.ui.tests</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/.project b/jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.releng/.project
index 6e0c0bbbf..6e0c0bbbf 100644
--- a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/.project
+++ b/jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.releng/.project
diff --git a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml b/jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml
index cb0072746..cb0072746 100644
--- a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml
+++ b/jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml
diff --git a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/resources/javax.persistence_2.0.4.v201112161009.jar b/jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.releng/resources/javax.persistence_2.0.4.v201112161009.jar
index 44d63b735..44d63b735 100644
--- a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/resources/javax.persistence_2.0.4.v201112161009.jar
+++ b/jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.releng/resources/javax.persistence_2.0.4.v201112161009.jar
Binary files differ
diff --git a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository/.project b/jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.repository/.project
index 42ea5b1b4..42ea5b1b4 100644
--- a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository/.project
+++ b/jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.repository/.project
diff --git a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository/category.xml b/jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.repository/category.xml
index 14579de55..14579de55 100644
--- a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository/category.xml
+++ b/jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.repository/category.xml
diff --git a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository/pom.xml b/jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.repository/pom.xml
index fa7e4b152..fa7e4b152 100644
--- a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository/pom.xml
+++ b/jpa_diagram_editor/DEPRECATED/org.eclipse.jpt.jpadiagrameditor.repository/pom.xml
diff --git a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/feature.xml b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/feature.xml
index 9d9cfe26e..06ca7be3e 100644
--- a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/feature.xml
+++ b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jpt.jpadiagrameditor_sdk.feature"
label="%featureName"
- version="1.2.200.qualifier"
+ version="1.2.201.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
@@ -19,12 +19,7 @@
%license
</license>
- <includes
- id="org.eclipse.jpt.jpadiagrameditor.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jpt.jpadiagrameditor.feature.source"
- version="0.0.0"/>
-
+ <requires>
+ <import feature="org.eclipse.jpt.jpadiagrameditor.feature"/>
+ </requires>
</feature>
diff --git a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/pom.xml b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/pom.xml
index 2ea281b6a..f674a084e 100644
--- a/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/pom.xml
+++ b/jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpadiagrameditor_sdk.feature</artifactId>
- <version>1.2.200-SNAPSHOT</version>
+ <version>1.2.201-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.branding/META-INF/MANIFEST.MF b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.branding/META-INF/MANIFEST.MF
index b173bdfc4..3dde4e523 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.branding/META-INF/MANIFEST.MF
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.branding/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jpt.jpadiagrameditor.branding;singleton:=true
-Bundle-Version: 1.2.101.qualifier
+Bundle-Version: 1.2.102.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %providerName
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.branding/build.properties b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.branding/build.properties
index b72965173..4a1363f32 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.branding/build.properties
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.branding/build.properties
@@ -5,3 +5,7 @@ bin.includes = META-INF/,\
about.properties,\
icons/,\
plugin.properties
+source.. = src/
+output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.branding/pom.xml b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.branding/pom.xml
index 44d9252fd..277bfdbcb 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.branding/pom.xml
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.branding/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpadiagrameditor.branding</artifactId>
- <version>1.2.101-SNAPSHOT</version>
+ <version>1.2.102-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<name>JPA Diagram Editor Branding Plug-in</name>
</project>
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.doc.user/META-INF/MANIFEST.MF b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.doc.user/META-INF/MANIFEST.MF
index 6c0a4ec40..4d0e5f3c9 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.doc.user/META-INF/MANIFEST.MF
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.doc.user/META-INF/MANIFEST.MF
@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpadiagrameditor.doc.user; singleton:=true
-Bundle-Version: 1.2.101.qualifier
+Bundle-Version: 1.2.102.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.help;bundle-version="[3.3.100,4.0.0)"
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.doc.user/build.properties b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.doc.user/build.properties
index 1601fbdf7..61405240c 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.doc.user/build.properties
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.doc.user/build.properties
@@ -6,12 +6,8 @@ bin.includes = .,\
plugin.xml,\
html/,\
*.xml
-src.includes = about.html,\
- plugin.xml,\
- plugin.properties,\
- build.xml,\
- html/,\
- img/,\
- pom.xml,\
- toc.xml
+source.. = src/
+output.. = bin/
+src.includes = *
+src.excludes = src
generateSourceBundle=false
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.doc.user/pom.xml b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.doc.user/pom.xml
index 10f6daeec..2ea299e1c 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.doc.user/pom.xml
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.doc.user/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpadiagrameditor.doc.user</artifactId>
- <version>1.2.101-SNAPSHOT</version>
+ <version>1.2.102-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<name>JPA Diagram Editor Branding Plug-in</name>
</project>
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/META-INF/MANIFEST.MF b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/META-INF/MANIFEST.MF
index 7fc61665d..3322d0b7d 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/META-INF/MANIFEST.MF
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpadiagrameditor.ui;singleton:=true
-Bundle-Version: 1.2.200.qualifier
+Bundle-Version: 1.2.201.qualifier
Bundle-Activator: org.eclipse.jpt.jpadiagrameditor.ui.internal.JPADiagramEditorPlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/build.properties b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/build.properties
index e418f5df8..616ee9bd2 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/build.properties
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/build.properties
@@ -9,6 +9,8 @@
###############################################################################
source.. = src/
output.. = bin/
+src.includes = *
+src.excludes = src
bin.includes = .,\
META-INF/,\
about.html,\
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/pom.xml b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/pom.xml
index 1d5625c04..491a52a91 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/pom.xml
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpadiagrameditor.ui</artifactId>
- <version>1.2.200-SNAPSHOT</version>
+ <version>1.2.201-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<name>JPA Diagram Editor Plug-in</name>
</project> \ No newline at end of file
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/META-INF/MANIFEST.MF b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/META-INF/MANIFEST.MF
index 556c01ec3..eb3bc99c7 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/META-INF/MANIFEST.MF
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpadiagrameditor.swtbot.tests;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.eclipse.jpt.jpadiagrameditor.swtbot.tests.internal.JPAEditorTestsActivator
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/build.properties b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/build.properties
index 41eb6ade2..21e4d8b20 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/build.properties
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/build.properties
@@ -2,3 +2,5 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
+src.includes = *
+src.excludes = src
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/pom.xml b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/pom.xml
index d36634e4c..40d4f3119 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/pom.xml
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpadiagrameditor.swtbot.tests</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<name>JPA Diagram Editor SWTBot Test Plug-in</name>
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/META-INF/MANIFEST.MF b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/META-INF/MANIFEST.MF
index f701c4ff0..faf7a341f 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/META-INF/MANIFEST.MF
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.jpadiagrameditor.ui.tests;singleton:=true
-Bundle-Version: 1.2.101.qualifier
+Bundle-Version: 1.2.102.qualifier
Bundle-Activator: org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.JPAEditorTestsActivator
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/build.properties b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/build.properties
index 59add7e2e..8b1cfad8b 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/build.properties
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/build.properties
@@ -14,3 +14,5 @@ bin.includes = .,\
plugin.properties
source.. = src/
output.. = bin/
+src.includes = *
+src.excludes = src
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/pom.xml b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/pom.xml
index 955ced2a5..207d42a8c 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/pom.xml
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.eclipse.webtools.dali</groupId>
<artifactId>org.eclipse.jpt.jpadiagrameditor.ui.tests</artifactId>
- <version>1.2.101-SNAPSHOT</version>
+ <version>1.2.102-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<name>JPA Diagram Editor Test Plug-in</name>
diff --git a/pom.xml b/pom.xml
index 6a7c98686..130bdde10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,6 +106,7 @@
<module>common/plugins/org.eclipse.jpt.common.utility</module>
<module>common/tests/org.eclipse.jpt.common.core.tests</module>
+ <module>common/tests/org.eclipse.jpt.common.ui.tests</module>
<module>common/tests/org.eclipse.jpt.common.utility.tests</module>
<!-- jaxb -->
@@ -160,12 +161,13 @@
<!-- disable tests that don't currently work and are not currently RUN as part of the releng.aggregator build -->
<!-- <module>jpa/tests/org.eclipse.jpt.jpa.core.tests</module> -->
<module>jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource</module>
- <!-- disable this test since it requires org.eclipse.jpt.jpa.core.tests -->
+ <!-- disable these since they require org.eclipse.jpt.jpa.core.tests -->
<!-- <module>jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests</module> -->
+ <!-- <module>jpa/tests/org.eclipse.jpt.jpa.ui.tests</module> -->
+ <!-- fails in Jenkins, works locally <module>jpa/tests/org.eclipse.jpt.jpa.gen.tests</module> -->
+ <module>jpa/tests/org.eclipse.jpt.jpa.db.tests</module>
<!-- jpa_diagram_editor -->
- <module>jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.repository</module>
-
<module>jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.feature</module>
<module>jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor_sdk.feature</module>
<module>jpa_diagram_editor/features/org.eclipse.jpt.jpadiagrameditor.tests.feature</module>
@@ -175,6 +177,7 @@
<module>jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui</module>
<module>jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests</module>
+ <!-- compilation failure <module>jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests</module> -->
<module>site</module>
diff --git a/site/category.xml b/site/category.xml
index 1d437cbb9..6e8875411 100644
--- a/site/category.xml
+++ b/site/category.xml
@@ -1,103 +1,129 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
-
- <feature id="org.eclipse.jpt.assembly.feature"><category name="dali"/></feature>
- <feature id="org.eclipse.jpt_sdk.assembly.feature"><category name="dali.sdk"/></feature>
- <feature id="org.eclipse.jpt.tests.assembly.feature"><category name="dali"/></feature>
-
- <!-- common -->
- <feature id="org.eclipse.jpt.common.eclipselink.feature"><category name="dali"/></feature>
- <feature id="org.eclipse.jpt.common.eclipselink_sdk.feature"><category name="dali.sdk"/></feature>
- <feature id="org.eclipse.jpt.common.feature"><category name="dali"/></feature>
- <feature id="org.eclipse.jpt.common_sdk.feature"><category name="dali.sdk"/></feature>
- <feature id="org.eclipse.jpt.common.tests.feature"><category name="dali"/></feature>
-
- <bundle id="org.eclipse.jpt.common.branding"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.common.core"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.common.eclipselink.branding"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.common.eclipselink.core"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.common.ui"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.common.utility"><category name="dali"/></bundle>
-
- <bundle id="org.eclipse.jpt.common.core.tests"><category name="dali.tests"/></bundle>
- <bundle id="org.eclipse.jpt.common.utility.tests"><category name="dali.tests"/></bundle>
-
- <!-- jaxb -->
- <feature id="org.eclipse.jpt.dbws.eclipselink.feature"><category name="dali"/></feature>
- <feature id="org.eclipse.jpt.dbws.eclipselink_sdk.feature"><category name="dali.sdk"/></feature>
- <feature id="org.eclipse.jpt.jaxb.eclipselink.feature"><category name="dali"/></feature>
- <feature id="org.eclipse.jpt.jaxb.eclipselink_sdk.feature"><category name="dali.sdk"/></feature>
- <feature id="org.eclipse.jpt.jaxb.eclipselink.tests.feature"><category name="dali"/></feature>
- <feature id="org.eclipse.jpt.jaxb.feature"><category name="dali"/></feature>
- <feature id="org.eclipse.jpt.jaxb_sdk.feature"><category name="dali.sdk"/></feature>
- <feature id="org.eclipse.jpt.jaxb.tests.feature"><category name="dali"/></feature>
-
- <bundle id="org.eclipse.jpt.dbws.eclipselink.branding"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.dbws.eclipselink.core.gen"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.dbws.eclipselink.ui"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jaxb.branding"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jaxb.core"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jaxb.core.schemagen"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jaxb.eclipselink.branding"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jaxb.eclipselink.core"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jaxb.eclipselink.core.schemagen"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jaxb.eclipselink.ui"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jaxb.ui"><category name="dali"/></bundle>
+ <bundle id="org.eclipse.jpt.common.branding"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.common.core"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.common.core.tests"><category name="wtp.tests"/></bundle>
+ <bundle id="org.eclipse.jpt.common.eclipselink.branding"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.common.eclipselink.core"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.common.ui"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.common.ui.tests"><category name="wtp.tests"/></bundle>
+ <bundle id="org.eclipse.jpt.common.utility"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.common.utility.tests"><category name="wtp.tests"/></bundle>
+ <bundle id="org.eclipse.jpt.dbws.eclipselink.branding"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.dbws.eclipselink.core.gen"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.dbws.eclipselink.ui"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.doc.isv"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.doc.user"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jaxb.branding"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jaxb.core"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jaxb.core.schemagen"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jaxb.eclipselink.branding"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jaxb.eclipselink.core"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jaxb.eclipselink.core.schemagen"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jaxb.eclipselink.ui"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jaxb.ui"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.annotate"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.branding"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.core"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.core.tests.extension.resource"><category name="wtp.tests"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.db"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.db.tests"><category name="wtp.tests"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.db.ui"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.eclipselink.branding"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.eclipselink.core"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.eclipselink.core.ddlgen"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.eclipselink.ui"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.gen"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.ui"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jpadiagrameditor.branding"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jpadiagrameditor.doc.user"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jpadiagrameditor.ui"><category name="wtp"/></bundle>
+ <bundle id="org.eclipse.jpt.jpadiagrameditor.ui.tests"><category name="wtp.tests"/></bundle>
+ <feature id="org.eclipse.jpt.assembly.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.jpt.common.eclipselink.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.jpt.common.eclipselink_sdk.feature"><category name="wtp.sdk"/></feature>
+ <feature id="org.eclipse.jpt.common.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.jpt.common.tests.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.jpt.common_sdk.feature"><category name="wtp.sdk"/></feature>
+ <feature id="org.eclipse.jpt.dbws.eclipselink.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.jpt.dbws.eclipselink_sdk.feature"><category name="wtp.sdk"/></feature>
+ <feature id="org.eclipse.jpt.jaxb.eclipselink.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.jpt.jaxb.eclipselink.tests.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.jpt.jaxb.eclipselink_sdk.feature"><category name="wtp.sdk"/></feature>
+ <feature id="org.eclipse.jpt.jaxb.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.jpt.jaxb.tests.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.jpt.jaxb_sdk.feature"><category name="wtp.sdk"/></feature>
+ <feature id="org.eclipse.jpt.jpa.eclipselink.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.jpt.jpa.eclipselink_sdk.feature"><category name="wtp.sdk"/></feature>
+ <feature id="org.eclipse.jpt.jpa.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.jpt.jpa.tests.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.jpt.jpa_sdk.feature"><category name="wtp.sdk"/></feature>
+ <feature id="org.eclipse.jpt.jpadiagrameditor.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.jpt.jpadiagrameditor.tests.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.jpt.jpadiagrameditor_sdk.feature"><category name="wtp.sdk"/></feature>
+ <feature id="org.eclipse.jpt.tests.assembly.feature"><category name="wtp"/></feature>
+ <feature id="org.eclipse.jpt_sdk.assembly.feature"><category name="wtp.sdk"/></feature>
<!-- disable tests that don't currently work and are not currently RUN as part of the releng.aggregator build -->
- <!-- <bundle id="org.eclipse.jpt.jaxb.core.tests"><category name="dali.tests"/></bundle> -->
- <!-- <bundle id="org.eclipse.jpt.jaxb.eclipselink.core.tests"><category name="dali.tests"/></bundle> -->
-
- <!-- jpa -->
- <feature id="org.eclipse.jpt.jpa.eclipselink.feature"><category name="dali"/></feature>
- <feature id="org.eclipse.jpt.jpa.eclipselink_sdk.feature"><category name="dali.sdk"/></feature>
- <!-- disable this test feature since it requires org.eclipse.jpt.jpa.eclipselink.core.tests and org.eclipse.jpt.jpa.core.tests -->
- <!-- <feature id="org.eclipse.jpt.jpa.eclipselink.tests.feature"><category name="dali"/></feature> -->
- <feature id="org.eclipse.jpt.jpa.feature"><category name="dali"/></feature>
- <feature id="org.eclipse.jpt.jpa_sdk.feature"><category name="dali.sdk"/></feature>
- <feature id="org.eclipse.jpt.jpa.tests.feature"><category name="dali"/></feature>
-
- <bundle id="org.eclipse.jpt.doc.isv"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.doc.user"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jpa.annotate"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jpa.branding"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jpa.core"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jpa.db"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jpa.db.ui"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jpa.eclipselink.branding"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jpa.eclipselink.core"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jpa.eclipselink.core.ddlgen"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jpa.eclipselink.ui"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jpa.gen"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jpa.ui"><category name="dali"/></bundle>
-
- <!-- disable tests that don't currently work and are not currently RUN as part of the releng.aggregator build -->
- <!-- <bundle id="org.eclipse.jpt.jpa.core.tests"><category name="dali.tests"/></bundle> -->
- <bundle id="org.eclipse.jpt.jpa.core.tests.extension.resource"><category name="dali.tests"/></bundle>
- <!-- disable this test since it requires org.eclipse.jpt.jpa.core.tests -->
- <!-- <bundle id="org.eclipse.jpt.jpa.eclipselink.core.tests"><category name="dali.tests"/></bundle> -->
-
- <!-- jpa_diagram_editor -->
- <feature id="org.eclipse.jpt.jpadiagrameditor.feature"><category name="dali"/></feature>
- <feature id="org.eclipse.jpt.jpadiagrameditor_sdk.feature"><category name="dali.sdk"/></feature>
- <feature id="org.eclipse.jpt.jpadiagrameditor.tests.feature"><category name="dali"/></feature>
-
- <bundle id="org.eclipse.jpt.jpadiagrameditor.branding"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jpadiagrameditor.doc.user"><category name="dali"/></bundle>
- <bundle id="org.eclipse.jpt.jpadiagrameditor.ui"><category name="dali"/></bundle>
-
- <bundle id="org.eclipse.jpt.jpadiagrameditor.ui.tests"><category name="dali.tests"/></bundle>
-
-
- <category-def name="dali" label="WTP Dali Persistence"><description>
- Web Tools Platform (WTP) Dali Persistence
- </description></category-def>
- <category-def name="dali.sdk" label="WTP Dali Persistence - Docs and SDKs"><description>
- Web Tools Platform (WTP) Dali Persistence - Docs and SDKs
- </description></category-def>
- <category-def name="dali.tests" label="WTP Dali Persistence - Tests"><description>
- Web Tools Platform (WTP) Dali Persistence - Tests
- </description></category-def>
+ <!-- <bundle id="org.eclipse.jpt.jaxb.core.tests"><category name="wtp.tests"/></bundle> -->
+ <!-- <bundle id="org.eclipse.jpt.jpa.core.tests"><category name="wtp.tests"/></bundle> -->
+ <!-- <bundle id="org.eclipse.jpt.jpa.eclipselink.core.tests"><category name="wtp.tests"/></bundle> -->
+ <!-- <bundle id="org.eclipse.jpt.jpa.ui.tests"><category name="wtp.tests"/></bundle> -->
+ <!-- <feature id="org.eclipse.jpt.jpa.eclipselink.tests.feature"><category name="wtp.tests"/></feature> -->
+
+ <bundle id="org.eclipse.jpt.common.core.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.common.core.tests.source"><category name="wtp.tests.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.common.eclipselink.core.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.common.ui.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.common.ui.tests.source"><category name="wtp.tests.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.common.utility.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.common.utility.tests.source"><category name="wtp.tests.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.dbws.eclipselink.core.gen.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.dbws.eclipselink.ui.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.doc.isv.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.doc.user.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jaxb.core.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jaxb.core.schemagen.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jaxb.eclipselink.core.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jaxb.eclipselink.core.schemagen.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jaxb.eclipselink.ui.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jaxb.ui.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.annotate.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.core.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.core.tests.extension.resource.source"><category name="wtp.tests.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.db.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.db.tests.source"><category name="wtp.tests.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.db.ui.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.eclipselink.core.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.eclipselink.core.ddlgen.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.eclipselink.ui.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.gen.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jpa.ui.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jpadiagrameditor.doc.user.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jpadiagrameditor.ui.source"><category name="wtp.sources"/></bundle>
+ <bundle id="org.eclipse.jpt.jpadiagrameditor.ui.tests.source"><category name="wtp.tests.sources"/></bundle>
+ <feature id="org.eclipse.jpt.common.eclipselink.feature.source"><category name="wtp.sources"/></feature>
+ <feature id="org.eclipse.jpt.common.feature.source"><category name="wtp.sources"/></feature>
+ <feature id="org.eclipse.jpt.dbws.eclipselink.feature.source"><category name="wtp.sources"/></feature>
+ <feature id="org.eclipse.jpt.jaxb.eclipselink.feature.source"><category name="wtp.sources"/></feature>
+
+ <category-def name="wtp" label="Web Tools Platform (WTP)"><description>These features provide functionality with the executable code only and are recommended for most users.</description></category-def>
+ <category-def name="wtp.sdk" label="Web Tools Platform SDK (WTP SDK)"><description>These features provide functionality with the executable code and the source code and are recommended for those extending or debugging WTP.</description></category-def>
+
+ <category-def name="wtp.sources" label="Web Tools Platform (WTP) Sources"><description>These features provide sources.</description></category-def>
+ <category-def name="wtp.sdk.sources" label="Web Tools Platform SDK (WTP SDK) Sources"><description>These features provide sources.</description></category-def>
+
+ <category-def name="wtp.bundles" label="Web Tools Platform (WTP) Bundles"><description>These bundles are most likely include in features, but are provided here for completeness.</description></category-def>
+ <category-def name="wtp.bundles.sdk" label="Web Tools Platform SDK (WTP SDK) Bundles"><description>These bundles are most likely include in features, but are provided here for completeness.</description></category-def>
+
+ <category-def name="wtp.bundles.sources" label="Web Tools Platform (WTP) Bundle Sources"><description>These bundles provide sources.</description></category-def>
+ <category-def name="wtp.bundles.sdk.sources" label="Web Tools Platform SDK (WTP SDK) Bundle Sources"><description>These bundles provide sources.</description></category-def>
+
+ <category-def name="wtp.incubation" label="Web Tools Platform (WTP) Incubation"><description>These features provide incubating functionality with the executable code only and are recommended for most users.</description></category-def>
+ <category-def name="wtp.incubation.sources" label="Web Tools Platform (WTP) Incubation Sources"><description>These features provide incubating sources.</description></category-def>
+
+ <category-def name="wtp.tests" label="Web Tools Platform Tests (WTP Tests)"><description>These features provide unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least their PDE Targets.</description></category-def>
+ <category-def name="wtp.tests.sources" label="Web Tools Platform Tests (WTP Tests) Sources"><description>These sources provide unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least their PDE Targets.</description></category-def>
</site>