Skip to content

Commit dca286d

Browse files
author
Costin Leau
committed
+ migrated some manifest template changed from 2.5.x to 3.0.x
1 parent 20bdc3c commit dca286d

File tree

14 files changed

+31
-47
lines changed

14 files changed

+31
-47
lines changed

org.springframework.aop/template.mf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource
44
Bundle-ManifestVersion: 2
55
Import-Template:
66
com.jamonapi.*;version="[2.4.0, 3.0.0)";resolution:=optional,
7-
net.sf.cglib.*;version="[2.1.3, 3.0.0)";resolution:=optional,
7+
net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional,
88
org.aopalliance.*;version="[1.0.0, 2.0.0)",
99
org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
1010
org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional,
@@ -13,4 +13,4 @@ Import-Template:
1313
org.springframework.core.*;version="[3.0.0, 3.0.1)",
1414
org.springframework.util.*;version="[3.0.0, 3.0.1)"
1515
Unversioned-Imports:
16-
org.w3c.dom.*
16+
*

org.springframework.beans/template.mf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ Import-Template:
99
org.springframework.core.*;version="[3.0.0, 3.0.1)",
1010
org.springframework.util.*;version="[3.0.0, 3.0.1)",
1111
Unversioned-Imports:
12-
javax.xml.parsers.*,
13-
org.w3c.dom.*,
14-
org.xml.sax.*
12+
*
13+

org.springframework.context.support/template.mf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ Import-Template:
2222
org.springframework.transaction.*;version="[3.0.0, 3.0.1)";resolution:=optional,
2323
org.springframework.util.*;version="[3.0.0, 3.0.1)"
2424
Unversioned-Imports:
25-
javax.naming.*,
26-
javax.sql.*
25+
*
2726
Ignored-Existing-Headers:
2827
Bnd-LastModified,
2928
Import-Package,

org.springframework.context/template.mf

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Bundle-ManifestVersion: 2
55
Import-Package:
66
javax.persistence;version="[1.0.0, 2.0.0)";resolution:=optional,
77
org.springframework.orm.jpa.support;version="[3.0.0, 3.0.1)";resolution:=optional
8+
com.ibm.websphere.management;resolution:=optional
89
Import-Template:
910
bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional,
1011
com.sun.enterprise.loader.*;version="[1.0.0, 2.0.0)";resolution:=optional,
@@ -17,7 +18,7 @@ Import-Template:
1718
javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional,
1819
javax.jms.*;version="[1.1.0, 2.0.0)";resolution:=optional,
1920
javax.xml.ws.*;version="[2.1.1, 3.0.0)";resolution:=optional,
20-
net.sf.cglib.*;version="[2.1.3, 3.0.0)";resolution:=optional,
21+
net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional,
2122
oracle.classloader.*;version="[10.1.3.1, 10.2.0.0)";resolution:=optional,
2223
org.aopalliance.*;version="[1.0.0, 2.0.0)",
2324
org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
@@ -32,15 +33,7 @@ Import-Template:
3233
org.springframework.metadata.*;version="[3.0.0, 3.0.1)",
3334
org.springframework.util.*;version="[3.0.0, 3.0.1)"
3435
Unversioned-Imports:
35-
com.sun.net.*,
36-
javax.management.*,
37-
javax.naming.*,
38-
javax.rmi.*,
39-
javax.xml.namespace.*,
40-
org.omg.CORBA.*,
41-
org.omg.CORBA_2_3.*,
42-
org.w3c.dom.*,
43-
org.xml.sax.*
36+
*
4437
Ignored-Existing-Headers:
4538
Bnd-LastModified,
4639
Import-Package,

org.springframework.core/template.mf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ Bundle-SymbolicName: org.springframework.core
22
Bundle-Name: Spring Core
33
Bundle-Vendor: SpringSource
44
Bundle-ManifestVersion: 2
5+
Import-Package:
6+
org.eclipse.core.runtime;common="split";resolution:=optional
57
Import-Template:
68
edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional,
79
org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional,
@@ -10,6 +12,4 @@ Import-Template:
1012
org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional,
1113
org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional
1214
Unversioned-Imports:
13-
javax.xml.transform.*,
14-
org.w3c.dom.*,
15-
org.xml.sax.*
15+
*

org.springframework.expression/template.mf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ Bundle-ManifestVersion: 2
55
Import-Template:
66
org.springframework.core;version="[3.0.0, 3.0.1)",
77
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
8-
org.antlr.runtime;version="[3.0.0,3.0.1)", org.antlr.runtime.tree;version="[3.0.0,3.0.1)"
8+
org.antlr.runtime;version="[3.0.0,3.0.1)",
9+
org.antlr.runtime.tree;version="[3.0.0,3.0.1)"

org.springframework.jdbc/template.mf

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ Bundle-SymbolicName: org.springframework.jdbc
22
Bundle-Name: Spring JDBC
33
Bundle-Vendor: SpringSource
44
Bundle-ManifestVersion: 2
5+
Import-Package:
6+
oracle.sql;resolution:=optional,
7+
org.jboss.resource.adapter.jdbc;resolution:=optional,
8+
weblogic.jdbc.extensions;resolution:=optional,
9+
com.ibm.websphere.rsadapter;resolution:=optional,
10+
com.ibm.ws.rsadapter.jdbc;resolution:=optional
511
Import-Template:
612
com.mchange.v2.c3p0.*;version="[0.9.1.2, 1.0.0)";resolution:=optional,
713
com.sun.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional,
@@ -16,7 +22,4 @@ Import-Template:
1622
org.springframework.transaction.*;version="[3.0.0, 3.0.1)",
1723
org.springframework.util;version="[3.0.0, 3.0.1)"
1824
Unversioned-Imports:
19-
javax.naming.*,
20-
javax.sql,
21-
javax.xml.transform.*,
22-
org.w3c.dom.*
25+
*

org.springframework.jms/template.mf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ Import-Template:
2020
org.springframework.transaction.*;version="[3.0.0, 3.0.1)";resolution:=optional,
2121
org.springframework.util.*;version="[3.0.0, 3.0.1)"
2222
Unversioned-Imports:
23-
javax.naming.*,
24-
org.w3c.dom.*
23+
*
2524
Ignored-Existing-Headers:
2625
Bnd-LastModified,
2726
Import-Package,

org.springframework.orm/template.mf

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,7 @@ Import-Template:
6262
org.springframework.web.*;version="[3.0.0, 3.0.1)";resolution:=optional,
6363
org.springframework.ui.*;version="[3.0.0, 3.0.1)";resolution:=optional
6464
Unversioned-Imports:
65-
javax.naming.*,
66-
javax.sql.*,
67-
javax.xml.parsers.*,
68-
org.w3c.dom.*,
69-
org.xml.sax
65+
*
7066
Ignored-Existing-Headers:
7167
Bnd-LastModified,
7268
DynamicImport-Package,

org.springframework.test/template.mf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ Import-Template:
1414
org.apache.taglibs.standard.*;version="[1.1.2, 2.0.0)";resolution:=optional,
1515
org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional,
1616
org.junit.*;version="[4.5.0, 5.0.0)";resolution:=optional,
17-
org.springframework.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
17+
org.springframework.*;version="[3.0.0, 3.0.1)";resolution:=optional,
1818
org.testng.*;version="[5.8.0, 6.0.0)";resolution:=optional
1919
Unversioned-Imports:
20-
javax.naming.*,
21-
javax.sql
20+
*
2221
Ignored-Existing-Headers:
2322
Bnd-LastModified,
2423
Import-Package,

0 commit comments

Comments
 (0)