Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-11152 add bytebuddy to osgi testing-bundles.xml, explicitly import javassist in envers (temporarily)

This commit is contained in:
Brett Meyer 2016-11-17 13:58:13 -05:00
parent af78f17eb8
commit de346827d0
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hibernate-envers/hibernate-envers.gradle
View File

@ -71,6 +71,9 @@ sourceSets {
jar { jar {
manifest { manifest {
instructionFirst 'Import-Package', instructionFirst 'Import-Package',
// TODO: Remove after Javassist is blown away in ORM 6
"javassist;version=\"${javassistVersion}\"",
"javassist.util.proxy;version=\"${javassistVersion}\"",
// TODO: Shouldn't have to explicitly list the JPA packages, but // TODO: Shouldn't have to explicitly list the JPA packages, but
// the plugin generates them with [1.0,2) versions. // the plugin generates them with [1.0,2) versions.
'javax.persistence;version="2.1.0"', 'javax.persistence;version="2.1.0"',

2
hibernate-osgi/src/test/resources/org/hibernate/osgi/test/testing-bundles.xml
View File

@ -8,5 +8,7 @@
<feature name='hibernate-osgi-testing' version='5.0.0-SNAPSHOT'> <feature name='hibernate-osgi-testing' version='5.0.0-SNAPSHOT'>
<bundle>mvn:com.h2database/h2/1.3.170</bundle> <bundle>mvn:com.h2database/h2/1.3.170</bundle>
<bundle>mvn:org.ops4j.pax.url/pax-url-aether/2.3.0</bundle> <bundle>mvn:org.ops4j.pax.url/pax-url-aether/2.3.0</bundle>
<!-- Needed since ByteBuddy is currently a 'provided' scope until ORM 6. -->
<bundle>mvn:net.bytebuddy/byte-buddy/1.5.4</bundle>
</feature> </feature>
</features> </features>