Project

General

Profile

« Previous | Next » 

Revision 9419

Added by ben leinfelder about 9 years ago

bump trunk to 2.6.0-SNAPSHOT and pull in d1 dependencies at 2.1.0-SNAPSHOT to continue trunk development.

View differences:

metacat-common/pom.xml
4 4 
	<groupId>edu.ucsb.nceas.metacat.common</groupId>
5 5 
	<artifactId>metacat-common</artifactId>
6 6 
	<packaging>jar</packaging>
7 
	<version>2.5.0-SNAPSHOT</version>
7 
	<version>2.6.0-SNAPSHOT</version>
8 8 
	<name>metacat-common</name>
9 9 
	<url>http://maven.apache.org</url>
10 10 
	<properties>
......
61 61 
		<dependency>
62 62 
			<groupId>org.dataone</groupId>
63 63 
			<artifactId>d1_common_java</artifactId>
64 
			<version>2.0.0-SNAPSHOT</version>
64 
			<version>2.1.0-SNAPSHOT</version>
65 65 
			<type>jar</type>
66 66 
			<!-- exclude extraneous artifacts (jars) -->
67 67 
			<exclusions>
metacat-index/pom.xml
4 4 
	<groupId>edu.ucsb.nceas.metacat.index</groupId>
5 5 
	<artifactId>metacat-index</artifactId>
6 6 
	<packaging>war</packaging>
7 
	<version>2.5.0-SNAPSHOT</version>
7 
	<version>2.6.0-SNAPSHOT</version>
8 8 
	<name>metacat-index</name>
9 9 
	<url>http://maven.apache.org</url>
10 10 

  		




  ......




  32
  32
  
    
		<dependency>


  		




  33
  33
  
    
			<groupId>edu.ucsb.nceas.metacat.common</groupId>


  		




  34
  34
  
    
			<artifactId>metacat-common</artifactId>


  		




  35
  
  
    
			<version>2.5.0-SNAPSHOT</version>


  		




  
  35
  
    
			<version>2.6.0-SNAPSHOT</version>


  		




  36
  36
  
    
			<type>jar</type>


  		




  37
  37
  
    
		</dependency>


  		




  38
  38
  
    
		<dependency>


  		




  ......




  45
  45
  
    
		 <dependency>


  		




  46
  46
  
    
        <groupId>org.dataone</groupId>


  		




  47
  47
  
    
        <artifactId>d1_cn_index_processor</artifactId>


  		




  48
  
  
    
        <version>2.0.0-SNAPSHOT</version>


  		




  
  48
  
    
        <version>2.1.0-SNAPSHOT</version>


  		




  49
  49
  
    
        <type>jar</type>


  		




  50
  50
  
    
        <exclusions>


  		




  51
  51
  
    
                <exclusion>


  		












  

    
      pom.xml
    
  





  4
  4
  
    
    <modelVersion>4.0.0</modelVersion>


  		




  5
  5
  
    
    <groupId>org.ecoinformatics</groupId>


  		




  6
  6
  
    
    <artifactId>metacat</artifactId>


  		




  7
  
  
    
    <version>2.5.0-SNAPSHOT</version>


  		




  
  7
  
    
    <version>2.6.0-SNAPSHOT</version>


  		




  8
  8
  
    
    <name>metacat</name>


  		




  9
  9
  
    
    <packaging>war</packaging>


  		




  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>2.0.0-SNAPSHOT</d1_libclient_version>


  		




  14
  
  
    
        <d1_portal_version>2.0.0-SNAPSHOT</d1_portal_version>


  		




  15
  
  
    
        <metacat_common_version>2.5.0-SNAPSHOT</metacat_common_version>            


  		




  
  13
  
    
        <d1_libclient_version>2.1.0-SNAPSHOT</d1_libclient_version>


  		




  
  14
  
    
        <d1_portal_version>2.1.0-SNAPSHOT</d1_portal_version>


  		




  
  15
  
    
        <metacat_common_version>2.6.0-SNAPSHOT</metacat_common_version>            


  		




  16
  16
  
    
    </properties>


  		




  17
  17
  
    
    <repositories>


  		




  18
  18
  
    
        <repository>


  		












Also available in:  Unified diff