Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorUwe Stieber2015-02-02 04:38:45 -0500
committerUwe Stieber2015-02-02 04:38:45 -0500
commit24f0cfded528d8c8c9ba35cf737e93955b67bc95 (patch)
tree95e125130bb3114e0f04982f0a78c7e017bbec9e /admin
parent79a9a887192d7c35ff37018704db924e5793bbed (diff)
downloadorg.eclipse.tcf-24f0cfded528d8c8c9ba35cf737e93955b67bc95.tar.gz
org.eclipse.tcf-24f0cfded528d8c8c9ba35cf737e93955b67bc95.tar.xz
org.eclipse.tcf-24f0cfded528d8c8c9ba35cf737e93955b67bc95.zip
Releng: Streamline pom file hierarchy and fix target configuration if building with tests
Diffstat (limited to 'admin')
-rw-r--r--admin/pom-build.xml36
-rw-r--r--admin/target-defs/eclipse-4.4.x-luna.target13
2 files changed, 8 insertions, 41 deletions
diff --git a/admin/pom-build.xml b/admin/pom-build.xml
index 791dc48e1..c9a16929c 100644
--- a/admin/pom-build.xml
+++ b/admin/pom-build.xml
@@ -80,6 +80,7 @@
<build>
<plugins>
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
@@ -107,41 +108,6 @@
<id>org.eclipse.swtbot.eclipse</id>
<versionRange>0.0.0</versionRange>
</requirement>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.tcf.core.feature</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.tcf.feature</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.tcf.cdt.feature</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.tcf.te.feature</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.tcf.te.tcf.core.feature</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.tcf.te.tcf.feature</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.tcf.te.tcf.remote.feature</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
diff --git a/admin/target-defs/eclipse-4.4.x-luna.target b/admin/target-defs/eclipse-4.4.x-luna.target
index b4197e082..44779d87e 100644
--- a/admin/target-defs/eclipse-4.4.x-luna.target
+++ b/admin/target-defs/eclipse-4.4.x-luna.target
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse 4.4.x (Luna)" sequenceNumber="55">
+<?pde version="3.8"?><target name="Eclipse 4.4.x (Luna)" sequenceNumber="60">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
@@ -15,11 +15,6 @@
<repository location="http://download.eclipse.org/technology/swtbot/releases/latest"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.rse.feature.group" version="3.5.0.201406091451"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.10.1.v20140901-1055"/>
-<repository location="http://download.eclipse.org/releases/luna"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
<repository location="http://download.eclipse.org/cbi/updates/license"/>
</location>
@@ -45,5 +40,11 @@
<unit id="org.eclipse.test.feature.group" version="3.6.100.v20140528-1640"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.4"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.remote.feature.group" version="1.1.0.201409111520"/>
+<unit id="org.eclipse.rse.feature.group" version="3.5.0.201406091451"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.10.1.v20140901-1055"/>
+<repository location="http://download.eclipse.org/releases/luna"/>
+</location>
</locations>
</target>

Back to the top