remove unuse files
This commit is contained in:
parent
486efc6425
commit
4897502b2e
226
0001-Avoid-hard-coding-dependency-versions-by-using-featu.patch
Normal file
226
0001-Avoid-hard-coding-dependency-versions-by-using-featu.patch
Normal file
@ -0,0 +1,226 @@
|
||||
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
|
||||
|
||||
25
0002-Remove-unneeded-dep-on-jdt-annotations.patch
Normal file
25
0002-Remove-unneeded-dep-on-jdt-annotations.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From d52239f133c57aba7853f534c80730b403c3b16d Mon Sep 17 00:00:00 2001
|
||||
From: Mat Booth <mat.booth@redhat.com>
|
||||
Date: Sun, 16 Jun 2019 12:37:29 +0100
|
||||
Subject: [PATCH 2/2] Remove unneeded dep on jdt annotations
|
||||
|
||||
---
|
||||
.../build.properties | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/build.properties b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/build.properties
|
||||
index d9caeab..f165c5f 100644
|
||||
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/build.properties
|
||||
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/build.properties
|
||||
@@ -9,7 +9,4 @@ bin.includes = META-INF/,\
|
||||
.options
|
||||
src.includes = about.html,\
|
||||
asl-v20.txt
|
||||
-## JDT Null Analysis for Eclipse
|
||||
-additional.bundles = org.eclipse.jdt.annotation
|
||||
-## JDT Null Analysis and OSGi Services types for Tycho
|
||||
-jars.extra.classpath = platform:/plugin/org.eclipse.jdt.annotation,platform:/plugin/org.eclipse.osgi.services
|
||||
+jars.extra.classpath = platform:/plugin/org.eclipse.osgi.services
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -1,132 +0,0 @@
|
||||
--- releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml.orig 2018-05-15 10:08:53.167669287 +0100
|
||||
+++ releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml 2018-05-15 10:10:29.460140752 +0100
|
||||
@@ -27,6 +27,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
|
||||
@@ -34,34 +38,6 @@
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
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>
|
||||
--- releng/features/org.eclipse.ecf.discovery.dnssd.feature/feature.xml.orig 2016-09-15 16:17:49.933927862 +0100
|
||||
+++ releng/features/org.eclipse.ecf.discovery.dnssd.feature/feature.xml 2016-09-15 16:19:27.324810394 +0100
|
||||
@@ -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
|
||||
@@ -34,13 +35,6 @@
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.xbill.dns"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
</feature>
|
||||
--- releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml.orig 2018-05-15 10:06:12.993548459 +0100
|
||||
+++ releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml 2018-05-15 10:06:50.070344950 +0100
|
||||
@@ -32,6 +32,7 @@
|
||||
<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
|
||||
@@ -46,13 +47,6 @@
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.objectweb.asm"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
</feature>
|
||||
--- releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml.orig 2016-12-04 06:16:14.000000000 +0000
|
||||
+++ releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml 2017-01-04 12:05:48.238868061 +0000
|
||||
@@ -50,11 +50,4 @@
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
- <plugin
|
||||
- id="javax.servlet"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
</feature>
|
||||
--- releng/features/org.eclipse.ecf.xmpp.feature/feature.xml.orig 2017-01-04 12:35:24.342531553 +0000
|
||||
+++ releng/features/org.eclipse.ecf.xmpp.feature/feature.xml 2017-01-04 12:36:03.274095480 +0000
|
||||
@@ -30,6 +30,7 @@
|
||||
<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 @@
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
|
||||
- <plugin
|
||||
- id="org.xbill.dns"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
</feature>
|
||||
115
eclipse-ecf.spec
115
eclipse-ecf.spec
@ -1,16 +1,17 @@
|
||||
%global _eclipsedir %{_prefix}/lib/eclipse
|
||||
%global __requires_exclude .*org\.eclipse\.equinox.*
|
||||
%global git_tag 5d501929b628b6aa6d28b2f5df73fc45c0fa1945
|
||||
%global git_tag bc2e29e0d5cf49d05bd97dbb082d2ab58eedd13b
|
||||
%bcond_with bootstrap
|
||||
Name: eclipse-ecf
|
||||
Version: 3.14.4
|
||||
Release: 3
|
||||
Version: 3.14.19
|
||||
Release: 1
|
||||
Summary: Eclipse Communication Framework (ECF) Eclipse plug-in
|
||||
License: EPL-1.0 and ASL 2.0
|
||||
URL: http://www.eclipse.org/ecf/
|
||||
Source0: http://git.eclipse.org/c/ecf/org.eclipse.ecf.git/snapshot/org.eclipse.ecf-%{git_tag}.tar.xz
|
||||
Patch0: eclipse-ecf-feature-deps.patch
|
||||
Patch0: 0001-Avoid-hard-coding-dependency-versions-by-using-featu.patch
|
||||
Patch1: CVE-2014-0363.patch
|
||||
Patch2: 0002-Remove-unneeded-dep-on-jdt-annotations.patch
|
||||
BuildRequires: tycho tycho-extras maven-plugin-build-helper eclipse-license osgi-annotation
|
||||
BuildRequires: xpp3-minimal httpcomponents-client httpcomponents-core apache-commons-codec
|
||||
BuildRequires: apache-commons-logging
|
||||
@ -28,105 +29,54 @@ Summary: Eclipse ECF Core
|
||||
Requires: httpcomponents-client httpcomponents-core
|
||||
%description core
|
||||
ECF bundles required by eclipse-platform.
|
||||
%if %{without bootstrap}
|
||||
|
||||
%package runtime
|
||||
Summary: Eclipse Communication Framework (ECF) Eclipse plug-in
|
||||
%description runtime
|
||||
ECF is a set of frameworks for building communications into applications and
|
||||
services. It provides a lightweight, modular, transport-independent, fully
|
||||
compliant implementation of the OSGi Remote Services standard.
|
||||
|
||||
%package sdk
|
||||
Summary: Eclipse ECF SDK
|
||||
%description sdk
|
||||
Documentation and developer resources for the Eclipse Communication Framework
|
||||
(ECF) plug-in.
|
||||
%endif
|
||||
Requires: httpcomponents-client
|
||||
Requires: httpcomponents-core
|
||||
# Obsolete SDK and runtime packages since F33
|
||||
Obsoletes: %{name}-runtime < 3.14.17-3
|
||||
Obsoletes: %{name}-sdk < 3.14.17-3
|
||||
|
||||
%prep
|
||||
%setup -q -n org.eclipse.ecf-%{git_tag}
|
||||
find . -type f -name "*.jar" -exec rm {} \;
|
||||
find . -type f -name "*.class" -exec rm {} \;
|
||||
%patch0
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%pom_xpath_remove "feature/plugin[@id='org.eclipse.ecf.presence']" releng/features/org.eclipse.ecf.core/feature.xml
|
||||
sed -i -e '/org.objectweb.asm/s/7/8/' protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF
|
||||
sed -i -e '/<module>examples/d' -e '/<module>tests/d' pom.xml
|
||||
%pom_disable_module releng/features/org.eclipse.ecf.tests.feature
|
||||
%pom_disable_module releng/features/org.eclipse.ecf.eventadmin.examples.feature
|
||||
%pom_disable_module releng/features/org.eclipse.ecf.remoteservice.examples.feature
|
||||
%pom_disable_module releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature
|
||||
%pom_xpath_remove "feature/requires/import[@feature='org.eclipse.ecf.remoteservice.sdk.examples.feature']" releng/features/org.eclipse.ecf.core/feature.xml
|
||||
%pom_xpath_remove "feature/plugin[@id='org.eclipse.ecf.example.clients']" releng/features/org.eclipse.ecf.core/feature.xml
|
||||
%pom_xpath_remove "feature/plugin[@id='org.eclipse.ecf.example.collab']" releng/features/org.eclipse.ecf.core/feature.xml
|
||||
%patch2 -p1
|
||||
|
||||
# Requires Optional from Java 8
|
||||
sed -i -e 's/JavaSE-1.7/JavaSE-1.8/' providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/META-INF/MANIFEST.MF
|
||||
|
||||
# Don't use target platform or jgit packaging bits
|
||||
%pom_xpath_remove "pom:target"
|
||||
%pom_xpath_remove "pom:plugin[pom:artifactId='tycho-packaging-plugin']/pom:dependencies"
|
||||
%pom_xpath_remove "pom:plugin[pom:artifactId='tycho-packaging-plugin']/pom:configuration/pom:sourceReferences"
|
||||
%pom_xpath_remove "pom:plugin[pom:artifactId='tycho-packaging-plugin']/pom:configuration/pom:timestampProvider"
|
||||
%pom_disable_module releng/org.eclipse.ecf.releng.repository
|
||||
%pom_xpath_remove "feature/requires/import[@plugin='org.json']" releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
|
||||
%pom_disable_module releng/features/org.eclipse.ecf.discovery.zookeeper.feature
|
||||
%pom_disable_module providers/bundles/org.eclipse.ecf.provider.zookeeper
|
||||
%pom_xpath_remove "feature/includes[@id='org.eclipse.ecf.discovery.zookeeper.feature']" releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
|
||||
%pom_disable_module releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature
|
||||
%pom_disable_module framework/bundles/org.eclipse.ecf.remoteservice.rest.synd
|
||||
%pom_disable_module releng/features/org.eclipse.ecf.discovery.slp.feature
|
||||
%pom_disable_module providers/bundles/org.eclipse.ecf.provider.jslp
|
||||
%pom_disable_module protocols/bundles/ch.ethz.iks.slp
|
||||
%pom_xpath_remove "feature/includes[@id='org.eclipse.ecf.discovery.slp.feature']" releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
|
||||
%pom_disable_module releng/features/org.eclipse.ecf.discovery.dnssd.feature
|
||||
%pom_disable_module providers/bundles/org.eclipse.ecf.provider.dnssd
|
||||
%pom_disable_module protocols/bundles/org.jivesoftware.smack
|
||||
%pom_disable_module providers/bundles/org.eclipse.ecf.provider.xmpp.datashare
|
||||
%pom_disable_module providers/bundles/org.eclipse.ecf.provider.xmpp
|
||||
%pom_disable_module providers/bundles/org.eclipse.ecf.provider.xmpp.remoteservice
|
||||
%pom_disable_module providers/bundles/org.eclipse.ecf.provider.xmpp.ui
|
||||
%pom_disable_module releng/features/org.eclipse.ecf.xmpp.feature
|
||||
%pom_xpath_remove "feature/plugin[@id='org.eclipse.ecf.provider.xmpp.ui']" releng/features/org.eclipse.ecf.core/feature.xml
|
||||
%pom_disable_module providers/bundles/org.eclipse.ecf.provider.irc
|
||||
%pom_disable_module providers/bundles/org.eclipse.ecf.provider.irc.ui
|
||||
%pom_xpath_remove "feature/plugin[@id='org.eclipse.ecf.provider.irc']" releng/features/org.eclipse.ecf.core/feature.xml
|
||||
%pom_xpath_remove "feature/plugin[@id='org.eclipse.ecf.provider.irc.ui']" releng/features/org.eclipse.ecf.core/feature.xml
|
||||
ln -s $(build-classpath osgi-annotation) osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/osgi/osgi.annotation.jar
|
||||
%if %{with bootstrap}
|
||||
|
||||
# Don't build bundles that are not relevant to our platform
|
||||
%pom_disable_module providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32
|
||||
%pom_xpath_remove "feature/plugin[@os='win32']" releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml
|
||||
|
||||
# Only build core modules needed by Eclipse platform
|
||||
%pom_xpath_replace "pom:modules" "<modules>
|
||||
<module>releng/features/org.eclipse.ecf.core.feature</module>
|
||||
<module>releng/features/org.eclipse.ecf.core.ssl.feature</module>
|
||||
<module>releng/features/org.eclipse.ecf.filetransfer.feature</module>
|
||||
<module>releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature</module>
|
||||
<module>releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature</module>
|
||||
<module>releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature</module>
|
||||
<module>releng/features/org.eclipse.ecf.filetransfer.ssl.feature</module>
|
||||
<module>framework/bundles/org.eclipse.ecf</module>
|
||||
<module>framework/bundles/org.eclipse.ecf.identity</module>
|
||||
<module>framework/bundles/org.eclipse.ecf.filetransfer</module>
|
||||
<module>framework/bundles/org.eclipse.ecf.ssl</module>
|
||||
<module>providers/bundles/org.eclipse.ecf.provider.filetransfer</module>
|
||||
<module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4</module>
|
||||
<module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl</module>
|
||||
<module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45</module>
|
||||
<module>providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl</module>
|
||||
</modules>"
|
||||
%endif
|
||||
sed -i -e '/Require-Bundle:/a\ org.eclipse.osgi.services,' framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF
|
||||
|
||||
%mvn_package "::{pom,target}::" __noinstall
|
||||
%if %{with bootstrap}
|
||||
|
||||
%mvn_package "::jar:{sources,sources-feature}:" __noinstall
|
||||
%else
|
||||
%mvn_package "::jar:{sources,sources-feature}:" sdk
|
||||
%endif
|
||||
%mvn_package ":org.eclipse.ecf.{core,sdk}" sdk
|
||||
%mvn_package ":org.eclipse.ecf.docshare*" sdk
|
||||
for p in $(grep '<plugin' releng/features/org.eclipse.ecf.core/feature.xml | sed -e 's/.*id="\(.*\)" d.*/\1/') ; do
|
||||
%mvn_package ":$p" sdk
|
||||
done
|
||||
%mvn_package ":*.ui" sdk
|
||||
%mvn_package ":*.ui.*" sdk
|
||||
%mvn_package ":org.eclipse.ecf.remoteservice.sdk.*" sdk
|
||||
%mvn_package ":org.eclipse.ecf.core.{,ssl.}feature"
|
||||
%mvn_package ":org.eclipse.ecf.filetransfer.{,httpclient4.}{,ssl.}feature"
|
||||
%mvn_package ":org.eclipse.ecf{,.identity,.ssl,.filetransfer}"
|
||||
%mvn_package ":org.eclipse.ecf.provider.filetransfer*"
|
||||
%mvn_package ":" runtime
|
||||
%mvn_package ":"
|
||||
|
||||
%build
|
||||
QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d-%H%M)
|
||||
@ -160,14 +110,11 @@ popd
|
||||
|
||||
%files core -f .mfiles
|
||||
%{_javadir}/eclipse/*
|
||||
%if %{without bootstrap}
|
||||
|
||||
%files runtime -f .mfiles-runtime
|
||||
|
||||
%files sdk -f .mfiles-sdk
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Jan 18 2022 SimpleUpdate Robot <tc@openeuler.org> - 3.14.19-1
|
||||
- Upgrade to version 3.14.19
|
||||
|
||||
* Thu Feb 4 2021 wutao <wutao61@huawei.com> - 3.14.4-3
|
||||
- remove irclib deps
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user