Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.virgo.medic.core/build.gradle36
-rw-r--r--org.eclipse.virgo.medic.core/template.mf10
-rw-r--r--org.eclipse.virgo.medic.logbackclassicfragment/build.gradle14
-rw-r--r--org.eclipse.virgo.medic.logbackclassicfragment/template.mf8
-rw-r--r--org.eclipse.virgo.medic.logbackcorefragment/build.gradle14
-rw-r--r--org.eclipse.virgo.medic.logbackcorefragment/template.mf8
-rw-r--r--org.eclipse.virgo.medic/build.gradle12
-rw-r--r--org.eclipse.virgo.medic/template.mf6
8 files changed, 24 insertions, 84 deletions
diff --git a/org.eclipse.virgo.medic.core/build.gradle b/org.eclipse.virgo.medic.core/build.gradle
deleted file mode 100644
index 3ebbb9a..0000000
--- a/org.eclipse.virgo.medic.core/build.gradle
+++ /dev/null
@@ -1,36 +0,0 @@
-apply plugin: 'osgi'
-
-jar {
- manifest {
- version = project.version
- name = 'Medic Core Implementation'
- instruction 'Import-Package', '*'
- instruction 'Export-Package', '*'
- attributes( 'Bundle-SymbolicName': 'org.eclipse.virgo.medic.core')
- attributes( 'Built-By': "Gradle ${gradle.gradleVersion}" )
- attributes( 'Bundle-Activator': "org.eclipse.virgo.medic.impl.MedicActivator" )
- attributes( 'Medic-LoggingConfiguration': "org.eclipse.virgo.medic" )
- }
-}
-/*
-Import-Template:
- ch.qos.logback.classic.*;version="${ch.qos.logback.classic:[=.=.=, +1.0.0)}",
- ch.qos.logback.core.*;version="${ch.qos.logback.core:[=.=.=, +1.0.0)}",
- org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, +1.0.0)}",
- org.eclipse.equinox.log;version="0",
- javax.jms;version="0";resolution:=optional,
- javax.mail.*;version="0";resolution:=optional,
- javax.management.*;version="0",
- javax.naming;version="0",
- javax.servlet.*;version="0";resolution:=optional,
- javax.sql;version="0",
- javax.xml.parsers;version="0",
- org.aspectj.*;version="${org.aspectj:[=.=.=, +1.0.0)}",
- org.osgi.framework;version="0",
- org.osgi.service.*;version="0",
- org.osgi.util.tracker;version="0",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, +1.0.0)}",
- org.xml.sax.*;version="0"
-Excluded-Exports: *.impl,*.impl.*
-*/
diff --git a/org.eclipse.virgo.medic.core/template.mf b/org.eclipse.virgo.medic.core/template.mf
index e62e6d2..451a14b 100644
--- a/org.eclipse.virgo.medic.core/template.mf
+++ b/org.eclipse.virgo.medic.core/template.mf
@@ -5,10 +5,10 @@ Bundle-Name: Medic Core Implementation
Bundle-Version: ${version}
Bundle-Activator: org.eclipse.virgo.medic.impl.MedicActivator
Import-Template:
- ch.qos.logback.classic.*;version="${ch.qos.logback.classic:[=.=.=, +1.0.0)}",
- ch.qos.logback.core.*;version="${ch.qos.logback.core:[=.=.=, +1.0.0)}",
+ ch.qos.logback.classic.*;version="${logbackVersion:[=.=.=, +1.0.0)}",
+ ch.qos.logback.core.*;version="${logbackVersion:[=.=.=, +1.0.0)}",
org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, +1.0.0)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, +1.0.0)}",
org.eclipse.equinox.log;version="0",
javax.jms;version="0";resolution:=optional,
javax.mail.*;version="0";resolution:=optional,
@@ -17,11 +17,11 @@ Import-Template:
javax.servlet.*;version="0";resolution:=optional,
javax.sql;version="0",
javax.xml.parsers;version="0",
- org.aspectj.*;version="${org.aspectj:[=.=.=, +1.0.0)}",
+ org.aspectj.*;version="${orgAspectjVersion:[=.=.=, +1.0.0)}",
org.osgi.framework;version="0",
org.osgi.service.*;version="0",
org.osgi.util.tracker;version="0",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, +1.0.0)}",
+ org.slf4j.*;version="${slf4jVersion:[=.=.=, +1.0.0)}",
org.xml.sax.*;version="0"
Medic-LoggingConfiguration: org.eclipse.virgo.medic
Excluded-Exports: *.impl,*.impl.*
diff --git a/org.eclipse.virgo.medic.logbackclassicfragment/build.gradle b/org.eclipse.virgo.medic.logbackclassicfragment/build.gradle
deleted file mode 100644
index 587d06a..0000000
--- a/org.eclipse.virgo.medic.logbackclassicfragment/build.gradle
+++ /dev/null
@@ -1,14 +0,0 @@
-apply plugin: 'osgi'
-
-jar {
- manifest {
- version = project.version
- name = 'Medic Logback Core Fragment'
- instruction 'Import-Package', 'org.eclipse.virgo.medic.log.logback'
- instruction 'Export-Package', '*'
- attributes( 'Bundle-SymbolicName': 'org.eclipse.virgo.medic.logbackclassicfragment')
- attributes( 'Built-By': "Gradle ${gradle.gradleVersion}" )
-// Fragment-Host: ch.qos.logback.classic;bundle-version="${ch.qos.logback.classic:[=.=.=, +1.0.0)}"
- attributes( 'Fragment-Host': "ch.qos.logback.classic" )
- }
-}
diff --git a/org.eclipse.virgo.medic.logbackclassicfragment/template.mf b/org.eclipse.virgo.medic.logbackclassicfragment/template.mf
new file mode 100644
index 0000000..2284ac7
--- /dev/null
+++ b/org.eclipse.virgo.medic.logbackclassicfragment/template.mf
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.virgo.medic.logbackclassicfragment
+Bundle-Name: Medic Logback Core Fragment
+Bundle-Version: ${version}
+Fragment-Host: ch.qos.logback.classic;bundle-version="${logbackVersion:[=.=.=, +1.0.0)}"
+Import-Package:
+ org.eclipse.virgo.medic.log.logback;version="${version:[=.=.=, =.+1)}"
diff --git a/org.eclipse.virgo.medic.logbackcorefragment/build.gradle b/org.eclipse.virgo.medic.logbackcorefragment/build.gradle
deleted file mode 100644
index 4686e2a..0000000
--- a/org.eclipse.virgo.medic.logbackcorefragment/build.gradle
+++ /dev/null
@@ -1,14 +0,0 @@
-apply plugin: 'osgi'
-
-jar {
- manifest {
- version = project.version
- name = 'Medic Logback Core Fragment'
- instruction 'Import-Package', 'org.eclipse.virgo.medic.log.logback'
- instruction 'Export-Package', '*'
- attributes( 'Bundle-SymbolicName': 'org.eclipse.virgo.medic.logbackcorefragment')
- attributes( 'Built-By': "Gradle ${gradle.gradleVersion}" )
-// Fragment-Host: ch.qos.logback.core;bundle-version="${ch.qos.logback.core:[=.=.=, +1.0.0)}"
- attributes( 'Fragment-Host': "ch.qos.logback.core" )
- }
-}
diff --git a/org.eclipse.virgo.medic.logbackcorefragment/template.mf b/org.eclipse.virgo.medic.logbackcorefragment/template.mf
new file mode 100644
index 0000000..2425c44
--- /dev/null
+++ b/org.eclipse.virgo.medic.logbackcorefragment/template.mf
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.virgo.medic.logbackcorefragment
+Bundle-Name: Medic Logback Core Fragment
+Bundle-Version: ${version}
+Fragment-Host: ch.qos.logback.core;bundle-version="${logbackVersion:[=.=.=, +1.0.0)}"
+Import-Package:
+ org.eclipse.virgo.medic.log.logback;version="${version:[=.=.=, =.+1)}"
diff --git a/org.eclipse.virgo.medic/build.gradle b/org.eclipse.virgo.medic/build.gradle
deleted file mode 100644
index 32e59e1..0000000
--- a/org.eclipse.virgo.medic/build.gradle
+++ /dev/null
@@ -1,12 +0,0 @@
-apply plugin: 'osgi'
-
-jar {
- manifest {
- version = project.version
- name = 'Medic API'
- instruction 'Import-Package', '*'
- instruction 'Export-Package', '*'
- attributes( 'Bundle-SymbolicName': 'org.eclipse.virgo.medic')
- attributes( 'Built-By': "Gradle ${gradle.gradleVersion}" )
- }
-}
diff --git a/org.eclipse.virgo.medic/template.mf b/org.eclipse.virgo.medic/template.mf
index 11c8f7f..51a607c 100644
--- a/org.eclipse.virgo.medic/template.mf
+++ b/org.eclipse.virgo.medic/template.mf
@@ -1,10 +1,10 @@
-Manifest-Version: 1.0
+IManifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.virgo.medic
Import-Template:
- org.aspectj.*;version="${org.aspectj:[=.=.= , +1.0.0)}",
+ org.aspectj.*;version="${orgAspectjVersion:[=.=.= , +1.0.0)}",
javax.management.*;version="0",
org.osgi.framework;version="0",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, =.+1.0)}"
+ org.slf4j.*;version="${slf4jVersion:[=.=.=, =.+1.0)}"
Bundle-Version: ${version}
Bundle-Name: Medic API

Back to the top