You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2015/06/14 13:42:34 UTC
svn commit: r1685392 - in /aries/trunk/jpa/itests:
jpa-container-itest/pom.xml jpa-tck-itest/ jpa-tck-itest/README.txt
jpa-tck-itest/org.osgi.test.cases.jpa.bnd jpa-tck-itest/pom.xml
jpa-tck-itest/runtests pom.xml
Author: cschneider
Date: Sun Jun 14 11:42:34 2015
New Revision: 1685392
URL: http://svn.apache.org/r1685392
Log:
[ARIES-1336] Provide a maven module to easily run the OSGi tck tests
Added:
aries/trunk/jpa/itests/jpa-tck-itest/
aries/trunk/jpa/itests/jpa-tck-itest/README.txt
aries/trunk/jpa/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd
aries/trunk/jpa/itests/jpa-tck-itest/pom.xml
aries/trunk/jpa/itests/jpa-tck-itest/runtests (with props)
Modified:
aries/trunk/jpa/itests/jpa-container-itest/pom.xml
aries/trunk/jpa/itests/pom.xml
Modified: aries/trunk/jpa/itests/jpa-container-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest/pom.xml?rev=1685392&r1=1685391&r2=1685392&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest/pom.xml (original)
+++ aries/trunk/jpa/itests/jpa-container-itest/pom.xml Sun Jun 14 11:42:34 2015
@@ -32,20 +32,6 @@
<artifactId>org.apache.aries.jpa.container.itest</artifactId>
<name>Apache Aries JPA iTests</name>
- <properties>
- <exam.version>4.5.0</exam.version>
- <url.version>1.6.0</url.version>
- <hibernate42.version>4.2.15.Final</hibernate42.version>
- <hibernate43.version>4.2.15.Final</hibernate43.version>
- <ant.bundle.version>1.8.2_2</ant.bundle.version>
- <antlr.bundle.version>2.7.7_5</antlr.bundle.version>
- <dom4j.bundle.version>1.6.1_5</dom4j.bundle.version>
- <serp.bundle.version>1.14.1_1</serp.bundle.version>
- <eclipselink.version>2.5.2</eclipselink.version>
- <openjpa.version>2.3.0</openjpa.version>
- <paxjdbc.version>0.6.0</paxjdbc.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.eclipse</groupId>
Added: aries/trunk/jpa/itests/jpa-tck-itest/README.txt
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-tck-itest/README.txt?rev=1685392&view=auto
==============================================================================
--- aries/trunk/jpa/itests/jpa-tck-itest/README.txt (added)
+++ aries/trunk/jpa/itests/jpa-tck-itest/README.txt Sun Jun 14 11:42:34 2015
@@ -0,0 +1,12 @@
+# How to run the tck tests
+
+# First you need to retrieve the tck and deploy the test jpa test jar (these steps only need to be done once)
+# 1. Request access to the OSGi tck. http://felix.apache.org/documentation/development/using-the-osgi-compliance-tests.html
+# 2. Get and extract https://svn.apache.org/repos/tck/osgi-cts/osgi.enterprise.tests/5.0.0/osgi.ct.enterprise.jar
+# 3. deploy the test jar to maven
+ mvn install:install-file -Dfile=jar/org.osgi.test.cases.jpa-5.0.0.jar -DgroupId=org.apache.aries.tck -DartifactId=org.osgi.test.cases.jpa -Dversion=5.0.0 -Dpackaging=jar
+
+# 3. execute the commands below
+mvn clean install
+./runtests
+
Added: aries/trunk/jpa/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd?rev=1685392&view=auto
==============================================================================
--- aries/trunk/jpa/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd (added)
+++ aries/trunk/jpa/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd Sun Jun 14 11:42:34 2015
@@ -0,0 +1,51 @@
+# Copyright (c) OSGi Alliance (2012). All Rights Reserved.
+#
+# Licensed 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.
+
+# bnd pack for project org.osgi.test.cases.jpa
+# Thu Nov 01 12:39:45 EDT 2012
+-runpath = \
+ lib/org.eclipse.osgi-3.8.0.v20120529-1548.jar;version=file, \
+ lib/org.apache.servicemix.bundles.junit-3.8.2_2.jar;version=file;export="junit.framework;version=3.8"
+
+-runtrace = true
+
+-target = \
+ lib/org.osgi.test.cases.jpa-5.0.0.jar;version=file,
+
+-runbundles = \
+lib/pax-logging-api-1.7.3.jar;version=file, \
+lib/pax-logging-service-1.7.3.jar;version=file, \
+lib/derbyclient-10.11.1.1.jar;version=file, \
+lib/pax-jdbc-spec-0.6.0.jar;version=file, \
+lib/pax-jdbc-derbyclient-0.6.0.jar;version=file, \
+lib/javax.persistence-2.1.0.jar;version=file, \
+lib/geronimo-jta_1.1_spec-1.1.1.jar;version=file, \
+lib/geronimo-servlet_2.5_spec-1.2.jar;version=file, \
+lib/org.apache.felix.eventadmin-1.4.2.jar;version=file, \
+lib/org.apache.felix.configadmin-1.8.0.jar;version=file, \
+lib/org.eclipse.persistence.core-2.6.0.jar;version=file, \
+lib/org.eclipse.persistence.jpa-2.6.0.jar;version=file, \
+lib/org.eclipse.persistence.antlr-2.6.0.jar;version=file, \
+lib/org.eclipse.persistence.jpa.jpql-2.6.0.jar;version=file, \
+lib/org.eclipse.persistence.asm-2.6.0.jar;version=file, \
+lib/org.apache.aries.jpa.eclipselink.adapter-2.0.0-SNAPSHOT.jar;version=file, \
+lib/org.apache.aries.jpa.container-2.0.0-SNAPSHOT.jar;version=file, \
+lib/org.osgi.test.cases.jpa-5.0.0.jar;version=file
+
+-runproperties = \
+ report="true", \
+ osgi.resolverMode="strict"
+
+-runsystempackages=javax.xml.stream; version=1.0, javax.xml.stream.events; version=1.0, javax.xml.stream.util; version=1.0
+
Added: aries/trunk/jpa/itests/jpa-tck-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-tck-itest/pom.xml?rev=1685392&view=auto
==============================================================================
--- aries/trunk/jpa/itests/jpa-tck-itest/pom.xml (added)
+++ aries/trunk/jpa/itests/jpa-tck-itest/pom.xml Sun Jun 14 11:42:34 2015
@@ -0,0 +1,187 @@
+<?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/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.aries.jpa.itest</groupId>
+ <artifactId>org.apache.aries.jpa.itest.parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <groupId>org.apache.aries.jpa.itest</groupId>
+ <artifactId>jpa-tck-itest</artifactId>
+ <packaging>pom</packaging>
+
+ <dependencies>
+
+ <!-- Test cases from the tck. These need to be deployed by hand as redistribution is not allowed -->
+ <dependency>
+ <groupId>org.apache.aries.tck</groupId>
+ <artifactId>org.osgi.test.cases.jpa</artifactId>
+ <version>5.0.0</version>
+ </dependency>
+
+ <!-- Test framework -->
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
+ <version>3.8.2_2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.8.0.v20120529-1548</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <version>${paxlogging.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <version>${paxlogging.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- derbyclient + DataSourceFactory -->
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyclient</artifactId>
+ <version>10.11.1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.jdbc</groupId>
+ <artifactId>pax-jdbc-spec</artifactId>
+ <version>${paxjdbc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.jdbc</groupId>
+ <artifactId>pax-jdbc-derbyclient</artifactId>
+ <version>${paxjdbc.version}</version>
+ </dependency>
+
+ <!-- Specs -->
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>javax.persistence</artifactId>
+ <version>2.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <!-- Needed compendium services -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.eventadmin</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- eclipselink -->
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.antlr</artifactId>
+ <version>${eclipselink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.core</artifactId>
+ <version>${eclipselink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.jpa.jpql</artifactId>
+ <version>${eclipselink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.asm</artifactId>
+ <version>${eclipselink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.jpa</artifactId>
+ <version>${eclipselink.version}</version>
+ </dependency>
+
+ <!-- Aries jpa -->
+ <dependency>
+ <groupId>org.apache.aries.jpa</groupId>
+ <artifactId>org.apache.aries.jpa.container</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jpa</groupId>
+ <artifactId>org.apache.aries.jpa.eclipselink.adapter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/lib</outputDirectory>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
+</project>
+
Added: aries/trunk/jpa/itests/jpa-tck-itest/runtests
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-tck-itest/runtests?rev=1685392&view=auto
==============================================================================
--- aries/trunk/jpa/itests/jpa-tck-itest/runtests (added)
+++ aries/trunk/jpa/itests/jpa-tck-itest/runtests Sun Jun 14 11:42:34 2015
@@ -0,0 +1,4 @@
+cp org.osgi.test.cases.jpa.bnd target
+cd target
+java -jar lib/bnd-2.4.0.jar runtests --title osgi.ct
+cd ..
Propchange: aries/trunk/jpa/itests/jpa-tck-itest/runtests
------------------------------------------------------------------------------
svn:executable = *
Modified: aries/trunk/jpa/itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/pom.xml?rev=1685392&r1=1685391&r2=1685392&view=diff
==============================================================================
--- aries/trunk/jpa/itests/pom.xml (original)
+++ aries/trunk/jpa/itests/pom.xml Sun Jun 14 11:42:34 2015
@@ -1,32 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
+ 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>
+ <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.aries.jpa.itest</groupId>
- <artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <name>Apache Aries JPA itests parent</name>
- <packaging>pom</packaging>
+ <groupId>org.apache.aries.jpa.itest</groupId>
+ <artifactId>org.apache.aries.jpa.itest.parent</artifactId>
+ <name>Apache Aries JPA itests parent</name>
+ <packaging>pom</packaging>
- <parent>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../jpa-parent</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.aries.jpa</groupId>
+ <artifactId>org.apache.aries.jpa.parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../jpa-parent</relativePath>
+ </parent>
<properties>
<aries.skip.version.check>true</aries.skip.version.check>
+ <paxlogging.version>1.7.3</paxlogging.version>
+ <exam.version>4.5.0</exam.version>
+ <url.version>1.6.0</url.version>
+ <hibernate42.version>4.2.15.Final</hibernate42.version>
+ <hibernate43.version>4.2.15.Final</hibernate43.version>
+ <ant.bundle.version>1.8.2_2</ant.bundle.version>
+ <antlr.bundle.version>2.7.7_5</antlr.bundle.version>
+ <dom4j.bundle.version>1.6.1_5</dom4j.bundle.version>
+ <serp.bundle.version>1.14.1_1</serp.bundle.version>
+ <eclipselink.version>2.6.0</eclipselink.version>
+ <openjpa.version>2.3.0</openjpa.version>
+ <paxjdbc.version>0.6.0</paxjdbc.version>
</properties>
- <modules>
+ <modules>
<module>jpa-container-blueprint-testbundle</module>
<module>jpa-container-advancedtestbundle</module>
<module>jpa-container-itest</module>
<module>jpa-container-testbundle</module>
<module>jpa-container-testbundle-eclipselink</module>
- </modules>
+ </modules>
+
</project>