diff --git a/pom.xml b/pom.xml index 146694b2193..5f251d98b50 100644 --- a/pom.xml +++ b/pom.xml @@ -256,6 +256,38 @@ tools.templates/org.eclipse.tools.templates.freemarker tools.templates/org.eclipse.tools.templates.ui + + remote/org.eclipse.remote.core + remote/org.eclipse.remote.jsch.core + remote/org.eclipse.remote.jsch.ui + remote/org.eclipse.remote.ui + + remote/org.eclipse.remote.proxy.core + remote/org.eclipse.remote.proxy.ui + remote/org.eclipse.remote.proxy.protocol.core + remote/org.eclipse.remote.proxy.server.core + remote/org.eclipse.remote.proxy.server.product + remote/org.eclipse.remote.proxy.server.linux.x86_64 + remote/org.eclipse.remote.proxy.server.linux.ppc64le + remote/org.eclipse.remote.proxy.server.macosx.x86_64 + + remote/org.eclipse.remote-feature + + remote/org.eclipse.remote.proxy-feature + + remote/org.eclipse.remote.console + remote/org.eclipse.remote.console-feature + + remote/org.eclipse.remote.serial.core + remote/org.eclipse.remote.serial.ui + remote/org.eclipse.remote.serial-feature + + remote/org.eclipse.remote.telnet.core + remote/org.eclipse.remote.telnet.ui + remote/org.eclipse.remote.telnet-feature + + remote/org.eclipse.remote.doc.isv + terminal jsoncdb @@ -679,6 +711,15 @@ aarch64 + + + + eclipse-plugin + org.eclipse.ui.ide + 0.0.0 + + + @@ -725,6 +766,10 @@ + + + + diff --git a/remote/org.eclipse.remote.build/.project b/remote/org.eclipse.remote.build/.project deleted file mode 100644 index 538c5dee620..00000000000 --- a/remote/org.eclipse.remote.build/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - org.eclipse.remote.build - - - - - - - - diff --git a/remote/org.eclipse.remote.build/.settings/org.eclipse.core.resources.prefs b/remote/org.eclipse.remote.build/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/remote/org.eclipse.remote.build/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/remote/org.eclipse.remote.build/pom.xml b/remote/org.eclipse.remote.build/pom.xml deleted file mode 100644 index 4805a741f9e..00000000000 --- a/remote/org.eclipse.remote.build/pom.xml +++ /dev/null @@ -1,410 +0,0 @@ - - - 4.0.0 - - - 3.0 - - - org.eclipse.remote - remote-parent - 3.0.2-SNAPSHOT - pom - Remote Parent - - - nightly - - 3.6.3 - 2.3.0 - ${tycho-version} - scm:git:git://git.eclipse.org/gitroot/ptp/org.eclipse.remote.git - http://download.eclipse.org/cbi/updates/license/ - 1.3.1 - /home/data/httpd/download.eclipse.org/tools/ptp/builds/remote/${remote-release} - true - - - - - Eclipse Public License v1.0 - - All rights reserved. - - This program and the accompanying materials are made - available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.htm - - - - - - ../../releng/org.eclipse.remote.target - - ../../bundles/org.eclipse.remote.core - ../../bundles/org.eclipse.remote.jsch.core - ../../bundles/org.eclipse.remote.jsch.ui - ../../bundles/org.eclipse.remote.ui - - ../../bundles/org.eclipse.remote.proxy.core - ../../bundles/org.eclipse.remote.proxy.ui - ../../bundles/org.eclipse.remote.proxy.protocol.core - ../../bundles/org.eclipse.remote.proxy.server.core - ../../releng/org.eclipse.remote.proxy.server.product - ../../releng/org.eclipse.remote.proxy.server.linux.x86_64 - ../../releng/org.eclipse.remote.proxy.server.linux.ppc64le - ../../releng/org.eclipse.remote.proxy.server.macosx.x86_64 - - ../../features/org.eclipse.remote-feature - - ../../features/org.eclipse.remote.proxy-feature - - ../../bundles/org.eclipse.remote.console - ../../features/org.eclipse.remote.console-feature - - ../../bundles/org.eclipse.remote.serial.core - ../../bundles/org.eclipse.remote.serial.ui - ../../features/org.eclipse.remote.serial-feature - - ../../bundles/org.eclipse.remote.telnet.core - ../../bundles/org.eclipse.remote.telnet.ui - ../../features/org.eclipse.remote.telnet-feature - - ../../bundles/org.eclipse.remote.doc.isv - - ../../releng/org.eclipse.remote.repo - ../../releng/org.eclipse.remote.deploy - - - - - license - ${license-site} - p2 - - - - - - repo.eclipse.org - Project Repository - Releases - https://repo.eclipse.org/content/repositories/ptp-releases - - - repo.eclipse.org - Project Repository - Snapshots - https://repo.eclipse.org/content/repositories/ptp-snapshots - - - - - - - true - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M3 - - - enforce-maven-version - - enforce - - - - - ${required-maven-version} - - - 11 - - - true - true - - - - - - org.codehaus.mojo - flatten-maven-plugin - 1.1.0 - - - - - flatten - process-resources - - flatten - - - - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho-version} - true - - - org.eclipse.tycho - target-platform-configuration - ${tycho-version} - - p2 - consider - - - linux - gtk - x86_64 - - - linux - gtk - ppc64le - - - win32 - win32 - x86_64 - - - macosx - cocoa - x86_64 - - - - - - eclipse-plugin - org.eclipse.ui.ide - 0.0.0 - - - - - - org.eclipse.remote - org.eclipse.remote.target - 3.0.2-SNAPSHOT - remote - - - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho-version} - - - plugin-source - - plugin-source - - - - - - org.eclipse.tycho.extras - tycho-source-feature-plugin - ${tycho-extras-version} - - - source-feature - package - - source-feature - - - - - - - - - - - - - - org.eclipse.tycho - tycho-p2-plugin - ${tycho-version} - - - attached-p2-metadata - - p2-metadata - - package - - - - - org.eclipse.tycho - tycho-versions-plugin - ${tycho-version} - - - versions - validate - - update-pom - - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - true - - - - org.eclipse.tycho - tycho-compiler-plugin - ${tycho-version} - - UTF-8 - - - - org.apache.maven.plugins - maven-resources-plugin - 2.6 - - ISO-8859-1 - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.3 - - true - false - - - - - check - - - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.0.1 - - utf-8 - 100 - 1.5 - xml - false - - - - - cpd-check - - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - - true - - - - - org.eclipse.tycho.extras - tycho-sourceref-jgit - ${tycho-extras-version} - - - - - - - - - - eclipse-sign - - - cbi - https://repo.eclipse.org/content/repositories/cbi-releases/ - - - - - - - org.eclipse.tycho - target-platform-configuration - ${tycho-version} - - true - - - - org.eclipse.cbi.maven.plugins - eclipse-jarsigner-plugin - ${cbi-plugins.version} - - - sign - verify - - sign - - - - - - org.eclipse.tycho - tycho-p2-plugin - ${tycho-version} - - - p2-metadata - - p2-metadata - - verify - - - - false - - - - - - - diff --git a/remote/org.eclipse.remote.build/update_versions.sh b/remote/org.eclipse.remote.build/update_versions.sh deleted file mode 100644 index 32cf53e3c7c..00000000000 --- a/remote/org.eclipse.remote.build/update_versions.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh -# -# script to update versions -# -# Usage: user_id version [branch] -# -# user_id - user id to use to clone repo -# version - new version string (e.g. "5.0.1") -# branch - alternate branch to use when updating versions -# -# Note: a "qualifier" suffix will automatically be added to the version where appropriate -# -# If version numbers are updated on a branch other than master, it is recommended to run -# the command from the master branch: -# -# git merge -s ours origin/branch -# -# to mark the changes as merged. -# - -BRANCH=master - -if [ $# -lt 3 ]; then - echo "usage: update_versions user_id version [branch]" - exit 1 -fi - -user_id=$1 -version=$2 - -if [ $# -gt 2 ]; then - BRANCH=$3 -fi - -if [ -d fix_versions ]; then - echo "please remove fix_versions first" - exit 1 -fi - -mkdir fix_versions -cd fix_versions - -git clone ssh://${user_id}@git.eclipse.org:29418/ptp/org.eclipse.remote.git -(cd org.eclipse.remote && git checkout $BRANCH) - -update_feature() { - sed -e "s/^\([ \t]*\)version=\"[0-9]\.[0-9]\.[0-9]\.qualifier\"/\1version=\"$2\.qualifier\"/" < $1/feature.xml > $1/feature.xml.tmp - mv $1/feature.xml.tmp $1/feature.xml -} - -update_manifest() { - sed -e "s/^Bundle-Version: *[0-9]\.[0-9]\.[0-9]\.qualifier/Bundle-Version: $2.qualifier/" < $1/META-INF/MANIFEST.MF > $1/META-INF/MANIFEST.MF.tmp - mv $1/META-INF/MANIFEST.MF.tmp $1/META-INF/MANIFEST.MF -} - -for feature in org.eclipse.remote/features/*-feature; do - echo "Updating $feature..." - update_feature $feature $version -done - -(cd org.eclipse.remote/releng/org.eclipse.remote.build && \ - mvn versions:set -DnewVersion="${version}-SNAPSHOT" && \ - mvn org.eclipse.tycho:tycho-versions-plugin:0.14.0:update-pom) - -find . -name pom.xml.versionsBackup -exec rm -f {} \; - -#(cd org.eclipse.remote && git commit -m "Update versions" && git push) - -# -# Cleanup -# -#cd .. -#rm -rf fix_versions - -exit 0 diff --git a/remote/org.eclipse.remote.deploy/.project b/remote/org.eclipse.remote.deploy/.project deleted file mode 100644 index 9f9927e0873..00000000000 --- a/remote/org.eclipse.remote.deploy/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - org.eclipse.remote.deploy - - - - - - - - diff --git a/remote/org.eclipse.remote.deploy/.settings/org.eclipse.core.resources.prefs b/remote/org.eclipse.remote.deploy/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/remote/org.eclipse.remote.deploy/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/remote/org.eclipse.remote.deploy/assembly.xml b/remote/org.eclipse.remote.deploy/assembly.xml deleted file mode 100644 index 08df261b713..00000000000 --- a/remote/org.eclipse.remote.deploy/assembly.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - assemble - - jar - - false - - - - ${project.build.directory}/dependency/ - / - true - - - \ No newline at end of file diff --git a/remote/org.eclipse.remote.deploy/pom.xml b/remote/org.eclipse.remote.deploy/pom.xml deleted file mode 100644 index 1855007c436..00000000000 --- a/remote/org.eclipse.remote.deploy/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - 4.0.0 - - - org.eclipse.remote - remote-parent - 3.0.2-SNAPSHOT - ../org.eclipse.remote.build/pom.xml - - - org.eclipse.remote - remote-core - 3.0.2-SNAPSHOT - pom - - - false - - - - - ${project.groupId} - org.eclipse.remote.core - 4.0.0-SNAPSHOT - - - ${project.groupId} - org.eclipse.remote.jsch.core - 1.0.0-SNAPSHOT - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.1.1 - - - dependencies - package - - unpack-dependencies - - - ${project.build.directory}/dependency - false - true - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2.1 - - - assembly.xml - - false - - - - package - - single - - - - - - - diff --git a/remote/org.eclipse.remote.doc.isv/META-INF/MANIFEST.MF b/remote/org.eclipse.remote.doc.isv/META-INF/MANIFEST.MF index 176f91b8cf6..f82950ac956 100644 --- a/remote/org.eclipse.remote.doc.isv/META-INF/MANIFEST.MF +++ b/remote/org.eclipse.remote.doc.isv/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Eclipse Remote Development documentation plug-in Bundle-SymbolicName: org.eclipse.remote.doc.isv;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Vendor: Eclipse PTP Require-Bundle: org.eclipse.remote.console, org.eclipse.remote.core, diff --git a/remote/org.eclipse.remote.doc.isv/pom.xml b/remote/org.eclipse.remote.doc.isv/pom.xml index 485a49cd8c4..3ef7d76fa57 100644 --- a/remote/org.eclipse.remote.doc.isv/pom.xml +++ b/remote/org.eclipse.remote.doc.isv/pom.xml @@ -3,40 +3,124 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - - org.eclipse.remote - remote-parent - 3.0.2-SNAPSHOT - ../../releng/org.eclipse.remote.build/pom.xml - + + org.eclipse.cdt + cdt-parent + 10.5.0-SNAPSHOT + ../../pom.xml + + 1.1.0-SNAPSHOT org.eclipse.remote.doc.isv - eclipse-plugin - - - - org.eclipse.tycho.extras - tycho-document-bundle-plugin - ${tycho-extras-version} - - ${basedir}/html/reference/api - - UTF-8 - - org.eclipse.remote.internal.* - - - - - - javadoc - - javadoc - - - - - - -1.0.0-SNAPSHOT + eclipse-plugin + + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho-version} + + + plugin-source + none + + + attach-source + none + + + + + + + + + build-doc + + + !skipDoc + + + + + + org.eclipse.tycho.extras + tycho-document-bundle-plugin + ${tycho-version} + + + eclipse-javadoc + generate-resources + + javadoc + + + ${project.basedir}/html/reference/api + + + + org.eclipse.cdt.remote.* + org.eclipse.remote.* + + + org.eclipse.remote.internal.* + org.eclipse.remote.*.internal.* + org.eclipse.cdt.remote.internal.* + org.eclipse.cdt.remote.*.internal.* + + + -windowtitle "Eclipse CDT org.eclipse.remote API Specification" + -doctitle "Eclipse CDT org.eclipse.remote API Specification" + + -link "https://docs.oracle.com/en/java/javase/11/docs/api/" + -linkoffline ../../org.eclipse.platform.doc.isv/reference/api + + -public + -header "Eclipse CDT's org.eclipse.remote 10.5.0" + + -bottom "Copyright (c) IBM Corp. and others 2004, 2021. All Rights Reserved." + -tag 'noimplement:a:Restriction:' + -tag 'noextend:a:Restriction:' + -tag 'noreference:a:Restriction:' + -tag 'noinstantiate:a:Restriction:' + -tag 'nooverride:a:Restriction:' + + + + + + + + + + + fake-doc + + + skipDoc + + + + + + maven-antrun-plugin + + + compile + + + + + + + run + + + + + + + + diff --git a/remote/org.eclipse.remote.proxy.server.product/pom.xml b/remote/org.eclipse.remote.proxy.server.product/pom.xml index 64343c99f70..3bb09444ea8 100644 --- a/remote/org.eclipse.remote.proxy.server.product/pom.xml +++ b/remote/org.eclipse.remote.proxy.server.product/pom.xml @@ -3,12 +3,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - - org.eclipse.remote - remote-parent - 3.0.2-SNAPSHOT - ../../releng/org.eclipse.remote.build/pom.xml - + + org.eclipse.cdt + cdt-parent + 10.5.0-SNAPSHOT + ../../pom.xml + org.eclipse.remote.proxy.server.product 1.0.0 @@ -73,50 +73,50 @@ run - + - + - + - - eclipse-sign - - - - org.eclipse.cbi.maven.plugins - eclipse-macsigner-plugin - ${cbi-plugins.version} - - - sign - package - - sign - - - ${project.build.directory}/products/proxy.server/macosx - - Proxy.app - - 300000 - ${project.basedir}/product.entitlements - - - - - - - - + + production + + + + org.eclipse.cbi.maven.plugins + eclipse-macsigner-plugin + ${cbi-plugins.version} + + + sign + package + + sign + + + ${project.build.directory}/products/proxy.server/macosx + + Proxy.app + + 300000 + ${project.basedir}/product.entitlements + + + + + + + + diff --git a/remote/org.eclipse.remote.target/.project b/remote/org.eclipse.remote.target/.project deleted file mode 100644 index 4493f6fb411..00000000000 --- a/remote/org.eclipse.remote.target/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - org.eclipse.remote.target - - - - - - - - diff --git a/remote/org.eclipse.remote.target/.settings/org.eclipse.core.resources.prefs b/remote/org.eclipse.remote.target/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/remote/org.eclipse.remote.target/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/remote/org.eclipse.remote.target/pom.xml b/remote/org.eclipse.remote.target/pom.xml deleted file mode 100644 index a3c6a9a5d36..00000000000 --- a/remote/org.eclipse.remote.target/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - 4.0.0 - - - org.eclipse.remote - remote-parent - 3.0.2-SNAPSHOT - ../org.eclipse.remote.build/pom.xml - - - org.eclipse.remote.target - pom - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - attach-artifacts - package - - attach-artifact - - - - - remote.target - target - remote-photon - - - - - - - - - diff --git a/remote/org.eclipse.remote.target/remote.target b/remote/org.eclipse.remote.target/remote.target deleted file mode 100644 index 6df912562fb..00000000000 --- a/remote/org.eclipse.remote.target/remote.target +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file