diff options
11 files changed, 44 insertions, 85 deletions
diff --git a/assembly/features/org.eclipse.jpt.assembly.feature/feature.xml b/assembly/features/org.eclipse.jpt.assembly.feature/feature.xml index 256051a1e6..eb5e52803e 100644 --- a/assembly/features/org.eclipse.jpt.assembly.feature/feature.xml +++ b/assembly/features/org.eclipse.jpt.assembly.feature/feature.xml @@ -26,6 +26,14 @@ </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"/> 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 bcdbd81875..9bbdf953d2 100644 --- a/assembly/features/org.eclipse.jpt.tests.assembly.feature/feature.xml +++ b/assembly/features/org.eclipse.jpt.tests.assembly.feature/feature.xml @@ -24,6 +24,10 @@ </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"/> 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 fff471a1d5..91dbc3a498 100644 --- a/assembly/features/org.eclipse.jpt_sdk.assembly.feature/feature.xml +++ b/assembly/features/org.eclipse.jpt_sdk.assembly.feature/feature.xml @@ -26,6 +26,14 @@ </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"/> diff --git a/jaxb/features/org.eclipse.jpt.dbws.eclipselink.feature/feature.xml b/jaxb/features/org.eclipse.jpt.dbws.eclipselink.feature/feature.xml index 4386aac3f6..291ce5bb8f 100644 --- a/jaxb/features/org.eclipse.jpt.dbws.eclipselink.feature/feature.xml +++ b/jaxb/features/org.eclipse.jpt.dbws.eclipselink.feature/feature.xml @@ -20,36 +20,19 @@ %license </license> - <plugin - id="org.eclipse.jpt.common.utility" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.jpt.common.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + <requires> + <import feature="org.eclipse.jpt.common.eclipselink.feature" version="1.0.0"/> + </requires> <plugin - id="org.eclipse.jpt.common.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.jpt.common.eclipselink.core" + id="org.eclipse.jpt.dbws.eclipselink.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.eclipse.jpt.dbws.eclipselink.ui" + id="org.eclipse.jpt.dbws.eclipselink.core.gen" download-size="0" install-size="0" version="0.0.0" @@ -59,13 +42,6 @@ id="javax.wsdl" version="1.6.2.qualifier" unpack="false"/> - - <plugin - id="org.eclipse.jpt.dbws.eclipselink.core.gen" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> <plugin id="org.eclipse.persistence.asm" diff --git a/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.feature/feature.xml b/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.feature/feature.xml index a1c3352075..bbd47e91bf 100644 --- a/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.feature/feature.xml +++ b/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.feature/feature.xml @@ -21,8 +21,8 @@ </license> <requires> - <import feature="org.eclipse.jpt.jaxb.feature" version="1.0.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.jpt.common.eclipselink.core" version="1.0.0" match="greaterOrEqual"/> + <import feature="org.eclipse.jpt.jaxb.feature" version="1.0.0"/> + <import feature="org.eclipse.jpt.common.eclipselink.feature" version="1.0.0"/> </requires> <plugin diff --git a/jaxb/features/org.eclipse.jpt.jaxb.feature/feature.xml b/jaxb/features/org.eclipse.jpt.jaxb.feature/feature.xml index e4e52a6f4c..6e3e384bea 100644 --- a/jaxb/features/org.eclipse.jpt.jaxb.feature/feature.xml +++ b/jaxb/features/org.eclipse.jpt.jaxb.feature/feature.xml @@ -20,26 +20,9 @@ %license </license> - <plugin - id="org.eclipse.jpt.common.utility" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.jpt.common.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.jpt.common.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> + <requires> + <import feature="org.eclipse.jpt.common.feature" version="1.0.0"/> + </requires> <plugin id="org.eclipse.jpt.jaxb.core" diff --git a/jaxb/features/org.eclipse.jpt.jaxb.tests.feature/feature.xml b/jaxb/features/org.eclipse.jpt.jaxb.tests.feature/feature.xml index b8ebee0ea0..fd2f44a33f 100644 --- a/jaxb/features/org.eclipse.jpt.jaxb.tests.feature/feature.xml +++ b/jaxb/features/org.eclipse.jpt.jaxb.tests.feature/feature.xml @@ -19,6 +19,10 @@ %license </license> + <requires> + <import feature="org.eclipse.jpt.common.tests.feature" version="1.0.0"/> + </requires> + <plugin id="org.eclipse.jpt.jaxb.core.tests" download-size="0" diff --git a/jpa/features/org.eclipse.jpt.jpa.eclipselink.feature/feature.xml b/jpa/features/org.eclipse.jpt.jpa.eclipselink.feature/feature.xml index c8ab9504fa..75789a35e0 100644 --- a/jpa/features/org.eclipse.jpt.jpa.eclipselink.feature/feature.xml +++ b/jpa/features/org.eclipse.jpt.jpa.eclipselink.feature/feature.xml @@ -21,8 +21,8 @@ </license> <requires> - <import feature="org.eclipse.jpt.jpa.feature" version="3.0.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.jpt.common.eclipselink.core" version="1.0.0" match="greaterOrEqual"/> + <import feature="org.eclipse.jpt.jpa.feature" version="3.0.0"/> + <import feature="org.eclipse.jpt.common.eclipselink.feature" version="1.0.0"/> </requires> <plugin diff --git a/jpa/features/org.eclipse.jpt.jpa.eclipselink.tests.feature/feature.xml b/jpa/features/org.eclipse.jpt.jpa.eclipselink.tests.feature/feature.xml index 5d6393e3aa..4e274e66b1 100644 --- a/jpa/features/org.eclipse.jpt.jpa.eclipselink.tests.feature/feature.xml +++ b/jpa/features/org.eclipse.jpt.jpa.eclipselink.tests.feature/feature.xml @@ -19,6 +19,10 @@ %license </license> + <requires> + <import feature="org.eclipse.jpt.common.tests.feature" version="1.0.0"/> + </requires> + <plugin id="org.eclipse.jpt.jpa.eclipselink.core.tests" download-size="0" diff --git a/jpa/features/org.eclipse.jpt.jpa.feature/feature.xml b/jpa/features/org.eclipse.jpt.jpa.feature/feature.xml index f06fdd8c9b..2eedc0027e 100644 --- a/jpa/features/org.eclipse.jpt.jpa.feature/feature.xml +++ b/jpa/features/org.eclipse.jpt.jpa.feature/feature.xml @@ -21,33 +21,13 @@ </license> <requires> + <import feature="org.eclipse.jpt.common.feature" version="1.0.0"/> <import feature="org.eclipse.datatools.enablement.feature" version="1.8.0"/> <import feature="org.eclipse.datatools.sqldevtools.feature" version="1.8.0"/> <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0"/> </requires> <plugin - id="org.eclipse.jpt.common.utility" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.jpt.common.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.jpt.common.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.jpt.jpa.core" download-size="0" install-size="0" diff --git a/jpa/features/org.eclipse.jpt.jpa.tests.feature/feature.xml b/jpa/features/org.eclipse.jpt.jpa.tests.feature/feature.xml index e7293a7025..20ae9b6364 100644 --- a/jpa/features/org.eclipse.jpt.jpa.tests.feature/feature.xml +++ b/jpa/features/org.eclipse.jpt.jpa.tests.feature/feature.xml @@ -19,17 +19,9 @@ %license </license> - <plugin - id="org.eclipse.jpt.common.core.tests" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.eclipse.jpt.common.utility.tests" - download-size="0" - install-size="0" - version="0.0.0"/> + <requires> + <import feature="org.eclipse.jpt.common.tests.feature" version="1.0.0"/> + </requires> <plugin id="org.eclipse.jpt.jpa.core.tests" |