Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'assembly/features')
-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
6 files changed, 35 insertions, 94 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>
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 63a9e741b3..0d18a31cfc 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 acfe1eaf23..b1765c9f52 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 d1f1637c07..6de26d2488 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 7f0afd1ea9..640b04d651 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>

Back to the top