Switch to pomless build. Change-Id: Ic7984f7e16c1278ca17f9410b4a0c4728d10454b Signed-off-by: Greg Watson <g.watson@computer.org>
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 0000000..022bbfa --- /dev/null +++ b/.mvn/extensions.xml
@@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<extensions> + <extension> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-pomless</artifactId> + <version>1.4.0</version> + </extension> +</extensions>
diff --git a/bundles/org.eclipse.remote.console/pom.xml b/bundles/org.eclipse.remote.console/pom.xml deleted file mode 100644 index 06e7a2b..0000000 --- a/bundles/org.eclipse.remote.console/pom.xml +++ /dev/null
@@ -1,16 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <artifactId>org.eclipse.remote.console</artifactId> - <packaging>eclipse-plugin</packaging> -<version>1.2.0-SNAPSHOT</version> -</project>
diff --git a/bundles/org.eclipse.remote.core/pom.xml b/bundles/org.eclipse.remote.core/pom.xml deleted file mode 100644 index db4ceb4..0000000 --- a/bundles/org.eclipse.remote.core/pom.xml +++ /dev/null
@@ -1,16 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <artifactId>org.eclipse.remote.core</artifactId> - <version>4.0.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> -</project>
diff --git a/bundles/org.eclipse.remote.jsch.core/pom.xml b/bundles/org.eclipse.remote.jsch.core/pom.xml deleted file mode 100644 index 81ff408..0000000 --- a/bundles/org.eclipse.remote.jsch.core/pom.xml +++ /dev/null
@@ -1,16 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <artifactId>org.eclipse.remote.jsch.core</artifactId> - <packaging>eclipse-plugin</packaging> -<version>1.0.0-SNAPSHOT</version> -</project>
diff --git a/bundles/org.eclipse.remote.proxy.core/pom.xml b/bundles/org.eclipse.remote.proxy.core/pom.xml deleted file mode 100644 index 532fe00..0000000 --- a/bundles/org.eclipse.remote.proxy.core/pom.xml +++ /dev/null
@@ -1,16 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <artifactId>org.eclipse.remote.proxy.core</artifactId> - <packaging>eclipse-plugin</packaging> -<version>1.0.0-SNAPSHOT</version> -</project>
diff --git a/bundles/org.eclipse.remote.proxy.protocol.core/pom.xml b/bundles/org.eclipse.remote.proxy.protocol.core/pom.xml deleted file mode 100644 index dc22a04..0000000 --- a/bundles/org.eclipse.remote.proxy.protocol.core/pom.xml +++ /dev/null
@@ -1,16 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <artifactId>org.eclipse.remote.proxy.protocol.core</artifactId> - <packaging>eclipse-plugin</packaging> -<version>2.0.0-SNAPSHOT</version> -</project>
diff --git a/bundles/org.eclipse.remote.proxy.server.core/pom.xml b/bundles/org.eclipse.remote.proxy.server.core/pom.xml deleted file mode 100644 index 36c61e0..0000000 --- a/bundles/org.eclipse.remote.proxy.server.core/pom.xml +++ /dev/null
@@ -1,16 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <artifactId>org.eclipse.remote.proxy.server.core</artifactId> - <packaging>eclipse-plugin</packaging> -<version>1.0.0-SNAPSHOT</version> -</project>
diff --git a/bundles/org.eclipse.remote.proxy.ui/pom.xml b/bundles/org.eclipse.remote.proxy.ui/pom.xml deleted file mode 100644 index f8b970d..0000000 --- a/bundles/org.eclipse.remote.proxy.ui/pom.xml +++ /dev/null
@@ -1,16 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <artifactId>org.eclipse.remote.proxy.ui</artifactId> - <packaging>eclipse-plugin</packaging> -<version>1.0.0-SNAPSHOT</version> -</project>
diff --git a/bundles/org.eclipse.remote.serial.core/pom.xml b/bundles/org.eclipse.remote.serial.core/pom.xml deleted file mode 100644 index 34c601d..0000000 --- a/bundles/org.eclipse.remote.serial.core/pom.xml +++ /dev/null
@@ -1,16 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <artifactId>org.eclipse.remote.serial.core</artifactId> - <packaging>eclipse-plugin</packaging> -<version>1.0.0-SNAPSHOT</version> -</project>
diff --git a/bundles/org.eclipse.remote.serial.ui/pom.xml b/bundles/org.eclipse.remote.serial.ui/pom.xml deleted file mode 100644 index 5dc9417..0000000 --- a/bundles/org.eclipse.remote.serial.ui/pom.xml +++ /dev/null
@@ -1,16 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <artifactId>org.eclipse.remote.serial.ui</artifactId> - <packaging>eclipse-plugin</packaging> -<version>1.0.0-SNAPSHOT</version> -</project>
diff --git a/bundles/org.eclipse.remote.telnet.core/pom.xml b/bundles/org.eclipse.remote.telnet.core/pom.xml deleted file mode 100644 index bde7f48..0000000 --- a/bundles/org.eclipse.remote.telnet.core/pom.xml +++ /dev/null
@@ -1,16 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <artifactId>org.eclipse.remote.telnet.core</artifactId> - <packaging>eclipse-plugin</packaging> -<version>1.0.0-SNAPSHOT</version> -</project>
diff --git a/bundles/org.eclipse.remote.telnet.ui/pom.xml b/bundles/org.eclipse.remote.telnet.ui/pom.xml deleted file mode 100644 index cbf9864..0000000 --- a/bundles/org.eclipse.remote.telnet.ui/pom.xml +++ /dev/null
@@ -1,16 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <artifactId>org.eclipse.remote.telnet.ui</artifactId> - <packaging>eclipse-plugin</packaging> -<version>1.0.0-SNAPSHOT</version> -</project>
diff --git a/bundles/org.eclipse.remote.ui/pom.xml b/bundles/org.eclipse.remote.ui/pom.xml deleted file mode 100644 index f271c24..0000000 --- a/bundles/org.eclipse.remote.ui/pom.xml +++ /dev/null
@@ -1,16 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <artifactId>org.eclipse.remote.ui</artifactId> - <packaging>eclipse-plugin</packaging> -<version>2.1.1-SNAPSHOT</version> -</project>
diff --git a/bundles/org.eclipse.remote.jsch.ui/pom.xml b/bundles/pom.xml similarity index 68% copy from bundles/org.eclipse.remote.jsch.ui/pom.xml copy to bundles/pom.xml index 763a6b3..28e9ae8 100644 --- a/bundles/org.eclipse.remote.jsch.ui/pom.xml +++ b/bundles/pom.xml
@@ -7,10 +7,9 @@ <groupId>org.eclipse.remote</groupId> <artifactId>remote-parent</artifactId> <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> + <relativePath>../releng/org.eclipse.remote.build/pom.xml</relativePath> </parent> - <artifactId>org.eclipse.remote.jsch.ui</artifactId> - <packaging>eclipse-plugin</packaging> -<version>1.0.0-SNAPSHOT</version> + <artifactId>bundle-parent</artifactId> + <packaging>pom</packaging> </project>
diff --git a/features/org.eclipse.remote-feature/pom.xml b/features/org.eclipse.remote-feature/pom.xml deleted file mode 100644 index 678cb68..0000000 --- a/features/org.eclipse.remote-feature/pom.xml +++ /dev/null
@@ -1,52 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - <configuration> - <excludes> - <plugin id="org.eclipse.remote.doc.isv"/> - </excludes> - </configuration> - <executions> - <execution> - <id>source-feature</id> - <phase>package</phase> - <goals> - <goal>source-feature</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <version>${tycho-version}</version> - <executions> - <execution> - <id>attached-p2-metadata</id> - <phase>package</phase> - <goals> - <goal>p2-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <artifactId>org.eclipse.remote</artifactId> - <packaging>eclipse-feature</packaging> -</project>
diff --git a/features/org.eclipse.remote.console-feature/pom.xml b/features/org.eclipse.remote.console-feature/pom.xml deleted file mode 100644 index 62518e1..0000000 --- a/features/org.eclipse.remote.console-feature/pom.xml +++ /dev/null
@@ -1,48 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <groupId>org.eclipse.remote.features</groupId> - <artifactId>org.eclipse.remote.console</artifactId> - <packaging>eclipse-feature</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - <executions> - <execution> - <id>source-feature</id> - <phase>package</phase> - <goals> - <goal>source-feature</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <version>${tycho-version}</version> - <executions> - <execution> - <id>attached-p2-metadata</id> - <phase>package</phase> - <goals> - <goal>p2-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project>
diff --git a/features/org.eclipse.remote.proxy-feature/pom.xml b/features/org.eclipse.remote.proxy-feature/pom.xml deleted file mode 100644 index d19fc27..0000000 --- a/features/org.eclipse.remote.proxy-feature/pom.xml +++ /dev/null
@@ -1,55 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - <version>${tycho-version}</version> - <executions> - <execution> - <id>source-feature</id> - <phase>package</phase> - <goals> - <goal>source-feature</goal> - </goals> - <configuration> - <excludes> - <plugin id="org.eclipse.remote.proxy.server.linux.x86_64"/> - <plugin id="org.eclipse.remote.proxy.server.linux.ppc64le"/> - <plugin id="org.eclipse.remote.proxy.server.macosx.x86_64"/> - </excludes> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <version>${tycho-version}</version> - <executions> - <execution> - <id>attached-p2-metadata</id> - <phase>package</phase> - <goals> - <goal>p2-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <artifactId>org.eclipse.remote.proxy</artifactId> - <packaging>eclipse-feature</packaging> -</project>
diff --git a/features/org.eclipse.remote.serial-feature/pom.xml b/features/org.eclipse.remote.serial-feature/pom.xml deleted file mode 100644 index feafc5a..0000000 --- a/features/org.eclipse.remote.serial-feature/pom.xml +++ /dev/null
@@ -1,48 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <groupId>org.eclipse.remote.features</groupId> - <artifactId>org.eclipse.remote.serial</artifactId> - <packaging>eclipse-feature</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - <executions> - <execution> - <id>source-feature</id> - <phase>package</phase> - <goals> - <goal>source-feature</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <version>${tycho-version}</version> - <executions> - <execution> - <id>attached-p2-metadata</id> - <phase>package</phase> - <goals> - <goal>p2-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project>
diff --git a/features/org.eclipse.remote.telnet-feature/pom.xml b/features/org.eclipse.remote.telnet-feature/pom.xml deleted file mode 100644 index f94f9c8..0000000 --- a/features/org.eclipse.remote.telnet-feature/pom.xml +++ /dev/null
@@ -1,48 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <groupId>org.eclipse.remote.features</groupId> - <artifactId>org.eclipse.remote.telnet</artifactId> - <packaging>eclipse-feature</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - <executions> - <execution> - <id>source-feature</id> - <phase>package</phase> - <goals> - <goal>source-feature</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <version>${tycho-version}</version> - <executions> - <execution> - <id>attached-p2-metadata</id> - <phase>package</phase> - <goals> - <goal>p2-metadata</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project>
diff --git a/bundles/org.eclipse.remote.jsch.ui/pom.xml b/features/pom.xml similarity index 68% copy from bundles/org.eclipse.remote.jsch.ui/pom.xml copy to features/pom.xml index 763a6b3..00fa526 100644 --- a/bundles/org.eclipse.remote.jsch.ui/pom.xml +++ b/features/pom.xml
@@ -7,10 +7,9 @@ <groupId>org.eclipse.remote</groupId> <artifactId>remote-parent</artifactId> <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> + <relativePath>../releng/org.eclipse.remote.build/pom.xml</relativePath> </parent> - <artifactId>org.eclipse.remote.jsch.ui</artifactId> - <packaging>eclipse-plugin</packaging> -<version>1.0.0-SNAPSHOT</version> + <artifactId>feature-parent</artifactId> + <packaging>pom</packaging> </project>
diff --git a/releng/org.eclipse.remote.build/pom.xml b/releng/org.eclipse.remote.build/pom.xml index 36a8fd3..c173c43 100644 --- a/releng/org.eclipse.remote.build/pom.xml +++ b/releng/org.eclipse.remote.build/pom.xml
@@ -173,10 +173,7 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-source-feature-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> - <includeBinaryFeature>false</includeBinaryFeature> - </configuration> + <version>${tycho-extras-version}</version> <executions> <execution> <id>source-feature</id> @@ -184,12 +181,28 @@ <goals> <goal>source-feature</goal> </goals> - <configuration> - <excludes> - <plugin id="org.eclipse.remote.proxy.server.linux.x86_64"/> - <plugin id="org.eclipse.remote.doc.isv"/> - </excludes> - </configuration> + </execution> + </executions> + <configuration> + <excludes> + <plugin id="org.eclipse.remote.proxy.server.linux.x86_64"/> + <plugin id="org.eclipse.remote.proxy.server.linux.ppc64le"/> + <plugin id="org.eclipse.remote.proxy.server.macosx.x86_64"/> + <plugin id="org.eclipse.remote.doc.isv"/> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attached-p2-metadata</id> + <goals> + <goal>p2-metadata</goal> + </goals> + <phase>package</phase> </execution> </executions> </plugin> @@ -218,20 +231,6 @@ <encoding>UTF-8</encoding> </configuration> </plugin> - <!-- enable source bundle generation --> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - <version>${tycho-version}</version> - <executions> - <execution> - <id>plugin-source</id> - <goals> - <goal>plugin-source</goal> - </goals> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId>
diff --git a/releng/org.eclipse.remote.proxy.server.linux.ppc64le/pom.xml b/releng/org.eclipse.remote.proxy.server.linux.ppc64le/pom.xml deleted file mode 100644 index 2e0a07f..0000000 --- a/releng/org.eclipse.remote.proxy.server.linux.ppc64le/pom.xml +++ /dev/null
@@ -1,36 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <artifactId>org.eclipse.remote.proxy.server.linux.ppc64le</artifactId> - <packaging>eclipse-plugin</packaging> - <version>1.0.0-SNAPSHOT</version> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - <version>${tycho-version}</version> - <executions> - <execution> - <id>plugin-source</id> - <phase>none</phase> - </execution> - <execution> - <id>attach-source</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project>
diff --git a/releng/org.eclipse.remote.proxy.server.linux.x86_64/pom.xml b/releng/org.eclipse.remote.proxy.server.linux.x86_64/pom.xml deleted file mode 100644 index b8bdd70..0000000 --- a/releng/org.eclipse.remote.proxy.server.linux.x86_64/pom.xml +++ /dev/null
@@ -1,36 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <artifactId>org.eclipse.remote.proxy.server.linux.x86_64</artifactId> - <packaging>eclipse-plugin</packaging> - <version>1.0.0-SNAPSHOT</version> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - <version>${tycho-version}</version> - <executions> - <execution> - <id>plugin-source</id> - <phase>none</phase> - </execution> - <execution> - <id>attach-source</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project>
diff --git a/releng/org.eclipse.remote.proxy.server.macosx.x86_64/pom.xml b/releng/org.eclipse.remote.proxy.server.macosx.x86_64/pom.xml deleted file mode 100644 index a58d110..0000000 --- a/releng/org.eclipse.remote.proxy.server.macosx.x86_64/pom.xml +++ /dev/null
@@ -1,36 +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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.remote</groupId> - <artifactId>remote-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> - </parent> - - <artifactId>org.eclipse.remote.proxy.server.macosx.x86_64</artifactId> - <packaging>eclipse-plugin</packaging> - <version>1.0.0-SNAPSHOT</version> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - <version>${tycho-version}</version> - <executions> - <execution> - <id>plugin-source</id> - <phase>none</phase> - </execution> - <execution> - <id>attach-source</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project>
diff --git a/releng/org.eclipse.remote.proxy.server.product/pom.xml b/releng/org.eclipse.remote.proxy.server.product/pom.xml index c8821f1..a7801cb 100644 --- a/releng/org.eclipse.remote.proxy.server.product/pom.xml +++ b/releng/org.eclipse.remote.proxy.server.product/pom.xml
@@ -11,7 +11,7 @@ </parent> <artifactId>org.eclipse.remote.proxy.server.product</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> <packaging>eclipse-repository</packaging> <build>
diff --git a/bundles/org.eclipse.remote.jsch.ui/pom.xml b/releng/pom.xml similarity index 68% rename from bundles/org.eclipse.remote.jsch.ui/pom.xml rename to releng/pom.xml index 763a6b3..9d20bc8 100644 --- a/bundles/org.eclipse.remote.jsch.ui/pom.xml +++ b/releng/pom.xml
@@ -7,10 +7,9 @@ <groupId>org.eclipse.remote</groupId> <artifactId>remote-parent</artifactId> <version>3.0.1-SNAPSHOT</version> - <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath> + <relativePath>../releng/org.eclipse.remote.build/pom.xml</relativePath> </parent> - <artifactId>org.eclipse.remote.jsch.ui</artifactId> - <packaging>eclipse-plugin</packaging> -<version>1.0.0-SNAPSHOT</version> + <artifactId>releng-parent</artifactId> + <packaging>pom</packaging> </project>