jerboaa / rpms / eclipse

Forked from rpms/eclipse 5 years ago
Clone
4085f55
--- eclipse.jdt/org.eclipse.jdt-feature/feature.xml.orig	2018-08-17 01:24:16.000000000 +0100
4085f55
+++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml	2018-08-19 12:50:33.575708475 +0100
53f7c53
@@ -19,6 +19,23 @@
bbe6075
       %license
bbe6075
    </license>
f73fd5c
 
bbe6075
+   <requires>
bbe6075
+      <import plugin="org.junit" />
bbe6075
+      <import plugin="org.hamcrest.core" />
53f7c53
+      <import plugin="org.junit.jupiter.api" />
53f7c53
+      <import plugin="org.junit.jupiter.engine" />
53f7c53
+      <import plugin="org.junit.jupiter.migrationsupport" />
53f7c53
+      <import plugin="org.junit.jupiter.params" />
53f7c53
+      <import plugin="org.junit.platform.commons" />
53f7c53
+      <import plugin="org.junit.platform.engine" />
53f7c53
+      <import plugin="org.junit.platform.launcher" />
53f7c53
+      <import plugin="org.junit.platform.runner" />
53f7c53
+      <import plugin="org.junit.platform.suite.api" />
53f7c53
+      <import plugin="org.junit.vintage.engine" />
53f7c53
+      <import plugin="org.opentest4j" />
53f7c53
+      <import plugin="org.apiguardian" />
bbe6075
+   </requires>
bbe6075
+
f73fd5c
    
bbe6075
          id="org.eclipse.jdt"
bbe6075
          download-size="0"
4085f55
@@ -158,103 +175,6 @@
4085f55
          download-size="0"
4085f55
          install-size="0"
4085f55
          version="0.0.0"
4085f55
-         unpack="false"/>
4085f55
-
4085f55
-   
f73fd5c
-         id="org.junit"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.hamcrest.core"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.jupiter.api"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.jupiter.engine"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.jupiter.migrationsupport"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.jupiter.params"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.platform.commons"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.platform.engine"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.platform.launcher"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.platform.runner"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.platform.suite.api"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.vintage.engine"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.opentest4j"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
4085f55
-
53f7c53
-   
53f7c53
-         id="org.apiguardian"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
4085f55
          unpack="false"/>
4085f55
 
4085f55
    
4085f55
--- eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml.orig	2018-08-17 01:24:16.000000000 +0100
4085f55
+++ eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml	2018-08-19 12:53:08.128130452 +0100
bbe6075
@@ -21,6 +21,8 @@
bbe6075
 
bbe6075
    <requires>
4085f55
       <import feature="org.eclipse.jdt" version="3.15.0" match="compatible"/>
bbe6075
+      <import plugin="org.objectweb.asm" />
bbe6075
+      <import plugin="org.objectweb.asm.tree" />
bbe6075
    </requires>
f73fd5c
 
f73fd5c
    
bbe6075
@@ -83,20 +85,6 @@
bbe6075
          download-size="0"
bbe6075
          install-size="0"
bbe6075
          version="0.0.0"
bbe6075
-         unpack="false"/>
bbe6075
-
bbe6075
-   
f73fd5c
-         id="org.objectweb.asm"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.objectweb.asm.tree"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
          unpack="false"/>
f73fd5c
 
bbe6075
    
3196467
--- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml.orig	2017-01-04 10:57:15.000000000 +0000
3196467
+++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml	2017-01-13 11:29:16.371473551 +0000
c48d605
@@ -23,69 +23,6 @@
f73fd5c
    </license>
f73fd5c
 
f73fd5c
    
f73fd5c
-         id="javax.el"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="javax.servlet"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="javax.servlet.jsp"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="com.sun.el"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.apache.commons.logging"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.apache.jasper.glassfish"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
c736234
-         id="org.apache.lucene.analyzers-common"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.apache.lucene.core"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
c736234
-         id="org.apache.lucene.analyzers-smartcn"
c736234
-         download-size="0"
c736234
-         install-size="0"
c736234
-         version="0.0.0"
c736234
-         unpack="false"/>
c736234
-
c736234
-   
f73fd5c
          id="org.eclipse.equinox.http.jetty"
f73fd5c
          download-size="0"
f73fd5c
          install-size="0"
c48d605
@@ -142,55 +79,6 @@
f73fd5c
          unpack="false"/>
f73fd5c
 
f73fd5c
    
f73fd5c
-         id="org.eclipse.jetty.continuation"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.eclipse.jetty.http"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.eclipse.jetty.io"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.eclipse.jetty.security"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.eclipse.jetty.server"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.eclipse.jetty.servlet"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.eclipse.jetty.util"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
          id="org.eclipse.core.net"
f73fd5c
          download-size="0"
f73fd5c
          install-size="0"
c48d605
@@ -204,4 +92,22 @@
f73fd5c
          version="0.0.0"
f73fd5c
          unpack="false"/>
f73fd5c
 
c736234
+   <requires>
c736234
+      <import plugin="javax.el-api" />
c736234
+      <import plugin="javax.servlet-api" />
f73fd5c
+      <import plugin="javax.servlet.jsp" />
c736234
+      <import plugin="com.sun.el.javax.el" />
f73fd5c
+      <import plugin="org.apache.commons.logging" />
c736234
+      <import plugin="org.glassfish.web.javax.servlet.jsp" />
8fcf627
+      <import plugin="org.apache.lucene.analyzers-common" />
f73fd5c
+      <import plugin="org.apache.lucene.core" />
c736234
+      <import plugin="org.apache.lucene.analyzers-smartcn" />
f73fd5c
+      <import plugin="org.eclipse.jetty.continuation" />
f73fd5c
+      <import plugin="org.eclipse.jetty.http" />
f73fd5c
+      <import plugin="org.eclipse.jetty.io" />
f73fd5c
+      <import plugin="org.eclipse.jetty.security" />
f73fd5c
+      <import plugin="org.eclipse.jetty.server" />
f73fd5c
+      <import plugin="org.eclipse.jetty.servlet" />
f73fd5c
+      <import plugin="org.eclipse.jetty.util" />
c736234
+   </requires>
f73fd5c
 </feature>
4085f55
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig	2018-08-19 13:57:13.249904259 +0100
4085f55
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	2018-08-19 14:03:19.527742984 +0100
c242877
@@ -22,6 +22,23 @@
c48d605
    <requires>
c48d605
       <import feature="org.eclipse.emf.common" version="2.7.0" match="compatible"/>
c48d605
       <import feature="org.eclipse.emf.ecore" version="2.7.0" match="compatible"/>
c48d605
+      <import plugin="org.apache.batik.css" />
c48d605
+      <import plugin="org.w3c.css.sac" />
c242877
+      <import plugin="org.apache.batik.util" />
c48d605
+      <import plugin="org.w3c.dom.svg" />
c48d605
+      <import plugin="javax.inject" />
c242877
+      <import plugin="javax.annotation-api" />
c242877
+      <import plugin="org.apache.batik.i18n" />
c242877
+      <import plugin="org.apache.batik.constants" />
c242877
+      <import plugin="org.apache.xmlgraphics" />
c242877
+      <import plugin="org.apache.commons.io" />
c242877
+      <import plugin="org.apache.commons.logging" />
c48d605
+      <import plugin="org.apache.felix.scr" />
c48d605
+      <import plugin="com.ibm.icu" />
c48d605
+      <import plugin="org.apache.felix.gogo.command" />
c48d605
+      <import plugin="org.apache.felix.gogo.runtime" />
c48d605
+      <import plugin="org.apache.felix.gogo.shell" />
c48d605
+      <import plugin="org.apache.commons.jxpath" />
c48d605
    </requires>
c48d605
 
c48d605
    
c242877
@@ -95,62 +112,6 @@
f73fd5c
          unpack="false"/>
f73fd5c
 
f73fd5c
    
f73fd5c
-         id="org.apache.batik.css"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
365159b
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.w3c.css.sac"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.apache.batik.util"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
365159b
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.w3c.dom.svg"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
365159b
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.w3c.dom.smil"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
365159b
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.w3c.dom.events"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
365159b
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="javax.inject"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="javax.annotation"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
          id="org.eclipse.e4.core.di"
f73fd5c
          download-size="0"
f73fd5c
          install-size="0"
c242877
@@ -165,41 +126,6 @@
f73fd5c
          unpack="false"/>
f73fd5c
 
f73fd5c
    
c242877
-         id="org.apache.batik.i18n"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
c48d605
-         id="org.apache.batik.constants"
c48d605
-         download-size="0"
c48d605
-         install-size="0"
c48d605
-         version="0.0.0"
c48d605
-         unpack="false"/>
4085f55
-
c48d605
-   
c48d605
-         id="org.apache.xmlgraphics"
c48d605
-         download-size="0"
c48d605
-         install-size="0"
c48d605
-         version="0.0.0"
c48d605
-         unpack="false"/>
c48d605
-
c48d605
-   
c48d605
-         id="org.apache.commons.io"
c48d605
-         download-size="0"
c48d605
-         install-size="0"
c48d605
-         version="0.0.0"
c48d605
-         unpack="false"/>
c48d605
-
c48d605
-   
c48d605
-         id="org.apache.commons.logging"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
365159b
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
c736234
          id="org.eclipse.e4.core.di.extensions"
c736234
          download-size="0"
c736234
          install-size="0"
c242877
@@ -245,13 +171,6 @@
c736234
          unpack="false"/>
c736234
 
c736234
    
c736234
-         id="org.apache.felix.scr"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
c242877
          id="org.eclipse.equinox.event"
f73fd5c
          download-size="0"
f73fd5c
          install-size="0"
c242877
@@ -336,13 +255,6 @@
f73fd5c
          unpack="false"/>
f73fd5c
 
f73fd5c
    
f73fd5c
-         id="com.ibm.icu"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
          id="org.eclipse.equinox.preferences"
f73fd5c
          download-size="0"
f73fd5c
          install-size="0"
c242877
@@ -596,27 +508,6 @@
f73fd5c
          unpack="false"/>
f73fd5c
 
f73fd5c
    
f73fd5c
-         id="org.apache.felix.gogo.command"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.apache.felix.gogo.runtime"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
-         id="org.apache.felix.gogo.shell"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
f73fd5c
          id="org.eclipse.equinox.console"
f73fd5c
          download-size="0"
f73fd5c
          install-size="0"
c242877
@@ -642,13 +533,6 @@
c48d605
          download-size="0"
c48d605
          install-size="0"
c48d605
          version="0.0.0"
c48d605
-         unpack="false"/>
c48d605
-
c48d605
-   
bbe6075
-         id="org.apache.commons.jxpath"
bbe6075
-         download-size="0"
bbe6075
-         install-size="0"
bbe6075
-         version="0.0.0"
f73fd5c
          unpack="false"/>
f73fd5c
 
c48d605
    
3196467
--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml.orig	2017-01-04 10:54:36.000000000 +0000
3196467
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml	2017-01-13 11:28:25.827041896 +0000
4085f55
@@ -60,12 +60,7 @@
3196467
                   </requirement>
3196467
                   <requirement>
3196467
                     <type>eclipse-plugin</type>
3196467
-                    <id>javax.annotation</id>
3196467
-                    <versionRange>0.0.0</versionRange>
3196467
-                  </requirement>
3196467
-                  <requirement>
3196467
-                    <type>eclipse-plugin</type>
c736234
-                    <id>javax.el</id>
c736234
+                    <id>javax.el-api</id>
c736234
                     <versionRange>0.0.0</versionRange>
c736234
                   </requirement>
c736234
                   <requirement>
4085f55
@@ -75,7 +70,7 @@
c736234
                   </requirement>
c736234
                   <requirement>
c736234
                     <type>eclipse-plugin</type>
c736234
-                    <id>javax.servlet</id>
c736234
+                    <id>javax.servlet-api</id>
3196467
                     <versionRange>0.0.0</versionRange>
3196467
                   </requirement>
c736234
                   <requirement>
4085f55
@@ -95,7 +90,7 @@
3196467
                   </requirement>
3196467
                   <requirement>
3196467
                     <type>eclipse-plugin</type>
3196467
-                    <id>org.apache.jasper.glassfish</id>
3196467
+                    <id>org.glassfish.web.javax.servlet.jsp</id>
3196467
                     <versionRange>0.0.0</versionRange>
3196467
                   </requirement>
3196467
                   <requirement>
c242877
--- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.orig	2018-11-29 17:25:22.652275197 +0000
c242877
+++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml	2018-11-29 17:31:00.129228645 +0000
c242877
@@ -19,6 +19,17 @@
c242877
       %license
c242877
    </license>
c242877
 
c242877
+   <requires>
c242877
+      <import plugin="org.apache.commons.fileupload" />
c242877
+      <import plugin="org.apache.commons.io" />
c242877
+      <import plugin="org.hamcrest.core" />
c242877
+      <import plugin="org.hamcrest.integration" />
c242877
+      <import plugin="org.hamcrest.library" />
c242877
+      <import plugin="org.mockito.mockito-core" />
c242877
+      <import plugin="org.objenesis" />
c242877
+      <import plugin="net.sf.cglib.core" />
c242877
+   </requires>
c242877
+
c242877
    
c242877
          id="org.eclipse.test"
c242877
          version="0.0.0"/>
c242877
@@ -422,20 +433,6 @@
c242877
          version="0.0.0"/>
c242877
 
c242877
    
c242877
-         id="org.apache.commons.fileupload"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
c242877
-         id="org.apache.commons.io"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
c242877
          id="org.eclipse.equinox.p2.installer"
c242877
          download-size="0"
c242877
          install-size="0"
c242877
@@ -485,41 +482,6 @@
c242877
          version="0.0.0"/>
c242877
 
c242877
    
c242877
-         id="org.hamcrest.core"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
c242877
-         id="org.hamcrest.integration"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
c242877
-         id="org.hamcrest.library"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-    
c242877
-         id="org.mockito"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
c242877
-         id="org.objenesis"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
c242877
          id="org.eclipse.ui.tests.pluginchecks"
c242877
          download-size="0"
c242877
          install-size="0"
c242877
--- eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml.orig	2018-11-30 01:09:49.920232553 +0000
c242877
+++ eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml	2018-11-30 01:12:08.186867812 +0000
c242877
@@ -19,6 +19,15 @@
c242877
       %license
c242877
    </license>
c242877
 
c242877
+   <requires>
c242877
+      <import plugin="org.junit" />
c242877
+      <import plugin="org.easymock" />
c242877
+      <import plugin="org.hamcrest.core" />
c242877
+      <import plugin="org.hamcrest.library" />
c242877
+      <import plugin="org.mockito.mockito-core" />
c242877
+      <import plugin="net.sf.cglib.core" />
c242877
+   </requires>
c242877
+
c242877
    
c242877
          id="org.eclipse.ant.optional.junit"
c242877
          download-size="0"
c242877
@@ -55,57 +64,9 @@
c242877
          unpack="false"/>
c242877
 
c242877
    
c242877
-         id="org.junit"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"/>
c242877
-
c242877
-   
c242877
-         id="org.easymock"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
c242877
-         id="org.hamcrest.core"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
c242877
-         id="org.mockito"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
c242877
-         id="net.bytebuddy.byte-buddy"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
c242877
-         id="net.bytebuddy.byte-buddy-agent"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
c242877
          id="org.eclipse.core.tests.harness"
c242877
          download-size="0"
c242877
          install-size="0"
c242877
          version="0.0.0"/>
c242877
 
c242877
-   
c242877
-         id="org.hamcrest.library"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
 </feature>
c242877
--- ./eclipse.platform.ua/org.eclipse.tips.feature/feature.xml.orig	2018-12-03 15:28:24.822448273 +0000
c242877
+++ ./eclipse.platform.ua/org.eclipse.tips.feature/feature.xml	2018-12-03 15:29:45.204209427 +0000
c242877
@@ -32,6 +32,10 @@
c242877
       %license
c242877
    </license>
c242877
 
c242877
+   <requires>
c242877
+      <import plugin="com.google.gson" />
c242877
+   </requires>
c242877
+
c242877
    
c242877
          id="org.eclipse.tips.ui"
c242877
          download-size="0"
c242877
@@ -58,13 +62,6 @@
c242877
          download-size="0"
c242877
          install-size="0"
c242877
          version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
c242877
-         id="com.google.gson"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
          unpack="false"/>
c242877
 
c242877
 </feature>