Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornickboldt2018-02-28 22:23:45 +0000
committernickboldt2018-03-01 22:10:40 +0000
commitec818afc1cec38bd51a7db2525fc85b909d002f8 (patch)
tree07ecb516cdf3f038eece27d8c411b3eff890bc7f /assembly/features/org.eclipse.jpt.assembly.feature
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>
Diffstat (limited to 'assembly/features/org.eclipse.jpt.assembly.feature')
-rw-r--r--assembly/features/org.eclipse.jpt.assembly.feature/feature.xml43
-rw-r--r--assembly/features/org.eclipse.jpt.assembly.feature/pom.xml2
2 files changed, 12 insertions, 33 deletions
diff --git a/assembly/features/org.eclipse.jpt.assembly.feature/feature.xml b/assembly/features/org.eclipse.jpt.assembly.feature/feature.xml
index 32e0f54924..58cf24888d 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 3008daeeaa..04c494a30e 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>

Back to the top