Project

General

Profile

« Previous | Next » 

Revision 2fb13c4e

Added by jenkins almost 9 years ago

updating develop poms to master versions to avoid merge conflicts

View differences:

eu.etaxonomy.taxeditor.application/pom.xml
3 3
  <parent>
4 4
    <groupId>eu.etaxonomy</groupId>
5 5
    <artifactId>taxeditor-parent</artifactId>
6
    <version>3.8.0-SNAPSHOT</version>
6
    <version>3.7.0</version>
7 7
  </parent>
8 8

  
9 9
  <modelVersion>4.0.0</modelVersion>
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
3 3
	<parent>
4 4
		<groupId>eu.etaxonomy</groupId>
5 5
		<artifactId>taxeditor-parent</artifactId>
6
		<version>3.8.0-SNAPSHOT</version>
6
		<version>3.7.0</version>
7 7
	</parent>
8 8

  
9 9
	<modelVersion>4.0.0</modelVersion>
eu.etaxonomy.taxeditor.cdmlib/pom.xml
3 3
  <parent>
4 4
    <groupId>eu.etaxonomy</groupId>
5 5
    <artifactId>taxeditor-parent</artifactId>
6
    <version>3.8.0-SNAPSHOT</version>
6
    <version>3.7.0</version>
7 7
  </parent>
8 8
  <modelVersion>4.0.0</modelVersion>
9 9
  <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
eu.etaxonomy.taxeditor.editor/pom.xml
3 3
  <parent>
4 4
	<groupId>eu.etaxonomy</groupId>
5 5
	<artifactId>taxeditor-parent</artifactId>
6
    <version>3.8.0-SNAPSHOT</version>
6
    <version>3.7.0</version>
7 7
  </parent>
8 8
  
9 9
  <modelVersion>4.0.0</modelVersion>
eu.etaxonomy.taxeditor.feature.platform/pom.xml
3 3
	<parent>
4 4
		<groupId>eu.etaxonomy</groupId>
5 5
		<artifactId>taxeditor-parent</artifactId>
6
		<version>3.8.0-SNAPSHOT</version>
6
		<version>3.7.0</version>
7 7
	</parent>
8 8
	<modelVersion>4.0.0</modelVersion>
9 9
	<artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
eu.etaxonomy.taxeditor.feature/pom.xml
3 3
  <parent>
4 4
    <groupId>eu.etaxonomy</groupId>
5 5
    <artifactId>taxeditor-parent</artifactId>
6
    <version>3.8.0-SNAPSHOT</version>
6
    <version>3.7.0</version>
7 7
  </parent>
8 8
  <modelVersion>4.0.0</modelVersion>
9 9
  <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
eu.etaxonomy.taxeditor.help/pom.xml
3 3
	<parent>
4 4
		<groupId>eu.etaxonomy</groupId>
5 5
		<artifactId>taxeditor-parent</artifactId>
6
		<version>3.8.0-SNAPSHOT</version>
6
		<version>3.7.0</version>
7 7
	</parent>
8 8

  
9 9
	<modelVersion>4.0.0</modelVersion>
eu.etaxonomy.taxeditor.navigation/pom.xml
3 3
	<parent>
4 4
		<groupId>eu.etaxonomy</groupId>
5 5
		<artifactId>taxeditor-parent</artifactId>
6
		<version>3.8.0-SNAPSHOT</version>
6
		<version>3.7.0</version>
7 7
	</parent>
8 8

  
9 9
	<modelVersion>4.0.0</modelVersion>
eu.etaxonomy.taxeditor.printpublisher/pom.xml
3 3
	<parent>
4 4
		<artifactId>taxeditor-parent</artifactId>
5 5
		<groupId>eu.etaxonomy</groupId>
6
		<version>3.8.0-SNAPSHOT</version>
6
		<version>3.7.0</version>
7 7
	</parent>
8 8

  
9 9
	<modelVersion>4.0.0</modelVersion>
eu.etaxonomy.taxeditor.store/pom.xml
3 3
  <parent>
4 4
	<groupId>eu.etaxonomy</groupId>
5 5
	<artifactId>taxeditor-parent</artifactId>
6
	<version>3.8.0-SNAPSHOT</version>
6
	<version>3.7.0</version>
7 7
  </parent>
8 8

  
9 9
  <modelVersion>4.0.0</modelVersion>
eu.etaxonomy.taxeditor/pom.xml
2 2
  <parent>
3 3
    <groupId>eu.etaxonomy</groupId>
4 4
    <artifactId>taxeditor-parent</artifactId>
5
    <version>3.8.0-SNAPSHOT</version>
5
    <version>3.7.0</version>
6 6
  </parent>
7 7

  
8 8
  <modelVersion>4.0.0</modelVersion>
pom.xml
6 6
  </prerequisites>
7 7
  <groupId>eu.etaxonomy</groupId>
8 8
  <artifactId>taxeditor-parent</artifactId>
9
  <version>3.8.0-SNAPSHOT</version>
9
  <version>3.7.0</version>
10 10
  <name>EDIT Taxonomic Editor</name>
11 11
  <description>The Taxonomic Editor for EDIT's platform for
12 12
    cybertaxonomy

Also available in: Unified diff