activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject activemq git commit: Revert "[AMQ-6515] Adding javax.inject bundle to fix the issue on feature install" guava 14 was the culprit - activemq-osgi does not need to import javax.inject
Date Fri, 02 Dec 2016 12:56:16 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 29ecfd6cd -> 59bfffd2b


Revert "[AMQ-6515] Adding javax.inject bundle to fix the issue on feature install"
guava 14 was the culprit - activemq-osgi does not need to import javax.inject

This reverts commit 00129837dedd010843fe19150adfbfb64e97ced8.


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/59bfffd2
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/59bfffd2
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/59bfffd2

Branch: refs/heads/master
Commit: 59bfffd2b45db4d85b278e6b9a6d1cd13e0f0902
Parents: 29ecfd6
Author: gtully <gary.tully@gmail.com>
Authored: Fri Dec 2 12:55:20 2016 +0000
Committer: gtully <gary.tully@gmail.com>
Committed: Fri Dec 2 12:55:20 2016 +0000

----------------------------------------------------------------------
 activemq-karaf/src/main/resources/features-core.xml | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/59bfffd2/activemq-karaf/src/main/resources/features-core.xml
----------------------------------------------------------------------
diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
index 3f52fbf..75375eb 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -23,7 +23,6 @@
     <!-- Bundles needed if only client will be deployed in the container -->
     <feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}"
resolver="(obr)" start-level="50">
         <feature version="[3.2,4)">spring</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_2</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>


Mime
View raw message