Skip to content

Commit 5cd2b80

Browse files
committed
Fixed manifest templates and pomx
1 parent 4973f93 commit 5cd2b80

4 files changed

Lines changed: 86 additions & 7 deletions

File tree

‎org.springframework.beans/pom.xml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,47 @@
66
<packaging>jar</packaging>
77
<name>Spring Core Abstractions and Utilities</name>
88
<version>3.0.0.M1</version>
9+
<repositories>
10+
<repository>
11+
<id>com.springsource.repository.bundles.external</id>
12+
<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
13+
<url>http://repository.springsource.com/maven/bundles/external</url>
14+
</repository>
15+
</repositories>
16+
<build>
17+
<plugins>
18+
<plugin>
19+
<groupId>org.apache.maven.plugins</groupId>
20+
<artifactId>maven-compiler-plugin</artifactId>
21+
<configuration>
22+
<source>1.5</source>
23+
<target>1.5</target>
24+
</configuration>
25+
</plugin>
26+
</plugins>
27+
</build>
928
<dependencies>
1029
<dependency>
1130
<groupId>commons-logging</groupId>
1231
<artifactId>commons-logging</artifactId>
1332
<version>1.1.1</version>
1433
</dependency>
34+
<dependency>
35+
<groupId>org.springframework</groupId>
36+
<artifactId>org.springframework.core</artifactId>
37+
<version>${pom.version}</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>javax.el</groupId>
41+
<artifactId>com.springsource.javax.el</artifactId>
42+
<version>2.1.0</version>
43+
<optional>true</optional>
44+
</dependency>
45+
<dependency>
46+
<groupId>net.sourceforge.cglib</groupId>
47+
<artifactId>com.springsource.net.sf.cglib</artifactId>
48+
<version>2.1.3</version>
49+
<optional>true</optional>
50+
</dependency>
1551
</dependencies>
1652
</project>

‎org.springframework.beans/template.mf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ Bundle-SymbolicName: org.springframework.beans
22
Bundle-Name: Spring Beans
33
Bundle-Vendor: SpringSource
44
Bundle-ManifestVersion: 2
5-
Import-Template:
5+
Import-Template:
66
javax.el.*;version="[2.1.0, 3.0.0)";resolution:=optional,
77
net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional,
88
org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
99
org.springframework.core.*;version="[3.0.0, 3.0.0]",
1010
org.springframework.util.*;version="[3.0.0, 3.0.0]",
11-
Unversioned-Imports:
11+
Unversioned-Imports:
1212
javax.xml.parsers.*,
1313
org.w3c.dom.*,
14-
org.xml.sax.*
14+
org.xml.sax.*

‎org.springframework.core/ivy.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
<dependencies>
2222
<!-- compile dependencies -->
2323
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime" />
24+
<!-- optional dependencies -->
2425
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional->runtime" />
2526
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.collections" rev="3.2.0" conf="optional->compile" />
26-
<!--<dependency org="org.aspectj" name="com.springsource.org.aspectj.runtime" rev="1.6.2.RELEASE" conf="optional->compile" />-->
2727
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.2.RELEASE" conf="optional->compile" />
2828
<!-- These should be replaced with the internal repackaging of ASM -->
2929
<dependency org="org.objectweb.asm" name="com.springsource.org.objectweb.asm" rev="2.2.3" conf="optional->compile" />

‎org.springframework.core/pom.xml‎

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,54 @@
66
<packaging>jar</packaging>
77
<name>Spring Core Abstractions and Utilities</name>
88
<version>3.0.0.M1</version>
9+
<repositories>
10+
<repository>
11+
<id>com.springsource.repository.bundles.external</id>
12+
<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
13+
<url>http://repository.springsource.com/maven/bundles/external</url>
14+
</repository>
15+
</repositories>
16+
<build>
17+
<plugins>
18+
<plugin>
19+
<groupId>org.apache.maven.plugins</groupId>
20+
<artifactId>maven-compiler-plugin</artifactId>
21+
<configuration>
22+
<source>1.5</source>
23+
<target>1.5</target>
24+
</configuration>
25+
</plugin>
26+
</plugins>
27+
</build>
928
<dependencies>
1029
<dependency>
11-
<groupId>commons-logging</groupId>
12-
<artifactId>commons-logging</artifactId>
13-
<version>1.1.1</version>
30+
<groupId>org.apache.commons</groupId>
31+
<artifactId>com.springsource.org.apache.commons.logging</artifactId>
32+
<version>1.1.1</version>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.apache.log4j</groupId>
36+
<artifactId>com.springsource.org.apache.log4j</artifactId>
37+
<version>1.2.15</version>
38+
<optional>true</optional>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.apache.commons</groupId>
42+
<artifactId>com.springsource.org.apache.commons.collections</artifactId>
43+
<version>3.2.0</version>
44+
<optional>true</optional>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.aspectj</groupId>
48+
<artifactId>com.springsource.org.aspectj.weaver</artifactId>
49+
<version>1.6.2.RELEASE</version>
50+
<optional>true</optional>
51+
</dependency>
52+
<dependency>
53+
<groupId>org.objectweb.asm</groupId>
54+
<artifactId>com.springsource.org.objectweb.asm.commons</artifactId>
55+
<version>2.2.3</version>
56+
<optional>true</optional>
1457
</dependency>
1558
</dependencies>
1659
</project>

0 commit comments

Comments
 (0)