1 |
diff --git a/pom.xml b/pom.xml |
2 |
index 569995c..3631ba4 100644 |
3 |
--- a/pom.xml |
4 |
+++ b/pom.xml |
5 |
@@ -24,12 +24,6 @@ |
6 |
|
7 |
<modelVersion>4.0.0</modelVersion> |
8 |
|
9 |
- <parent> |
10 |
- <groupId>org.apache.geronimo.genesis</groupId> |
11 |
- <artifactId>genesis-java5-flava</artifactId> |
12 |
- <version>2.0</version> |
13 |
- </parent> |
14 |
- |
15 |
<groupId>org.apache.xbean</groupId> |
16 |
<artifactId>xbean</artifactId> |
17 |
<name>Apache XBean</name> |
18 |
@@ -265,33 +259,15 @@ |
19 |
</dependency> |
20 |
|
21 |
<dependency> |
22 |
- <groupId>org.springframework</groupId> |
23 |
- <artifactId>spring-beans</artifactId> |
24 |
- <version>2.5.6</version> |
25 |
- </dependency> |
26 |
- |
27 |
- <dependency> |
28 |
- <groupId>org.springframework</groupId> |
29 |
- <artifactId>spring-context</artifactId> |
30 |
- <version>2.5.6</version> |
31 |
- </dependency> |
32 |
- |
33 |
- <dependency> |
34 |
- <groupId>org.springframework</groupId> |
35 |
- <artifactId>spring-web</artifactId> |
36 |
- <version>2.5.6</version> |
37 |
- </dependency> |
38 |
- |
39 |
- <dependency> |
40 |
<groupId>com.thoughtworks.qdox</groupId> |
41 |
<artifactId>qdox</artifactId> |
42 |
<version>1.6.3</version> |
43 |
</dependency> |
44 |
- |
45 |
+ |
46 |
<dependency> |
47 |
<groupId>org.slf4j</groupId> |
48 |
<artifactId>slf4j-api</artifactId> |
49 |
- <version>1.5.11</version> |
50 |
+ <version>1.5.11</version> |
51 |
</dependency> |
52 |
</dependencies> |
53 |
</dependencyManagement> |
54 |
@@ -327,13 +303,13 @@ |
55 |
<artifactId>maven-bundle-plugin</artifactId> |
56 |
<version>2.0.0</version> |
57 |
<extensions>true</extensions> |
58 |
- <configuration> |
59 |
- <instructions> |
60 |
- <Bundle-DocURL>${project.url}</Bundle-DocURL> |
61 |
- <Export-Package>org.apache.xbean.*;version=${pom.version}</Export-Package> |
62 |
- <Private-Package /> |
63 |
- </instructions> |
64 |
- </configuration> |
65 |
+ <configuration> |
66 |
+- <instructions> |
67 |
+- <Bundle-DocURL>${project.url}</Bundle-DocURL> |
68 |
+- <Export-Package>org.apache.xbean.*;version=${pom.version}</Export-Package> |
69 |
+- <Private-Package /> |
70 |
+- </instructions> |
71 |
+- </configuration> |
72 |
</plugin> |
73 |
</plugins> |
74 |
</pluginManagement> |
75 |
@@ -343,22 +319,21 @@ |
76 |
<groupId>org.apache.felix</groupId> |
77 |
<artifactId>maven-bundle-plugin</artifactId> |
78 |
</plugin> |
79 |
+ <plugin> |
80 |
+ <artifactId>maven-compiler-plugin</artifactId> |
81 |
+ <configuration> |
82 |
+ <source>1.5</source> |
83 |
+ <target>1.5</target> |
84 |
+ </configuration> |
85 |
+ </plugin> |
86 |
</plugins> |
87 |
</build> |
88 |
|
89 |
<modules> |
90 |
- <module>xbean-classloader</module> |
91 |
<module>xbean-classpath</module> |
92 |
<module>xbean-bundleutils</module> |
93 |
- <module>xbean-finder</module> |
94 |
<module>xbean-naming</module> |
95 |
<module>xbean-reflect</module> |
96 |
- <module>xbean-blueprint</module> |
97 |
- <module>xbean-spring</module> |
98 |
- <module>xbean-telnet</module> |
99 |
- <module>maven-xbean-plugin</module> |
100 |
- <module>xbean-asm-shaded</module> |
101 |
- <module>xbean-finder-shaded</module> |
102 |
</modules> |
103 |
|
104 |
<reporting> |
105 |
@@ -422,4 +397,4 @@ |
106 |
</plugins> |
107 |
</reporting> |
108 |
|
109 |
-</project> |
110 |
\ No newline at end of file |
111 |
+</project> |
112 |
diff --git a/xbean-reflect/pom.xml b/xbean-reflect/pom.xml |
113 |
index 5ea1864..288ec1d 100644 |
114 |
--- a/xbean-reflect/pom.xml |
115 |
+++ b/xbean-reflect/pom.xml |
116 |
@@ -47,13 +47,6 @@ |
117 |
<optional>true</optional>
|
118 |
</dependency>
|
119 |
<dependency>
|
120 |
- <groupId>org.apache.xbean</groupId>
|
121 |
- <artifactId>xbean-asm-shaded</artifactId>
|
122 |
- <version>3.7</version>
|
123 |
- <scope>provided</scope>
|
124 |
- <optional>true</optional>
|
125 |
- </dependency>
|
126 |
- <dependency>
|
127 |
<groupId>log4j</groupId>
|
128 |
<artifactId>log4j</artifactId>
|
129 |
<version>1.2.12</version>
|