Project

General

Profile

« Previous | Next » 

Revision 8758

Added by ben leinfelder about 10 years ago

use newer httpclient library so that Jena's dependency is met - this goes all the way back to d1_common/libclient needing to pull in the newer library.

View differences:

metacat-index/pom.xml
34 34 
			<artifactId>metacat-common</artifactId>
35 35 
			<version>2.4.2-SNAPSHOT</version>
36 36 
			<type>jar</type>
37 
			<exclusions>
38 
				<exclusion>
39 
					<groupId>org.apache.httpcomponents</groupId>
40 
					<artifactId>httpclient</artifactId>
41 
				</exclusion>
42 
				<exclusion>
43 
					<groupId>org.apache.httpcomponents</groupId>
44 
					<artifactId>httpmime</artifactId>
45 
				</exclusion>
46 
			</exclusions>
47 37 
		</dependency>
48 38 
		<dependency>
49 39 
			<groupId>javax.servlet</groupId>
......
65 55 
				<exclusion>
66 56 
					<groupId>com.hp.hpl.jena</groupId>
67 57 
					<artifactId>jena</artifactId>
68 
				</exclusion>
58 
				</exclusion>
69 59 
				<exclusion>
70 
					<groupId>org.apache.httpcomponents</groupId>
71 
					<artifactId>httpclient</artifactId>
72 
				</exclusion>
73
74 
				<exclusion>
75 60 
					<groupId>xml-apis</groupId>
76 61 
					<artifactId>xml-apis</artifactId>
77 62 
				</exclusion>
metacat-common/pom.xml
61 61 
		<dependency>
62 62 
			<groupId>org.dataone</groupId>
63 63 
			<artifactId>d1_common_java</artifactId>
64 
			<version>1.1.3</version>
64 
			<version>1.3.0-SNAPSHOT</version>
65 65 
			<type>jar</type>
66 66 
			<!-- exclude extraneous artifacts (jars) -->
67 67 
			<exclusions>
pom.xml
10 10 
    <url>http://maven.apache.org</url>
11 11 
    <properties>
12 12 
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
13 
        <d1_libclient_version>1.2.4</d1_libclient_version>
14 
        <d1_common_java_version>1.1.3</d1_common_java_version>
15 
        <d1_portal_version>1.2.0</d1_portal_version>
13 
        <d1_libclient_version>1.4.0-SNAPSHOT</d1_libclient_version>
14 
        <d1_portal_version>1.3.0-SNAPSHOT</d1_portal_version>
16 15 
        <metacat_common_version>2.4.2-SNAPSHOT</metacat_common_version>
17 16 
    </properties>
18 17 
    <repositories>
......
207 206 
					<groupId>xerces</groupId>
208 207 
					<artifactId>xercesImpl</artifactId>
209 208 
		        </exclusion>
209 
		        <exclusion>
210 
					<groupId>com.hp.hpl.jena</groupId>
211 
					<artifactId>jena</artifactId>
212 
				</exclusion>
210 213 
			</exclusions>
211 214 
		</dependency>
212 215 
		<dependency>
213 216 
			<groupId>edu.ucsb.nceas</groupId>
214 217 
			<artifactId>ezid</artifactId>
215 
			<version>1.0.0</version>
218 
			<version>1.0.1-SNAPSHOT</version>
216 219 
		</dependency>
217 220 
		<!-- geotools -->
218 221 
		<dependency>
......
327 330 
            <artifactId>jbcrypt</artifactId>
328 331 
            <version>0.3m</version>
329 332 
        </dependency>
333 
        <!-- jena tdb -->
334 
        <dependency>
335 
			<groupId>org.apache.jena</groupId>
336 
			<artifactId>jena-tdb</artifactId>
337 
			<version>1.0.0</version>
338 
		</dependency>
330 339 
    </dependencies>
331 340 
</project>

Also available in: Unified diff