Projects
Mega:23.09
eclipse-ecf
_service:tar_scm:0001-Avoid-hard-coding-depende...
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:tar_scm:0001-Avoid-hard-coding-dependency-versions-by-using-featu.patch of Package eclipse-ecf
From 51b88b0a6e59107f393d497cf94db07c0865e577 Mon Sep 17 00:00:00 2001 From: Mat Booth <mat.booth@redhat.com> Date: Sun, 16 Jun 2019 12:22:32 +0100 Subject: [PATCH 1/2] Avoid hard-coding dependency versions by using feature imports instead of feature plugins for third party bundles --- .../feature.xml | 8 +-- .../feature.xml | 32 ++--------- .../feature.xml | 56 ++----------------- .../feature.xml | 8 +-- .../feature.xml | 7 --- .../org.eclipse.ecf.xmpp.feature/feature.xml | 8 +-- 6 files changed, 11 insertions(+), 108 deletions(-) diff --git a/releng/features/org.eclipse.ecf.discovery.dnssd.feature/feature.xml b/releng/features/org.eclipse.ecf.discovery.dnssd.feature/feature.xml index 0c7810a..d4b0e67 100644 --- a/releng/features/org.eclipse.ecf.discovery.dnssd.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.discovery.dnssd.feature/feature.xml @@ -27,6 +27,7 @@ <requires> <import feature="org.eclipse.ecf.discovery.feature" version="1.0.0" match="compatible"/> + <import plugin="org.xbill.dns"/> </requires> <plugin @@ -36,11 +37,4 @@ version="0.0.0" unpack="false"/> - <plugin - id="org.xbill.dns" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml index 3405a28..14061df 100644 --- a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml @@ -27,6 +27,10 @@ Contributors: Composent, Inc. - initial API and implementation <requires> <import feature="org.eclipse.ecf.filetransfer.feature" version="3.9.0" match="compatible"/> + <import plugin="org.apache.commons.codec" /> + <import plugin="org.apache.commons.logging" /> + <import plugin="org.apache.httpcomponents.httpclient" /> + <import plugin="org.apache.httpcomponents.httpcore" /> </requires> <plugin @@ -36,32 +40,4 @@ Contributors: Composent, Inc. - initial API and implementation version="0.0.0" unpack="false"/> - <plugin - id="org.apache.commons.codec" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.commons.logging" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.httpcomponents.httpclient" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.httpcomponents.httpcore" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml index 635864e..8d2a450 100644 --- a/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml @@ -21,6 +21,10 @@ <requires> <import feature="org.eclipse.ecf.filetransfer.feature" version="3.9.0" match="compatible"/> + <import plugin="org.apache.commons.codec" /> + <import plugin="org.apache.commons.logging" /> + <import plugin="org.apache.httpcomponents.httpclient" /> + <import plugin="org.apache.httpcomponents.httpcore" /> </requires> <plugin @@ -38,56 +42,4 @@ version="0.0.0" unpack="false"/> - <plugin - id="org.apache.commons.codec" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.commons.logging" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="com.sun.jna" - os="win32" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="com.sun.jna.platform" - os="win32" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.httpcomponents.httpclient" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.httpcomponents.httpclient.win" - os="win32" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.apache.httpcomponents.httpcore" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> diff --git a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml index af23e93..284c52f 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml @@ -32,6 +32,7 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services <requires> <import feature="org.eclipse.ecf.provider.generic.feature" version="1.0" match="compatible"/> <import feature="org.eclipse.ecf.remoteservice.feature" version="2.1" match="compatible"/> + <import plugin="org.objectweb.asm" /> </requires> <plugin @@ -48,11 +49,4 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services version="0.0.0" unpack="false"/> - <plugin - id="org.objectweb.asm" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> diff --git a/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml index dee188b..0d0d7ad 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml @@ -50,11 +50,4 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services version="0.0.0" unpack="false"/> - <plugin - id="javax.servlet" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> diff --git a/releng/features/org.eclipse.ecf.xmpp.feature/feature.xml b/releng/features/org.eclipse.ecf.xmpp.feature/feature.xml index a7aa0da..4e3cc0c 100644 --- a/releng/features/org.eclipse.ecf.xmpp.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.xmpp.feature/feature.xml @@ -30,6 +30,7 @@ Contributors: Composent, Inc. - initial API and implementation <import feature="org.eclipse.ecf.presence.feature" version="1.0" match="compatible"/> <import feature="org.eclipse.ecf.datashare.feature" version="1.0" match="compatible"/> <import feature="org.eclipse.ecf.remoteservice.feature" version="2.1" match="compatible"/> + <import plugin="org.xbill.dns"/> </requires> <plugin @@ -62,11 +63,4 @@ Contributors: Composent, Inc. - initial API and implementation fragment="true" unpack="false"/> - <plugin - id="org.xbill.dns" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> -- 2.20.1
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2