소스 검색

Fixed a classpath problem when running Cobertura (conflicting versions of slf4j were being pulled in).

peter_backlund 17 년 전
부모
커밋
69f0d86573
1개의 변경된 파일18개의 추가작업 그리고 45개의 파일을 삭제
  1. 18
    45
      dddsample/pom.xml

+ 18
- 45
dddsample/pom.xml 파일 보기

@@ -111,34 +111,6 @@
111 111
         </configuration>
112 112
       </plugin>
113 113
 
114
-      <!-- Generates WSDL from Java
115
-      <plugin>
116
-        <groupId>org.apache.cxf</groupId>
117
-        <artifactId>cxf-java2ws-plugin</artifactId>
118
-        <version>${cxf.version}</version>
119
-        <dependencies>
120
-          <dependency>
121
-            <groupId>org.apache.cxf</groupId>
122
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
123
-            <version>${cxf.version}</version>
124
-          </dependency>
125
-        </dependencies>
126
-        <executions>
127
-          <execution>
128
-            <phase>process-classes</phase>
129
-            <configuration>
130
-              <className>se.citerus.dddsample.interfaces.handling.ws.HandlingReportService</className>
131
-              <genWsdl>true</genWsdl>
132
-              <verbose>true</verbose>
133
-            </configuration>
134
-            <goals>
135
-              <goal>java2ws</goal>
136
-            </goals>
137
-          </execution>
138
-        </executions>
139
-      </plugin>
140
-      -->
141
-
142 114
       <plugin>
143 115
         <artifactId>maven-jar-plugin</artifactId>
144 116
         <executions>
@@ -189,7 +161,6 @@
189 161
           </descriptorRefs>
190 162
         </configuration>
191 163
       </plugin>
192
-
193 164
     </plugins>
194 165
   </build>
195 166
   <dependencies>
@@ -206,23 +177,14 @@
206 177
     </dependency>
207 178
     <dependency>
208 179
       <groupId>org.springframework</groupId>
209
-      <artifactId>spring-orm</artifactId>
210
-      <version>${spring.version}</version>
211
-    </dependency>
212
-    <dependency>
213
-      <groupId>org.springframework</groupId>
214
-      <artifactId>spring-jdbc</artifactId>
215
-      <version>${spring.version}</version>
216
-    </dependency>
217
-    <dependency>
218
-      <groupId>org.springframework</groupId>
219
-      <artifactId>spring-aop</artifactId>
220
-      <version>${spring.version}</version>
221
-    </dependency>
222
-    <dependency>
223
-      <groupId>org.springframework</groupId>
224
-      <artifactId>spring-jms</artifactId>
180
+      <artifactId>spring</artifactId>
225 181
       <version>${spring.version}</version>
182
+      <exclusions>
183
+        <exclusion>
184
+          <groupId>commons-logging</groupId>
185
+          <artifactId>commons-logging</artifactId>
186
+        </exclusion>
187
+      </exclusions>
226 188
     </dependency>
227 189
     <dependency>
228 190
       <groupId>org.springframework</groupId>
@@ -253,6 +215,11 @@
253 215
       <version>1.5.6</version>
254 216
     </dependency>
255 217
     <dependency>
218
+      <groupId>org.slf4j</groupId>
219
+      <artifactId>slf4j-api</artifactId>
220
+      <version>1.5.6</version>
221
+    </dependency>
222
+    <dependency>
256 223
       <groupId>javassist</groupId>
257 224
       <artifactId>javassist</artifactId>
258 225
       <version>3.8.0.GA</version>
@@ -308,6 +275,12 @@
308 275
       <groupId>org.apache.activemq</groupId>
309 276
       <artifactId>activemq-core</artifactId>
310 277
       <version>5.2.0</version>
278
+      <exclusions>
279
+        <exclusion>
280
+          <groupId>commons-logging</groupId>
281
+          <artifactId>commons-logging-api</artifactId>
282
+        </exclusion>
283
+      </exclusions>
311 284
     </dependency>
312 285
     <dependency>
313 286
       <groupId>org.apache.xbean</groupId>