HHH-8160 Corrected Import-Package in module manifests

This commit is contained in:
Brett Meyer 2013-04-16 10:28:40 -04:00
parent 3e160b9343
commit 079fd4ac01
5 changed files with 8 additions and 9 deletions

View File

@ -239,6 +239,9 @@ subprojects { subProject ->
// Temporarily support JTA 1.1 -- Karaf and other frameworks still
// use it. Without this, the plugin generates [1.2,2).
'javax.transaction;version="[1.1,2)"',
// Tell Gradle OSGi to still dynamically import the other packages.
// IMPORTANT: Do not include the * in the modules' .gradle files.
// If it exists more than once, the manifest will physically contain a *.
'*'
instruction 'Export-Package', exportPackages.toArray(new String[0])

View File

@ -54,8 +54,7 @@ jar {
// Temporarily support JTA 1.1 -- Karaf and other frameworks still
// use it. Without this, the plugin generates [1.2,2).
// build.gradle adds javax.transaction for all modules
'javax.transaction.xa;version="[1.1,2)"',
'*'
'javax.transaction.xa;version="[1.1,2)"'
// TODO: Uncomment once EntityManagerFactoryBuilderImpl no longer
// uses ClassLoaderServiceImpl.

View File

@ -45,8 +45,7 @@ jar {
'javax.persistence;version="2.1.0"',
'javax.persistence.criteria;version="2.1.0"',
'javax.persistence.metamodel;version="2.1.0"',
'javax.persistence.spi;version="2.1.0"',
'*'
'javax.persistence.spi;version="2.1.0"'
}
}

View File

@ -59,7 +59,6 @@ jar {
'javax.persistence;version="2.1.0"',
'javax.persistence.criteria;version="2.1.0"',
'javax.persistence.metamodel;version="2.1.0"',
'javax.persistence.spi;version="2.1.0"',
'*'
'javax.persistence.spi;version="2.1.0"'
}
}
}

View File

@ -13,7 +13,6 @@ jar {
// TODO: Shouldn't have to explicitly list this, but the plugin
// generates it with a [1.0,2) version.
'javax.persistence;version="2.1.0"',
'javax.persistence.spi;version="2.1.0"',
'*'
'javax.persistence.spi;version="2.1.0"'
}
}