Permalink
Browse files

HHH-8160 Updated for Gradle 1.5 OSGi plugin changes and package

versioning issues
  • Loading branch information...
1 parent 802fcf7 commit cc4ef44670c827ab7fbdb15d93fcfacb8ecb2148 @brmeyer brmeyer committed Apr 8, 2013
View
8 build.gradle
@@ -234,11 +234,17 @@ subprojects { subProject ->
// need to be here (temporarily).
classesDir = sourceSets.main.output.classesDir
classpath = configurations.runtime
+
+ instruction 'Import-Package',
+ // 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)"',
+ '*'
instruction 'Export-Package', exportPackages.toArray(new String[0])
instruction 'Private-Package', privatePackages.toArray(new String[0])
- instruction 'Bundle-Vendor', 'Hibernate.org'
+ instruction 'Bundle-Vendor', 'Hibernate.org'
instruction 'Implementation-Url', 'http://hibernate.org'
instruction 'Implementation-Version', version
instruction 'Implementation-Vendor', 'Hibernate.org'
View
1 hibernate-c3p0/hibernate-c3p0.gradle
@@ -13,6 +13,5 @@ dependencies {
jar {
manifest {
instruction 'Bundle-Description', 'Hibernate ORM C3P0'
- instruction 'Bundle-SymbolicName', 'org.hibernate.c3p0'
}
}
View
8 hibernate-core/hibernate-core.gradle
@@ -40,7 +40,6 @@ manifest.mainAttributes(
jar {
manifest {
instruction 'Bundle-Description', 'Hibernate ORM Core'
- instruction 'Bundle-SymbolicName', 'org.hibernate.core'
instruction 'Import-Package',
'javax.security.auth;resolution:=optional',
@@ -49,6 +48,13 @@ jar {
'javax.validation.constraints;resolution:=optional',
'javax.validation.groups;resolution:=optional',
'javax.validation.metadata;resolution:=optional',
+ // 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"',
+ // 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)"',
'*'
// TODO: Uncomment once EntityManagerFactoryBuilderImpl no longer
View
1 hibernate-ehcache/hibernate-ehcache.gradle
@@ -8,6 +8,5 @@ dependencies {
jar {
manifest {
instruction 'Bundle-Description', 'Hibernate ORM EHCache'
- instruction 'Bundle-SymbolicName', 'org.hibernate.ehcache'
}
}
View
9 hibernate-entitymanager/hibernate-entitymanager.gradle
@@ -27,7 +27,6 @@ dependencies {
jar {
manifest {
instruction 'Bundle-Description', 'Hibernate ORM JPA Entity Manager'
- instruction 'Bundle-SymbolicName', 'org.hibernate.entitymanager'
// A cdi-api OSGi bundle does not currently exist. For now, explicitly
// ignore its packages. This will only cause issues if an app tries
@@ -39,6 +38,14 @@ jar {
// occurs.
instruction 'Import-Package',
'!javax.enterprise*',
+ 'javax.enterprise.context.spi;resolution:=optional',
+ 'javax.enterprise.inject.spi;resolution:=optional',
+ // TODO: Shouldn't have to explicitly list the JPA packages, but
+ // the plugin generates them with [1.0,2) versions.
+ '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"',
'*'
}
}
View
1 hibernate-envers/hibernate-envers.gradle
@@ -52,6 +52,5 @@ generateSources.dependsOn generateJpaMetamodelClasses
jar {
manifest {
instruction 'Bundle-Description', 'Hibernate ORM Envers'
- instruction 'Bundle-SymbolicName', 'org.hibernate.envers'
}
}
View
1 hibernate-infinispan/hibernate-infinispan.gradle
@@ -44,6 +44,5 @@ artifacts.archives sourcesTestJar
jar {
manifest {
instruction 'Bundle-Description', 'Hibernate ORM Infinispan'
- instruction 'Bundle-SymbolicName', 'org.hibernate.infinispan'
}
}
View
8 hibernate-osgi/hibernate-osgi.gradle
@@ -8,6 +8,12 @@ jar {
manifest {
instruction 'Bundle-Activator', 'org.hibernate.osgi.HibernateBundleActivator'
instruction 'Bundle-Description', 'Hibernate ORM OSGi'
- instruction 'Bundle-SymbolicName', 'org.hibernate.osgi'
+
+ instruction 'Import-Package',
+ // 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"',
+ '*'
}
}
View
1 hibernate-proxool/hibernate-proxool.gradle
@@ -7,6 +7,5 @@ dependencies {
jar {
manifest {
instruction 'Bundle-Description', 'Hibernate ORM Proxool'
- instruction 'Bundle-SymbolicName', 'org.hibernate.proxool'
}
}
View
1 hibernate-testing/hibernate-testing.gradle
@@ -13,6 +13,5 @@ dependencies {
jar {
manifest {
instruction 'Bundle-Description', 'Hibernate ORM Testing'
- instruction 'Bundle-SymbolicName', 'org.hibernate.testing'
}
}

0 comments on commit cc4ef44

Please sign in to comment.