This is an automated email from the ASF dual-hosted git repository. olli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git
commit 337cab4b5eb0b009b1b7aca5bd8edd0f87f759a4 Author: Oliver Lietz <[email protected]> AuthorDate: Wed Apr 1 21:21:36 2020 +0200 SLING-9317 Provide HttpComponents Client feature --- src/main/feature/feature.xml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml index 2cb1bd5..20e96d1 100644 --- a/src/main/feature/feature.xml +++ b/src/main/feature/feature.xml @@ -186,9 +186,8 @@ <feature>webconsole</feature> <feature version="${project.version}">sling-discovery</feature> <feature version="${project.version}">sling-healthcheck</feature> + <feature version="${project.version}">httpcomponents-client</feature> <bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle> - <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.13</bundle> - <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.12</bundle> </feature> <feature name="sling-discovery-standalone" version="${project.version}"> <bundle>mvn:org.apache.sling/org.apache.sling.discovery.standalone/1.0.2</bundle> @@ -203,9 +202,8 @@ <feature version="${project.version}">sling-jcr</feature> <feature version="${project.version}">sling-event</feature> <feature version="${project.version}">sling-healthcheck</feature> + <feature version="${project.version}">httpcomponents-client</feature> <feature version="${project.version}">jackrabbit-vault</feature> - <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.13</bundle> - <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.12</bundle> </feature> <feature name="sling-event" version="${project.version}"> <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event</config> @@ -337,8 +335,7 @@ <bundle>mvn:org.apache.sling/org.apache.sling.xss/2.2.2</bundle> <!-- dependencies --> <feature version="${project.version}">sling</feature> - <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.13</bundle> - <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.12</bundle> + <feature version="${project.version}">httpcomponents-client</feature> </feature> <!-- Apache Sling Installer --> <feature name="sling-installer" version="${project.version}"> @@ -583,6 +580,13 @@ <feature>webconsole</feature> <bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.10</bundle> </feature> + <!-- Apache HttpComponents Client --> + <feature name="httpcomponents-client" version="${project.version}"> + <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/4.5.12</bundle> + <!-- dependencies --> + <feature>config</feature> + <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.13</bundle> + </feature> <!-- Apache Jackrabbit --> <feature name="jackrabbit" version="${project.version}"> <bundle>mvn:org.apache.jackrabbit/jackrabbit-api/2.18.3</bundle> @@ -593,6 +597,8 @@ <bundle>mvn:org.apache.jackrabbit/jackrabbit-spi-commons/2.18.3</bundle> <bundle>mvn:org.apache.jackrabbit/jackrabbit-webdav/2.18.3</bundle> <!-- dependencies --> + <!-- dependencies --> + <feature version="${project.version}">httpcomponents-client</feature> <bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle> <bundle dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle> <bundle dependency="true">mvn:commons-codec/commons-codec/1.14</bundle> @@ -605,8 +611,6 @@ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-interceptor_1.1_spec/1.0</bundle> <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jcdi_1.0_spec/1.0</bundle> <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle> - <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.13</bundle> - <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.12</bundle> </feature> <feature name="jackrabbit-oak" version="${project.version}"> <bundle>mvn:org.apache.jackrabbit/oak-api/1.18.0</bundle>
