Repository: olingo-odata4 Updated Branches: refs/heads/OLINGO-642_OSGi-Sample 5727d0587 -> e59b5082f
Add Karaf features for Olingo Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/0b8d46fc Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/0b8d46fc Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/0b8d46fc Branch: refs/heads/OLINGO-642_OSGi-Sample Commit: 0b8d46fc6a3479b1ed05bd53ba5549e05e8b26df Parents: 5727d05 Author: Aki Yoshida <[email protected]> Authored: Thu May 28 16:34:48 2015 +0200 Committer: Michael Bolz <[email protected]> Committed: Wed Jun 10 06:14:19 2015 +0200 ---------------------------------------------------------------------- ext/karaf/features/pom.xml | 81 ++++++++++++++++++++ .../features/src/main/resources/features.xml | 59 ++++++++++++++ ext/pom.xml | 1 + pom.xml | 2 + 4 files changed, 143 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0b8d46fc/ext/karaf/features/pom.xml ---------------------------------------------------------------------- diff --git a/ext/karaf/features/pom.xml b/ext/karaf/features/pom.xml new file mode 100644 index 0000000..921eac2 --- /dev/null +++ b/ext/karaf/features/pom.xml @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <artifactId>odata-karaf-features</artifactId> + <packaging>pom</packaging> + <name>${project.artifactId}</name> + + <parent> + <groupId>org.apache.olingo</groupId> + <artifactId>odata-ext</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../..</relativePath> + </parent> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>filter</id> + <phase>generate-resources</phase> + <goals> + <goal>resources</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>target/classes/features.xml</file> + <type>xml</type> + <classifier>features</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0b8d46fc/ext/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/ext/karaf/features/src/main/resources/features.xml b/ext/karaf/features/src/main/resources/features.xml new file mode 100644 index 0000000..0a433c5 --- /dev/null +++ b/ext/karaf/features/src/main/resources/features.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"; name="olingo-${project.version}"> + + <feature name="olingo-server" version="${project.version}" resolver="(obr)" start-level="50"> + <feature>war</feature> + <bundle>mvn:commons-codec/commons-codec/${commons.codec.version}</bundle> + <bundle>mvn:org.apache.commons/commons-lang3/${commons.lang3.version}</bundle> + <bundle>mvn:org.codehaus.woodstox/stax2-api/${woodstox.stax2-api.version}</bundle> + <bundle>mvn:com.fasterxml/aalto-xml/${aalto-xml.version}</bundle> + <bundle>wrap:mvn:org.antlr/antlr4-runtime/${antlr.version}/$Bundle-SymbolicName=antlr4-runtime&Bundle-Version=${antlr.version}&Export-Package=org.antlr.v4.runtime*</bundle> + + <bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle> + <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle> + <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle> + + <bundle>mvn:org.apache.olingo/odata-commons-api/${project.version}</bundle> + <bundle>mvn:org.apache.olingo/odata-commons-core/${project.version}</bundle> + <bundle>mvn:org.apache.olingo/odata-server-api/${project.version}</bundle> + <bundle>mvn:org.apache.olingo/odata-server-core/${project.version}</bundle> + </feature> + + <feature name="olingo-client" version="${project.version}" resolver="(obr)" start-level="50"> + <bundle>mvn:commons-codec/commons-codec/${commons.codec.version}</bundle> + <bundle>mvn:commons-io/commons-io/${commons.io.version}</bundle> + <bundle>mvn:org.apache.commons/commons-lang3/${commons.lang3.version}</bundle> + <bundle>mvn:org.codehaus.woodstox/stax2-api/${woodstox.stax2-api.version}</bundle> + <bundle>mvn:com.fasterxml/aalto-xml/${aalto-xml.version}</bundle> + <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${hc.core.version}</bundle> + <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${hc.client.version}</bundle> + + <bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle> + <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle> + <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle> + <bundle>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson.version}</bundle> + <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson.version}</bundle> + + <bundle>mvn:org.apache.olingo/odata-commons-api/${project.version}</bundle> + <bundle>mvn:org.apache.olingo/odata-commons-core/${project.version}</bundle> + <bundle>mvn:org.apache.olingo/odata-client-api/${project.version}</bundle> + <bundle>mvn:org.apache.olingo/odata-client-core/${project.version}</bundle> + </feature> +</features> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0b8d46fc/ext/pom.xml ---------------------------------------------------------------------- diff --git a/ext/pom.xml b/ext/pom.xml index b31bf67..93a78e3 100644 --- a/ext/pom.xml +++ b/ext/pom.xml @@ -39,5 +39,6 @@ <module>pojogen-maven-plugin</module> <module>client-proxy</module> <module>client-android</module> + <module>karaf/features</module> </modules> </project> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0b8d46fc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 84ae718..e4d2b76 100644 --- a/pom.xml +++ b/pom.xml @@ -82,6 +82,7 @@ <maven.plugin.tools.version>3.3</maven.plugin.tools.version> <maven.bundle.plugin.version>2.3.4</maven.bundle.plugin.version> <hc.client.version>4.2.6</hc.client.version> + <hc.core.version>4.2.5</hc.core.version> <jackson.version>2.4.2</jackson.version> <aalto-xml.version>0.9.10</aalto-xml.version> @@ -89,6 +90,7 @@ <android.platform.version>4.1.1.4</android.platform.version> <stax.api.version>1.0-2</stax.api.version> + <woodstox.stax2-api.version>3.1.4</woodstox.stax2-api.version> <sl4j.version>1.7.7</sl4j.version>
