Project

General

Profile

« Previous | Next » 

Revision f55d4981

Added by Andreas Kohlbecker over 7 years ago

fix #6224 swapping the war overlay order to avoid build pipeline inconsistencies

View differences:

pom.xml
61 61 
  <dependencies>
62 62 
    <dependency>
63 63 
      <groupId>eu.etaxonomy</groupId>
64 
      <artifactId>cdm-vaadin</artifactId>
65 
      <version>${cdm.vaadin.version}</version>
64 
      <artifactId>cdmlib-remote-webapp</artifactId>
65 
      <version>${cdmlib.version}</version>
66 66 
      <type>war</type>
67 67 
    </dependency>
68 68 
    <dependency>
69 69 
      <groupId>eu.etaxonomy</groupId>
70 
      <artifactId>cdmlib-remote-webapp</artifactId>
71 
      <version>${cdmlib.version}</version>
70 
      <artifactId>cdm-vaadin</artifactId>
71 
      <version>${cdm.vaadin.version}</version>
72 72 
      <type>war</type>
73 73 
    </dependency>
74 74 
    <dependency>
......
90 90 
            <!--
91 91 
                Overlays are applied with a first-win strategy.
92 92 
                Overlays are applied in the order in which they are defined in the <overlays> configuration.
93
94 
                Therefore cdmlib-remote-webapp MUST COME FIRST!!
95
96 
                Once a change is made to any cdmlib-* project cdmlib sould be build and the
97 
                cdmlib-remote-webapp.war will contain all these fresh artifacts. cdm-vaadin
98 
                in contrast is expected to be build only due to changes in the vaadin specific
99 
                code.
93 100 
            -->
94 101 
            <overlay>
102 
              <!-- MUST BE THE FIRST war, see above -->
95 103 
              <groupId>eu.etaxonomy</groupId>
96 
              <artifactId>cdm-vaadin</artifactId>
104 
              <artifactId>cdmlib-remote-webapp</artifactId>
97 105 
            </overlay>
98 106 
            <overlay>
99 107 
              <groupId>eu.etaxonomy</groupId>
100 
              <artifactId>cdmlib-remote-webapp</artifactId>
108 
              <artifactId>cdm-vaadin</artifactId>
101 109 
            </overlay>
102 110 
          </overlays>
103 111 
        </configuration>

Also available in: Unified diff