From c4b6593495bb181da7d7b3dbb1945a28f423e608 Mon Sep 17 00:00:00 2001
From: cbrun
Date: Tue, 24 Apr 2018 18:19:07 +0200
Subject: Remove the deprecated "Modeling Discovery" from the package

This feature from the package is now source of a few problems:
* it requires frequent interactions with the teams publishing the
solutions into the release train and such involvement has been pretty
low in the last few years, leading to a number of un-installable
solutions.
* it introduce a dependency to the Amalgam project, from a plugin point
of view, and from a HTTP request point of view as the catalog is
retrieved from the Amalgam download area.

Considering these issues and the fact that it can be replaced by the use
of the Marketplace client (already enabled in the package) and that the
later has way more features it seems like a good idea to revise this
packaging to remove it.

Change-Id: If026f74262fb56e3275544119fdd6f3ec386d4ae
Signed-off-by: Cedric Brun <cedric.brun@obeo.fr>---
 packages/org.eclipse.epp.package.modeling.feature/epp.website.xml | 7 ++-----
 packages/org.eclipse.epp.package.modeling.feature/p2.inf          | 6 ------
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'packages/org.eclipse.epp.package.modeling.feature')

diff --git a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
index 7497f88f..b040d56f 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
@@ -9,7 +9,7 @@
    -->
   <packageMetaData
    packageName="Eclipse Modeling Tools"
-   maintainer="Modeling Amalgamation Project"
+   maintainer="Remi Schnekenburger"
    iconurl="http://www.eclipse.org/modeling/images/modeling_about.png"
    bugzillaComponentId="modeling-package"
    testPlan="http://www.eclipse.org/epp/testplan.php" >
@@ -22,10 +22,7 @@
       <tester>Cédric Brun</tester>
     </packageTesters>
   </packageMetaData>
-  <MoreInfo>
-  <NewAndNoteworthy
-    url="https://projects.eclipse.org/projects/modeling.amalgam/releases/1.8.0"
-    project="Modeling Package" />
+  <MoreInfo>  
   <NewAndNoteworthy
     url="https://wiki.eclipse.org/Ecore_Tools/New_and_Noteworthy"
     project="Eclipse EcoreTools" />
diff --git a/packages/org.eclipse.epp.package.modeling.feature/p2.inf b/packages/org.eclipse.epp.package.modeling.feature/p2.inf
index 3a4c6a50..cd3a5027 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.modeling.feature/p2.inf
@@ -20,10 +20,4 @@ update.range = [4.6.0.20160301-1200, $version$)
 update.severity = 0
 update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.
 
-instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//www.eclipse.org/modeling/amalgam/downloads/package/modeling/photon/,name:Modeling Package Updates for Eclipse Photon);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//www.eclipse.org/modeling/amalgam/downloads/package/modeling/photon/,name:Modeling Package Updates for Eclipse Photon);
 
-instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//www.eclipse.org/modeling/amalgam/downloads/package/modeling/photon/);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//www.eclipse.org/modeling/amalgam/downloads/package/modeling/photon/);
-- 
cgit v1.2.3