aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From timothyjw...@apache.org
Subject svn commit: r1785281 - in /aries/trunk/jpa/jpa-container: osgi.bnd pom.xml
Date Fri, 03 Mar 2017 12:44:20 GMT
Author: timothyjward
Date: Fri Mar  3 12:44:20 2017
New Revision: 1785281

URL: http://svn.apache.org/viewvc?rev=1785281&view=rev
Log:
[jpa] Update to use OSGi API snapshots for the JPA Service

Fixes ARIES-1698

Modified:
    aries/trunk/jpa/jpa-container/osgi.bnd
    aries/trunk/jpa/jpa-container/pom.xml

Modified: aries/trunk/jpa/jpa-container/osgi.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/osgi.bnd?rev=1785281&r1=1785280&r2=1785281&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/osgi.bnd (original)
+++ aries/trunk/jpa/jpa-container/osgi.bnd Fri Mar  3 12:44:20 2017
@@ -1,5 +1,5 @@
 Export-Package: \
-    org.osgi.service.jpa
+    org.osgi.service.jpa;provide:=true
 Import-Package: \
     javax.persistence;version="[1.1,3)", \
     javax.persistence.spi;version="[1.1,3)", \

Modified: aries/trunk/jpa/jpa-container/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/pom.xml?rev=1785281&r1=1785280&r2=1785281&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/pom.xml (original)
+++ aries/trunk/jpa/jpa-container/pom.xml Fri Mar  3 12:44:20 2017
@@ -30,9 +30,25 @@
     <description>Implements the OSGi JPA Container from the enterprise spec. Provider
a EntityManagerFactory and EntityManagerFactoryBuilder service</description>
     <packaging>bundle</packaging>
     
+    <repositories>
+        <repository>
+            <id>OSGi Public APIs</id>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <url>https://oss.sonatype.org/content/repositories/osgi/</url>
+        </repository>
+    </repositories>
+    
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.jpa</artifactId>
+            <version>1.1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -47,4 +63,53 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+    
+    <build>
+        <!-- This configuration makes sure that we backport
+             the OSGi provided APIs to Java 1.6 class compatibility.
+             Becuase of the way the maven-bundle-plugin works we must
+             extract the JAR before we translate and slurp in the API -->
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>extract-osgi-api</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.osgi</groupId>
+                                    <artifactId>org.osgi.service.jpa</artifactId>
+                                    <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                                    <includes>org/osgi/service/jpa/**</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>net.orfjackal.retrolambda</groupId>
+                <artifactId>retrolambda-maven-plugin</artifactId>
+                <version>2.5.1</version>
+                <executions>
+                    <execution>
+                        <id>backport-osgi-api</id>
+                        <goals>
+                            <goal>process-main</goal>
+                        </goals>
+                        <configuration>
+                            <target>1.6</target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file



Mime
View raw message