[releng] Using eclipse-target-definition packaging now.refs/changes/15/8515/2

Change-Id: I12e5e94321a38bd46c6016170d785ffd03037317

7 files changed, 60 insertions, 64 deletions

diff --git a/etc/targets/pom.xml b/etc/targets/pom.xml
deleted file mode 100644
index 483cb1a..0000000
--- a/etc/targets/pom.xml
+++ b/dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"

-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-	<parent>

-		<groupId>org.eclipse.recommenders</groupId>

-		<artifactId>org.eclipse.recommenders.parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>

-	<modelVersion>4.0.0</modelVersion>

-	<artifactId>targets</artifactId>

-	<packaging>pom</packaging>

-

-	<build>

-		<plugins>

-			<plugin>

-				<groupId>org.codehaus.mojo</groupId>

-				<artifactId>build-helper-maven-plugin</artifactId>

-				<executions>

-					<execution>

-						<id>attach-artifacts</id>

-						<phase>package</phase>

-						<goals>

-							<goal>attach-artifact</goal>

-						</goals>

-						<configuration>

-							<artifacts>

-								<!-- artifact>

-									<file>e37.target</file>

-									<type>target</type>

-									<classifier>e37</classifier>

-								</artifact -->

-                                <artifact>

-                                    <file>e3x.target</file>

-                                    <type>target</type>

-                                    <classifier>e3x</classifier>

-                                </artifact>

-								<artifact>

-									<file>e42.target</file>

-									<type>target</type>

-									<classifier>e42</classifier>

-								</artifact>

-							</artifacts>

-						</configuration>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

-</project>

diff --git a/pom.xml b/pom.xml
index dd4385a..a6b3d3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 	</properties>

 	<modules>

 		<module>etc/licenses</module>

-		<module>etc/targets</module>

+		<module>targets</module>

 		<module>plugins</module>

 		<module>tests</module>

 		<module>features</module>

@@ -49,14 +49,12 @@
 					<plugin>

 						<groupId>org.eclipse.tycho</groupId>

 						<artifactId>target-platform-configuration</artifactId>

-						<version>${tycho-version}</version>

 						<configuration>

 							<target>

 								<artifact>

-									<groupId>org.eclipse.recommenders</groupId>

-									<artifactId>targets</artifactId>

+									<groupId>org.eclipse.recommenders.target</groupId>

+									<artifactId>e3x</artifactId>

 									<version>${recommenders-version}</version>

-									<classifier>e3x</classifier>

 								</artifact>

 							</target>

 						</configuration>

@@ -74,14 +72,12 @@
 					<plugin>

 						<groupId>org.eclipse.tycho</groupId>

 						<artifactId>target-platform-configuration</artifactId>

-						<version>${tycho-version}</version>

 						<configuration>

 							<target>

 								<artifact>

-									<groupId>org.eclipse.recommenders</groupId>

-									<artifactId>targets</artifactId>

+									<groupId>org.eclipse.recommenders.target</groupId>

+									<artifactId>e42</artifactId>

 									<version>${recommenders-version}</version>

-									<classifier>e42</classifier>

 								</artifact>

 							</target>

 						</configuration>

@@ -96,14 +92,12 @@
 					<plugin>

 						<groupId>org.eclipse.tycho</groupId>

 						<artifactId>target-platform-configuration</artifactId>

-						<version>${tycho-version}</version>

 						<configuration>

 							<target>

 								<artifact>

-									<groupId>org.eclipse.recommenders</groupId>

-									<artifactId>targets</artifactId>

+									<groupId>org.eclipse.recommenders.target</groupId>

+									<artifactId>e43</artifactId>

 									<version>${recommenders-version}</version>

-									<classifier>e42</classifier>

 								</artifact>

 							</target>

 						</configuration>

@@ -117,7 +111,6 @@
 			<plugin>

 				<groupId>org.eclipse.tycho</groupId>

 				<artifactId>tycho-maven-plugin</artifactId>

-				<version>${tycho-version}</version>

 				<extensions>true</extensions>

 			</plugin>

 			<plugin>

@@ -145,6 +138,11 @@
 			<plugins>

 				<plugin>

 					<groupId>org.eclipse.tycho</groupId>

+					<artifactId>target-platform-configuration</artifactId>

+					<version>${tycho-version}</version>

+				</plugin>

+				<plugin>

+					<groupId>org.eclipse.tycho</groupId>

 					<artifactId>tycho-maven-plugin</artifactId>

 					<version>${tycho-version}</version>

 				</plugin>

diff --git a/etc/targets/e3x.target b/targets/e3x/e3x.target
index 7394b0d..7394b0d 100644
--- a/etc/targets/e3x.target
+++ b/targets/e3x/e3x.target
diff --git a/targets/e3x/pom.xml b/targets/e3x/pom.xml
new file mode 100644
index 0000000..5f75add
--- a/dev/null
+++ b/targets/e3x/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.recommenders.target</groupId>
+		<artifactId>targets</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<artifactId>e3x</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	<name>Eclipse 3.x Target Definition</name>
+</project>
+
diff --git a/etc/targets/e42.target b/targets/e42/e42.target
index a3d51e6..a3d51e6 100644
--- a/etc/targets/e42.target
+++ b/targets/e42/e42.target
diff --git a/targets/e42/pom.xml b/targets/e42/pom.xml
new file mode 100644
index 0000000..4c20565
--- a/dev/null
+++ b/targets/e42/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.recommenders.target</groupId>
+		<artifactId>targets</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<artifactId>e42</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	<name>Eclipse 4.2 Target Definition</name>
+</project>
+
diff --git a/targets/pom.xml b/targets/pom.xml
new file mode 100644
index 0000000..3203cd4
--- a/dev/null
+++ b/targets/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.recommenders</groupId>
+		<artifactId>org.eclipse.recommenders.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<groupId>org.eclipse.recommenders.target</groupId>
+	<artifactId>targets</artifactId>
+	<packaging>pom</packaging>
+	<modules>
+		<module>e3x</module>
+		<module>e42</module>
+	</modules>
+</project>