Repository: cxf Updated Branches: refs/heads/master 65654316c -> 5891c0d23
Add new features to karaf features file Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5891c0d2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5891c0d2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5891c0d2 Branch: refs/heads/master Commit: 5891c0d23b776d41be02e74a3b98a3881970d08f Parents: 6565431 Author: Daniel Kulp <[email protected]> Authored: Fri Mar 27 16:11:52 2015 -0400 Committer: Daniel Kulp <[email protected]> Committed: Fri Mar 27 16:11:52 2015 -0400 ---------------------------------------------------------------------- .../features/src/main/resources/features.xml | 19 +++++++++++++++++-- parent/pom.xml | 3 ++- 2 files changed, 19 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/5891c0d2/osgi/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml index f7052ff..9f03db6 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -242,6 +242,19 @@ <feature version="${project.version}">cxf-core</feature> <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-features-clustering/${project.version}</bundle> </feature> + <feature name="cxf-features-logging" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">cxf-core</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-features-logging/${project.version}</bundle> + </feature> + <feature name="cxf-features-throttling" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">cxf-core</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-features-throttling/${project.version}</bundle> + </feature> + <feature name="cxf-features-metrics" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">cxf-core</feature> + <bundle start-level="40" dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${cxf.dropwizard.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-features-metrics/${project.version}</bundle> + </feature> <feature name="cxf-bindings-corba" version="${project.version}" resolver="(obr)"> <feature version="${project.version}">cxf-wsdl</feature> <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-bindings-corba/${project.version}</bundle> @@ -342,8 +355,10 @@ <feature version="${project.version}">cxf-javascript</feature> <feature version="${project.version}">cxf-frontend-javascript</feature> <feature version="${project.version}">cxf-features-clustering</feature> - <!-- Compatibility bundle for the Require-Bundle use cases --> - <!--bundle start-level='50'>mvn:org.apache.cxf/cxf-bundle-compatible/${project.version}</bundle--> + <feature version="${project.version}">cxf-features-metrics</feature> + <feature version="${project.version}">cxf-features-throttling</feature> + <feature version="${project.version}">cxf-features-logging</feature> + <!-- tools really aren't needed in OSGi by default <feature version="${project.version}">cxf-tools</feature> --> http://git-wip-us.apache.org/repos/asf/cxf/blob/5891c0d2/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index de4ef21..4bc5718 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -79,6 +79,7 @@ <cxf.commons-collections.version>3.2.1</cxf.commons-collections.version> <cxf.commons-lang.version>2.6</cxf.commons-lang.version> <cxf.derby.version>10.2.2.0</cxf.derby.version> + <cxf.dropwizard.version>3.1.0</cxf.dropwizard.version> <cxf.ehcache.version>2.9.0</cxf.ehcache.version> <cxf.fastinfoset.bundle.version>1.2.13_1</cxf.fastinfoset.bundle.version> <cxf.guava.version>18.0</cxf.guava.version> @@ -1774,7 +1775,7 @@ <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-core</artifactId> - <version>3.1.0</version> + <version>${cxf.dropwizard.version}</version> </dependency> </dependencies> </dependencyManagement>
