Excluding http-components since they lead to conflicts with existing

plugins. Fixing the hardcoding of plugin versions in the category.xml file
eclipse · Sep 30, 2020 · 372d635 · 372d635
1 parent 2386535
commit 372d635
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 7 deletions.
diff --git a/org.eclipse.lyo.oslc4j.plugins/category.xml b/org.eclipse.lyo.oslc4j.plugins/category.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.lyo.oslc4j.implementations.plugin.feature_4.0.0.qualifier.jar" id="org.eclipse.lyo.oslc4j.implementations.plugin.feature" version="4.0.0.qualifier">
+   <feature id="org.eclipse.lyo.oslc4j.implementations.plugin.feature">
       <category name="org.eclipse.lyo.oslc4j.osgi.bundles.category"/>
    </feature>
-   <feature url="features/org.eclipse.lyo.oslc4j.client.plugin.feature_4.0.0.qualifier.jar" id="org.eclipse.lyo.oslc4j.client.plugin.feature" version="4.0.0.qualifier">
+   <feature id="org.eclipse.lyo.oslc4j.client.plugin.feature">
       <category name="org.eclipse.lyo.oslc4j.osgi.bundles.category"/>
    </feature>
-   <feature url="features/org.eclipse.lyo.oslc4j.core.plugin.feature_4.0.0.qualifier.jar" id="org.eclipse.lyo.oslc4j.core.plugin.feature" version="4.0.0.qualifier">
+   <feature id="org.eclipse.lyo.oslc4j.core.plugin.feature">
       <category name="org.eclipse.lyo.oslc4j.osgi.bundles.category"/>
    </feature>
    <category-def name="org.eclipse.lyo.oslc4j.osgi.bundles.category" label="Lyo OSGI Bundles"/>

diff --git a/org.eclipse.lyo.oslc4j.plugins/pom.xml b/org.eclipse.lyo.oslc4j.plugins/pom.xml
@@ -101,9 +101,26 @@
                                         Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
                                     </license>
                                     <artifacts>
-                                        <artifact><id>org.eclipse.lyo.oslc4j.core:oslc4j-core:${project.version}</id></artifact>
-                                        <artifact><id>org.eclipse.lyo.oslc4j.core:oslc4j-jena-provider:${project.version}</id></artifact>
-                                        <artifact><id>org.eclipse.lyo.core.query:oslc-query:${project.version}</id></artifact>
+                                        <artifact><id>org.eclipse.lyo.oslc4j.core:oslc4j-core:${project.version}</id>
+                                            <!-- 2020-09-30 Jad: We need to exclude some items, since they are already part of an eclipse installation.
+                                             Adding them might mean upgrading/downgrading these plugins, which leads to problems with other plugin installations. -->
+                                            <excludes>
+                                                <exclude>org.apache.httpcomponents:httpcore::</exclude>
+                                                <exclude>org.apache.httpcomponents:httpclient::</exclude>
+                                            </excludes>
+                                        </artifact>
+                                        <artifact><id>org.eclipse.lyo.oslc4j.core:oslc4j-jena-provider:${project.version}</id>
+                                            <excludes>
+                                                <exclude>org.apache.httpcomponents:httpcore::</exclude>
+                                                <exclude>org.apache.httpcomponents:httpclient::</exclude>
+                                            </excludes>
+                                        </artifact>
+                                        <artifact><id>org.eclipse.lyo.core.query:oslc-query:${project.version}</id>
+                                            <excludes>
+                                                <exclude>org.apache.httpcomponents:httpcore::</exclude>
+                                                <exclude>org.apache.httpcomponents:httpclient::</exclude>
+                                            </excludes>
+                                        </artifact>
                                      </artifacts>
                                 </feature>
                                 <feature>
@@ -177,7 +194,12 @@
                                         Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
                                     </license>
                                     <artifacts>
-                                        <artifact><id>org.eclipse.lyo.clients:oslc4j-client:${project.version}</id></artifact>
+                                        <artifact><id>org.eclipse.lyo.clients:oslc4j-client:${project.version}</id>
+                                            <excludes>
+                                                <exclude>org.apache.httpcomponents:httpcore::</exclude>
+                                                <exclude>org.apache.httpcomponents:httpclient::</exclude>
+                                            </excludes>
+                                        </artifact>
                                     </artifacts>
                                 </feature>
                             </featureDefinitions>