Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added hibernate to pax-exam osgi install #507

Merged
merged 1 commit into from
Sep 7, 2017
Merged

Added hibernate to pax-exam osgi install #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 51 additions & 1 deletion tests/dozer-osgi-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,21 @@
<scope>test</scope>
</dependency>

<!-- Provided dependencies -->
<!-- JAXB -->
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
<version>2.2.11_1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jaxb-api-2.2</artifactId>
<version>2.9.0</version>
<scope>test</scope>
</dependency>

<!-- Provided dependencies; YAML -->
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
Expand All @@ -83,11 +97,16 @@
<artifactId>woodstox-core-asl</artifactId>
<scope>test</scope>
</dependency>

<!-- Provided dependencies; javassist -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.20.0-GA</version>
<scope>test</scope>
</dependency>

<!-- Provided dependencies; javax.el -->
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
Expand All @@ -99,6 +118,37 @@
<scope>test</scope>
</dependency>

<!-- Provided dependencies; Hibernate -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-osgi</artifactId>
<version>5.2.10.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.antlr</artifactId>
<version>2.7.7_5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml</groupId>
<artifactId>classmate</artifactId>
<version>1.3.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
<version>1.6.1_5</version>
<scope>test</scope>
</dependency>

<!-- Core OSGi -->
<dependency>
<groupId>org.apache.felix</groupId>
Expand Down
24 changes: 19 additions & 5 deletions ...osgi-tests/src/test/java/com/github/dozermapper/osgitests/DozerCoreOsgiContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.dozer.el.ELExpressionFactory;
import org.dozer.osgi.Activator;
import org.dozer.osgi.OSGiClassLoader;
import org.dozer.util.RuntimeUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
Expand All @@ -38,14 +37,11 @@
import org.osgi.framework.BundleContext;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.repositories;
import static org.ops4j.pax.exam.CoreOptions.systemPackage;
import static org.ops4j.pax.exam.CoreOptions.url;

Expand All @@ -65,6 +61,11 @@ public Option[] config() {
url("link:classpath:org.apache.commons.collections.link"),
url("link:classpath:org.apache.commons.lang3.link"),
url("link:classpath:org.apache.commons.io.link"),
// JAXB
url("link:classpath:org.apache.geronimo.specs.geronimo-stax-api_1.0_spec.link"),
url("link:classpath:org.apache.geronimo.specs.geronimo-activation_1.1_spec.link"),
url("link:classpath:org.apache.servicemix.specs.jaxb-api-2.2.link"),
url("link:classpath:org.apache.servicemix.bundles.jaxb-impl.link"),
// Optional; Jackson
url("link:classpath:com.fasterxml.jackson.core.jackson-annotations.link"),
url("link:classpath:com.fasterxml.jackson.core.jackson-core.link"),
Expand All @@ -80,11 +81,24 @@ public Option[] config() {
// Optional; EL
url("link:classpath:javax.el-api.link"),
url("link:classpath:com.sun.el.javax.el.link"),
// Optional; Hibernate
url("link:classpath:org.hibernate.javax.persistence.hibernate-jpa-2.1-api.link"),
url("link:classpath:org.apache.servicemix.bundles.dom4j.link"),
url("link:classpath:org.apache.servicemix.bundles.antlr.link"),
url("link:classpath:org.jboss.jandex.link"),
url("link:classpath:org.jboss.logging.jboss-logging.link"),
url("link:classpath:com.fasterxml.classmate.link"),
url("link:classpath:org.hibernate.common.hibernate-commons-annotations.link"),
url("link:classpath:org.hibernate.core.link"),
url("link:classpath:org.hibernate.osgi.link"),
// Core
url("link:classpath:com.github.dozermapper.dozer-core.link"),
url("link:classpath:com.github.dozermapper.dozer-schema.link"),
url("link:classpath:com.github.dozermapper.tests.dozer-osgi-tests-model.link"),
junitBundles()
junitBundles(),
// Required by: Hibernate
systemPackage("javax.transaction;version=1.1.0"),
systemPackage("javax.transaction.xa;version=1.1.0")
);
}

Expand Down