From 6f6ca64ed698c17874a53f0fc76782b91f5be02e Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Fri, 31 Jan 2020 10:29:05 -0500 Subject: [PATCH] Bug 559474: Integrate tm.terminal into CDT's releng Change-Id: I46db42560ec0b93bb265f45920d78c97a32338c3 --- pom.xml | 2 + releng/org.eclipse.cdt.target/cdt.target | 4 + terminal/admin/.gitignore | 1 - terminal/admin/.project | 38 ---- terminal/admin/pom-build.xml | 136 ------------ terminal/admin/pom-config.xml | 94 --------- .../target-defs/eclipse-4.8.x-photon.target | 49 ----- terminal/admin/target-defs/tm-baseline.target | 21 -- .../pom.xml | 44 ---- .../pom.xml | 44 ---- .../pom.xml | 44 ---- .../pom.xml | 44 ---- .../pom.xml | 44 ---- .../pom.xml | 44 ---- .../pom.xml | 44 ---- .../pom.xml | 44 ---- .../pom.xml | 44 ---- .../pom.xml | 44 ---- .../pom.xml | 45 ---- .../pom.xml | 44 ---- .../org.eclipse.tm.terminal.feature/pom.xml | 45 ---- .../pom.xml | 44 ---- .../pom.xml | 45 ---- .../pom.xml | 44 ---- terminal/features/pom.xml | 29 +-- .../pom.xml | 26 --- .../pom.xml | 26 --- .../pom.xml | 26 --- .../pom.xml | 26 --- .../pom.xml | 26 --- .../pom.xml | 26 --- .../org.eclipse.tm.terminal.control/pom.xml | 27 --- .../org.eclipse.tm.terminal.test/pom.xml | 194 ------------------ .../test/AutomatedIntegrationSuite.java | 20 ++ .../org.eclipse.tm.terminal.view.core/pom.xml | 26 --- .../org.eclipse.tm.terminal.view.ui/pom.xml | 27 --- terminal/plugins/pom.xml | 46 +---- terminal/pom.xml | 10 +- 38 files changed, 40 insertions(+), 1547 deletions(-) delete mode 100644 terminal/admin/.gitignore delete mode 100644 terminal/admin/.project delete mode 100644 terminal/admin/pom-build.xml delete mode 100644 terminal/admin/pom-config.xml delete mode 100644 terminal/admin/target-defs/eclipse-4.8.x-photon.target delete mode 100644 terminal/admin/target-defs/tm-baseline.target delete mode 100644 terminal/features/org.eclipse.tm.terminal.connector.cdtserial.feature/pom.xml delete mode 100644 terminal/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/pom.xml delete mode 100644 terminal/features/org.eclipse.tm.terminal.connector.local.feature/pom.xml delete mode 100644 terminal/features/org.eclipse.tm.terminal.connector.local.sdk.feature/pom.xml delete mode 100644 terminal/features/org.eclipse.tm.terminal.connector.remote.feature/pom.xml delete mode 100644 terminal/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/pom.xml delete mode 100644 terminal/features/org.eclipse.tm.terminal.connector.ssh.feature/pom.xml delete mode 100644 terminal/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/pom.xml delete mode 100644 terminal/features/org.eclipse.tm.terminal.connector.telnet.feature/pom.xml delete mode 100644 terminal/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/pom.xml delete mode 100644 terminal/features/org.eclipse.tm.terminal.control.feature/pom.xml delete mode 100644 terminal/features/org.eclipse.tm.terminal.control.sdk.feature/pom.xml delete mode 100644 terminal/features/org.eclipse.tm.terminal.feature/pom.xml delete mode 100644 terminal/features/org.eclipse.tm.terminal.sdk.feature/pom.xml delete mode 100644 terminal/features/org.eclipse.tm.terminal.view.feature/pom.xml delete mode 100644 terminal/features/org.eclipse.tm.terminal.view.sdk.feature/pom.xml delete mode 100644 terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/pom.xml delete mode 100644 terminal/plugins/org.eclipse.tm.terminal.connector.local/pom.xml delete mode 100644 terminal/plugins/org.eclipse.tm.terminal.connector.process/pom.xml delete mode 100644 terminal/plugins/org.eclipse.tm.terminal.connector.remote/pom.xml delete mode 100644 terminal/plugins/org.eclipse.tm.terminal.connector.ssh/pom.xml delete mode 100644 terminal/plugins/org.eclipse.tm.terminal.connector.telnet/pom.xml delete mode 100644 terminal/plugins/org.eclipse.tm.terminal.control/pom.xml delete mode 100644 terminal/plugins/org.eclipse.tm.terminal.test/pom.xml create mode 100644 terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedIntegrationSuite.java delete mode 100644 terminal/plugins/org.eclipse.tm.terminal.view.core/pom.xml delete mode 100644 terminal/plugins/org.eclipse.tm.terminal.view.ui/pom.xml diff --git a/pom.xml b/pom.xml index aae84be7a4d..f96e65aec34 100644 --- a/pom.xml +++ b/pom.xml @@ -280,6 +280,8 @@ tools.templates/org.eclipse.tools.templates.freemarker.java11 tools.templates/org.eclipse.tools.templates.ui + terminal + releng/org.eclipse.cdt.native-feature releng/org.eclipse.cdt releng/org.eclipse.cdt.platform.branding diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target index 587c9ce0ad7..a8bcd2d96cf 100644 --- a/releng/org.eclipse.cdt.target/cdt.target +++ b/releng/org.eclipse.cdt.target/cdt.target @@ -79,6 +79,10 @@ + + + + diff --git a/terminal/admin/.gitignore b/terminal/admin/.gitignore deleted file mode 100644 index ea8c4bf7f35..00000000000 --- a/terminal/admin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/terminal/admin/.project b/terminal/admin/.project deleted file mode 100644 index fd600362323..00000000000 --- a/terminal/admin/.project +++ /dev/null @@ -1,38 +0,0 @@ - - - Administration (TM Terminal) - - - - - - - - - - CONTRIBUTING - 1 - PARENT-1-PROJECT_LOC/CONTRIBUTING - - - pom.xml - 1 - PARENT-1-PROJECT_LOC/pom.xml - - - readme.txt - 1 - PARENT-1-PROJECT_LOC/readme.txt - - - terminals.psf - 1 - PARENT-1-PROJECT_LOC/terminals.psf - - - toplevel.gitignore - 1 - PARENT-1-PROJECT_LOC/.gitignore - - - diff --git a/terminal/admin/pom-build.xml b/terminal/admin/pom-build.xml deleted file mode 100644 index 4da5f4544ea..00000000000 --- a/terminal/admin/pom-build.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-config - 4.5.100-SNAPSHOT - pom-config.xml - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - pom - TM Terminal, Maven Build Master - - - - - org.eclipse.tycho - tycho-maven-plugin - - - org.eclipse.tycho - target-platform-configuration - - - org.eclipse.tycho - tycho-source-plugin - - - - - - - findbugs - - - - org.codehaus.mojo - findbugs-maven-plugin - - - - - - static-checks - - - - org.codehaus.mojo - findbugs-maven-plugin - - - org.apache.maven.plugins - maven-pmd-plugin - - - - - - tests - - - - org.eclipse.tycho - target-platform-configuration - - - - - - p2-installable-unit - org.eclipse.platform.ide - 0.0.0 - - - eclipse-feature - org.eclipse.sdk - 0.0.0 - - - eclipse-feature - org.eclipse.cdt.platform - 0.0.0 - - - eclipse-feature - org.eclipse.remote - 0.0.0 - - - eclipse-feature - org.eclipse.swtbot.eclipse - 0.0.0 - - - - - - - org.jacoco - jacoco-maven-plugin - - - - prepare-agent - - - - org.eclipse.tm.terminal* - - - - - - - - - - - - diff --git a/terminal/admin/pom-config.xml b/terminal/admin/pom-config.xml deleted file mode 100644 index 21a4dba63e9..00000000000 --- a/terminal/admin/pom-config.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm - tm-parent - 4.5.100-SNAPSHOT - ../../ - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-config - pom - TM Terminal, Maven Configuration Master - - - - Eclipse Public License - https://www.eclipse.org/legal/epl-2.0/ - repo - - All rights reserved. - - This program and the accompanying materials are made - available under the terms of the Eclipse Public License 2.0 - which accompanies this distribution, and is available at - https://www.eclipse.org/legal/epl-2.0/ - - - - - - Eclipse Foundation - http://www.eclipse.org/ - - - - - ${env.WORKSPACE}/admin - UTF-8 - - - false - file - true - - development - ${project.artifactId}.zip - /home/data/httpd/download.eclipse.org/tm/terminal/builds/${terminal-stream}/nightly - scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.git - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.8 - - utf-8 - 100 - 1.7 - xml - false - - **/UbcCheck.java - - - - - - cpd-check - - - - - - - - diff --git a/terminal/admin/target-defs/eclipse-4.8.x-photon.target b/terminal/admin/target-defs/eclipse-4.8.x-photon.target deleted file mode 100644 index 39952d614f2..00000000000 --- a/terminal/admin/target-defs/eclipse-4.8.x-photon.target +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/terminal/admin/target-defs/tm-baseline.target b/terminal/admin/target-defs/tm-baseline.target deleted file mode 100644 index e2b7e52557e..00000000000 --- a/terminal/admin/target-defs/tm-baseline.target +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/terminal/features/org.eclipse.tm.terminal.connector.cdtserial.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.cdtserial.feature/pom.xml deleted file mode 100644 index bf559ad5aea..00000000000 --- a/terminal/features/org.eclipse.tm.terminal.connector.cdtserial.feature/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.features - 4.5.100-SNAPSHOT - - - org.eclipse.tm.terminal.connector.cdtserial.feature - eclipse-feature - - - true - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - - diff --git a/terminal/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/pom.xml deleted file mode 100644 index a02406184db..00000000000 --- a/terminal/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.features - 4.5.100-SNAPSHOT - - - org.eclipse.tm.terminal.connector.cdtserial.sdk.feature - eclipse-feature - - - true - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - - diff --git a/terminal/features/org.eclipse.tm.terminal.connector.local.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.local.feature/pom.xml deleted file mode 100644 index 215d3563580..00000000000 --- a/terminal/features/org.eclipse.tm.terminal.connector.local.feature/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.features - 4.5.100-SNAPSHOT - - - org.eclipse.tm.terminal.connector.local.feature - eclipse-feature - - - true - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - - diff --git a/terminal/features/org.eclipse.tm.terminal.connector.local.sdk.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.local.sdk.feature/pom.xml deleted file mode 100644 index ac14412495e..00000000000 --- a/terminal/features/org.eclipse.tm.terminal.connector.local.sdk.feature/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.features - 4.5.100-SNAPSHOT - - - org.eclipse.tm.terminal.connector.local.sdk.feature - eclipse-feature - - - true - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - - diff --git a/terminal/features/org.eclipse.tm.terminal.connector.remote.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.remote.feature/pom.xml deleted file mode 100644 index f4665073bf2..00000000000 --- a/terminal/features/org.eclipse.tm.terminal.connector.remote.feature/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.features - 4.5.100-SNAPSHOT - - - org.eclipse.tm.terminal.connector.remote.feature - eclipse-feature - - - true - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - - diff --git a/terminal/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/pom.xml deleted file mode 100644 index 3dee0088fac..00000000000 --- a/terminal/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.features - 4.5.100-SNAPSHOT - - - org.eclipse.tm.terminal.connector.remote.sdk.feature - eclipse-feature - - - true - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - - diff --git a/terminal/features/org.eclipse.tm.terminal.connector.ssh.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.ssh.feature/pom.xml deleted file mode 100644 index 61100c70ff7..00000000000 --- a/terminal/features/org.eclipse.tm.terminal.connector.ssh.feature/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.features - 4.5.100-SNAPSHOT - - - org.eclipse.tm.terminal.connector.ssh.feature - eclipse-feature - - - true - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - - diff --git a/terminal/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/pom.xml deleted file mode 100644 index e829e93606c..00000000000 --- a/terminal/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.features - 4.5.100-SNAPSHOT - - - org.eclipse.tm.terminal.connector.ssh.sdk.feature - eclipse-feature - - - true - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - - diff --git a/terminal/features/org.eclipse.tm.terminal.connector.telnet.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.telnet.feature/pom.xml deleted file mode 100644 index 49038af80cc..00000000000 --- a/terminal/features/org.eclipse.tm.terminal.connector.telnet.feature/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.features - 4.5.100-SNAPSHOT - - - org.eclipse.tm.terminal.connector.telnet.feature - eclipse-feature - - - true - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - - diff --git a/terminal/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/pom.xml deleted file mode 100644 index b7efd30ce3d..00000000000 --- a/terminal/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.features - 4.5.100-SNAPSHOT - - - org.eclipse.tm.terminal.connector.telnet.sdk.feature - eclipse-feature - - - true - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - - diff --git a/terminal/features/org.eclipse.tm.terminal.control.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.control.feature/pom.xml deleted file mode 100644 index 60580345f14..00000000000 --- a/terminal/features/org.eclipse.tm.terminal.control.feature/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.features - 4.5.100-SNAPSHOT - - 4.5.102-SNAPSHOT - - org.eclipse.tm.terminal.control.feature - eclipse-feature - - - true - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - - diff --git a/terminal/features/org.eclipse.tm.terminal.control.sdk.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.control.sdk.feature/pom.xml deleted file mode 100644 index 0d4df06551b..00000000000 --- a/terminal/features/org.eclipse.tm.terminal.control.sdk.feature/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.features - 4.5.100-SNAPSHOT - - - org.eclipse.tm.terminal.control.sdk.feature - eclipse-feature - - - true - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - - diff --git a/terminal/features/org.eclipse.tm.terminal.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.feature/pom.xml deleted file mode 100644 index 7794403d6bc..00000000000 --- a/terminal/features/org.eclipse.tm.terminal.feature/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.features - 4.5.100-SNAPSHOT - - - org.eclipse.tm.terminal.feature - 4.5.200-SNAPSHOT - eclipse-feature - - - true - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - - diff --git a/terminal/features/org.eclipse.tm.terminal.sdk.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.sdk.feature/pom.xml deleted file mode 100644 index e5168cc7f29..00000000000 --- a/terminal/features/org.eclipse.tm.terminal.sdk.feature/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.features - 4.5.100-SNAPSHOT - - - org.eclipse.tm.terminal.sdk.feature - eclipse-feature - - - true - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - - diff --git a/terminal/features/org.eclipse.tm.terminal.view.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.view.feature/pom.xml deleted file mode 100644 index 4188445839a..00000000000 --- a/terminal/features/org.eclipse.tm.terminal.view.feature/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.features - 4.5.100-SNAPSHOT - - - org.eclipse.tm.terminal.view.feature - 4.5.200-SNAPSHOT - eclipse-feature - - - true - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - - diff --git a/terminal/features/org.eclipse.tm.terminal.view.sdk.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.view.sdk.feature/pom.xml deleted file mode 100644 index 74c6faf6ae7..00000000000 --- a/terminal/features/org.eclipse.tm.terminal.view.sdk.feature/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.features - 4.5.100-SNAPSHOT - - - org.eclipse.tm.terminal.view.sdk.feature - eclipse-feature - - - true - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - default - - - - - - diff --git a/terminal/features/pom.xml b/terminal/features/pom.xml index 1da93e88e52..f7d9d7a9036 100644 --- a/terminal/features/pom.xml +++ b/terminal/features/pom.xml @@ -15,10 +15,9 @@ 4.0.0 - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.5.100-SNAPSHOT - ../admin/pom-build.xml + org.eclipse.cdt + terminal-parent + 9.11.0-SNAPSHOT org.eclipse.tm.terminal.features @@ -37,6 +36,8 @@ org.eclipse.tm.terminal.connector.ssh.sdk.feature org.eclipse.tm.terminal.connector.telnet.feature org.eclipse.tm.terminal.connector.telnet.sdk.feature + org.eclipse.tm.terminal.connector.cdtserial.feature + org.eclipse.tm.terminal.connector.cdtserial.sdk.feature org.eclipse.tm.terminal.view.feature org.eclipse.tm.terminal.view.sdk.feature @@ -46,24 +47,4 @@ - - - - cdtserial - - - - true - - !nocdtserial - - - - org.eclipse.tm.terminal.connector.cdtserial.feature - org.eclipse.tm.terminal.connector.cdtserial.sdk.feature - - - diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/pom.xml deleted file mode 100644 index 2c35890725e..00000000000 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.5.100-SNAPSHOT - ../../admin/pom-build.xml - - - org.eclipse.tm.terminal.connector.cdtserial - eclipse-plugin - diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.connector.local/pom.xml deleted file mode 100644 index 88f03dacc85..00000000000 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.local/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.5.100-SNAPSHOT - ../../admin/pom-build.xml - - - org.eclipse.tm.terminal.connector.local - eclipse-plugin - diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.connector.process/pom.xml deleted file mode 100644 index e51c0e0e903..00000000000 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.5.100-SNAPSHOT - ../../admin/pom-build.xml - - - org.eclipse.tm.terminal.connector.process - eclipse-plugin - diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.remote/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.connector.remote/pom.xml deleted file mode 100644 index c820a1d1594..00000000000 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.remote/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.5.100-SNAPSHOT - ../../admin/pom-build.xml - - - org.eclipse.tm.terminal.connector.remote - eclipse-plugin - diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/pom.xml deleted file mode 100644 index ee95330809b..00000000000 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.5.100-SNAPSHOT - ../../admin/pom-build.xml - - - org.eclipse.tm.terminal.connector.ssh - eclipse-plugin - diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/pom.xml deleted file mode 100644 index a6f4f6cdc21..00000000000 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.5.100-SNAPSHOT - ../../admin/pom-build.xml - - - org.eclipse.tm.terminal.connector.telnet - eclipse-plugin - diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.control/pom.xml deleted file mode 100644 index a0de87da146..00000000000 --- a/terminal/plugins/org.eclipse.tm.terminal.control/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.5.100-SNAPSHOT - ../../admin/pom-build.xml - - 4.5.102-SNAPSHOT - - org.eclipse.tm.terminal.control - eclipse-plugin - diff --git a/terminal/plugins/org.eclipse.tm.terminal.test/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.test/pom.xml deleted file mode 100644 index cb0115da7dc..00000000000 --- a/terminal/plugins/org.eclipse.tm.terminal.test/pom.xml +++ /dev/null @@ -1,194 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.5.100-SNAPSHOT - ../../admin/pom-build.xml - - - org.eclipse.tm.terminal.test - eclipse-test-plugin - - - true - -ea -Xmx512m -XX:MaxPermSize=256m -Drse.enableSecureStoreAccess=false -Dorg.eclipse.swt.browser.UseWebKitGTK=true - - - - - tests - - - - - org.eclipse.tycho - tycho-surefire-plugin - ${tycho-version} - - true - false - org.eclipse.platform.ide - - - ${tycho.testArgLine} ${ui.test.vmargs} - org.eclipse.ui.ide.workbench - true - true - p2Installed - - - ${basedir}/tracing/.options - - - - - **/AutomatedPluginTests.* - **/AutomatedTests.* - - - - - - org.codehaus.gmaven - gmaven-plugin - - - validate - - execute - - - - project.properties['qualified.bundle.version'] = project.properties['unqualifiedVersion'].replace('qualifier', project.properties['buildQualifier']) - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - generate-report - post-integration-test - - run - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.jacoco - org.jacoco.ant - ${jacoco-version} - - - - - - - - diff --git a/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedIntegrationSuite.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedIntegrationSuite.java new file mode 100644 index 00000000000..53c15d52e60 --- /dev/null +++ b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedIntegrationSuite.java @@ -0,0 +1,20 @@ +/******************************************************************************* + * Copyright (c) 2020 Kichwa Coders Canada and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ +package org.eclipse.tm.terminal.test; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +@RunWith(Suite.class) +@Suite.SuiteClasses({ AutomatedPluginTests.class, AutomatedTests.class }) +public class AutomatedIntegrationSuite { + +} diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.view.core/pom.xml deleted file mode 100644 index 0e4856a9fd6..00000000000 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.5.100-SNAPSHOT - ../../admin/pom-build.xml - - - org.eclipse.tm.terminal.view.core - eclipse-plugin - diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.view.ui/pom.xml deleted file mode 100644 index b23790d92b0..00000000000 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.5.100-SNAPSHOT - ../../admin/pom-build.xml - - - org.eclipse.tm.terminal.view.ui - 4.5.200-SNAPSHOT - eclipse-plugin - diff --git a/terminal/plugins/pom.xml b/terminal/plugins/pom.xml index 64a12adce3c..11b2560824a 100644 --- a/terminal/plugins/pom.xml +++ b/terminal/plugins/pom.xml @@ -15,10 +15,9 @@ 4.0.0 - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.5.100-SNAPSHOT - ../admin/pom-build.xml + org.eclipse.cdt + terminal-parent + 9.11.0-SNAPSHOT org.eclipse.tm.terminal.plugins @@ -33,48 +32,11 @@ org.eclipse.tm.terminal.connector.remote org.eclipse.tm.terminal.connector.ssh org.eclipse.tm.terminal.connector.telnet + org.eclipse.tm.terminal.connector.cdtserial org.eclipse.tm.terminal.view.core org.eclipse.tm.terminal.view.ui org.eclipse.tm.terminal.test - - - - - cdtserial - - - - true - - !nocdtserial - - - - org.eclipse.tm.terminal.connector.cdtserial - - - - - - rxtxserial - - false - - - - - rxtx - http://archive.eclipse.org/tm/updates/rxtx - p2 - - - - diff --git a/terminal/pom.xml b/terminal/pom.xml index f0f3a77dc8a..e7404e80882 100644 --- a/terminal/pom.xml +++ b/terminal/pom.xml @@ -15,14 +15,14 @@ 4.0.0 - org.eclipse.tm.terminal - org.eclipse.tm.terminal.maven-build - 4.5.100-SNAPSHOT - admin/pom-build.xml + org.eclipse.cdt + cdt-parent + 9.11.0-SNAPSHOT - org.eclipse.tm.terminal + org.eclipse.cdt terminal-parent + 9.11.0-SNAPSHOT pom TM Terminal, Maven Master