Author: struberg
Date: Thu Oct 6 08:33:09 2016
New Revision: 1763517
URL: http://svn.apache.org/viewvc?rev=1763517&view=rev
Log:
OPENJPA-2669 add OSGi Karaf feature
Thanks to Christian Schneider (cschneider) for the contribution!
Added:
openjpa/trunk/openjpa-features/ (with props)
openjpa/trunk/openjpa-features/pom.xml (with props)
openjpa/trunk/openjpa-features/src/
openjpa/trunk/openjpa-features/src/main/
openjpa/trunk/openjpa-features/src/main/feature/
openjpa/trunk/openjpa-features/src/main/feature/feature.xml (with props)
Modified:
openjpa/trunk/openjpa/pom.xml
openjpa/trunk/pom.xml
Propchange: openjpa/trunk/openjpa-features/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 6 08:33:09 2016
@@ -0,0 +1,7 @@
+target
+bin
+*.log
+*.iml
+*.ipr
+*.iws
+maven-eclipse.xml
Added: openjpa/trunk/openjpa-features/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-features/pom.xml?rev=1763517&view=auto
==============================================================================
--- openjpa/trunk/openjpa-features/pom.xml (added)
+++ openjpa/trunk/openjpa-features/pom.xml Thu Oct 6 08:33:09 2016
@@ -0,0 +1,74 @@
+<?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. -->
+<!-- Please keep the project tag on one line to avoid confusing the release
+ plugin. -->
+<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/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>openjpa-features</artifactId>
+ <packaging>pom</packaging>
+ <name>OpenJPA Features</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <configuration>
+ </configuration>
+ <executions>
+ <execution>
+ <id>compile</id>
+
<phase>generate-resources</phase>
+ <goals>
+
<goal>features-generate-descriptor</goal>
+ </goals>
+ <configuration>
+
<addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature>
+ </configuration>
+ </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/feature/feature.xml</file>
+
<classifier>features</classifier>
+
<type>xml</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: openjpa/trunk/openjpa-features/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: openjpa/trunk/openjpa-features/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-features/src/main/feature/feature.xml?rev=1763517&view=auto
==============================================================================
--- openjpa/trunk/openjpa-features/src/main/feature/feature.xml (added)
+++ openjpa/trunk/openjpa-features/src/main/feature/feature.xml Thu Oct 6
08:33:09 2016
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+ 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 name="openjpa-${project.version}"
xmlns="http://karaf.apache.org/xmlns/features/v1.3.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0
http://karaf.apache.org/xmlns/features/v1.3.0";>
+
+ <feature name="openjpa" description="Apache OpenJPA 3 persistence engine
support" version="${project.version}">
+ <details>Apache OpenJPA persistence engine</details>
+ <bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+ <bundle
dependency="true">mvn:org.eclipse.persistence/javax.persistence/2.1.0</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-el_1.0_spec/1.0.1</bundle>
+ <bundle
dependency="true">mvn:commons-pool/commons-pool/1.6</bundle>
+ <bundle
dependency="true">mvn:commons-dbcp/commons-dbcp/1.4</bundle>
+ <bundle
dependency="true">mvn:commons-collections/commons-collections/3.2.2</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/1.14.1_1</bundle>
+ <bundle
dependency="true">mvn:org.apache.xbean/xbean-asm5-shaded/4.3</bundle>
+ <bundle>mvn:org.apache.openjpa/openjpa/${project.version}</bundle>
+ </feature>
+
+</features>
Propchange: openjpa/trunk/openjpa-features/src/main/feature/feature.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openjpa/trunk/openjpa/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa/pom.xml?rev=1763517&r1=1763516&r2=1763517&view=diff
==============================================================================
--- openjpa/trunk/openjpa/pom.xml (original)
+++ openjpa/trunk/openjpa/pom.xml Thu Oct 6 08:33:09 2016
@@ -133,7 +133,7 @@
javax.validation.*;version="[1.0.0,1.1)";resolution:=optional,
javax.xml.bind.*;resolution:=optional,
serp.*;resolution:=optional,
- javax.persistence.*;version="[1.1.0,2.1)",
+ javax.persistence.*;version="[1.1.0,2.2)",
*
</Import-Package>
</instructions>
Modified: openjpa/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=1763517&r1=1763516&r2=1763517&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Thu Oct 6 08:33:09 2016
@@ -169,6 +169,7 @@
<module>openjpa-integration</module>
<module>openjpa-all</module>
<module>openjpa-tools</module>
+ <module>openjpa-features</module>
</modules>
<profiles>
