Project

General

Profile

« Previous | Next » 

Revision d0ded6af

Added by Andreas Kohlbecker over 6 years ago

ref #6206 solving problems with the war overlay and adding test dependency cdmlib-db

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>
66 
      <type>war</type>
67 
    </dependency>
68 
    <dependency>
69 
      <groupId>eu.etaxonomy</groupId>
64 70 
      <artifactId>cdmlib-remote-webapp</artifactId>
65 71 
      <version>${cdmlib.version}</version>
66 72 
      <type>war</type>
67 73 
    </dependency>
68 74 
    <dependency>
69 75 
      <groupId>eu.etaxonomy</groupId>
70 
      <artifactId>cdm-vaadin</artifactId>
71 
      <version>${cdm.vaadin.version}</version>
72 
      <type>war</type>
76 
      <artifactId>cdmlib-db</artifactId>
77 
      <version>${cdmlib.version}</version>
78 
      <scope>test</scope>
73 79 
    </dependency>
74 80 
  </dependencies>
75 81 
  <build>
......
79 85 
        <artifactId>maven-war-plugin</artifactId>
80 86 
        <version>2.6</version>
81 87 
        <configuration>
82 
          <webResources>
83 
            <resource>
84 
              <!-- this is relative to the pom.xml directory -->
85 
              <directory>${project.build.directory}/dependency/cdm-vaadin</directory>
86 
            </resource>
87 
            <resource>
88 
              <!-- this is relative to the pom.xml directory -->
89 
              <directory>${project.build.directory}/dependency/cdmlib-remote-webapp</directory>
90 
            </resource>
91 
          </webResources>
88 
          <failOnMissingWebXml>flase</failOnMissingWebXml>
89 
          <overlays>
90 
            <!--
91 
                Overlays are applied with a first-win strategy.
92 
                Overlays are applied in the order in which they are defined in the <overlays> configuration.
93 
            -->
94 
            <overlay>
95 
              <groupId>eu.etaxonomy</groupId>
96 
              <artifactId>cdm-vaadin</artifactId>
97 
            </overlay>
98 
            <overlay>
99 
              <groupId>eu.etaxonomy</groupId>
100 
              <artifactId>cdmlib-remote-webapp</artifactId>
101 
            </overlay>
102 
          </overlays>
92 103 
        </configuration>
93 104 
      </plugin>
94 105 
      <!--
......
122 133 
        </executions>
123 134 
      </plugin>
124 135 
        -->
136 
        <!--
125 137 
      <plugin>
126 138 
        <groupId>org.apache.maven.plugins</groupId>
127 139 
        <artifactId>maven-dependency-plugin</artifactId>
......
159 171 
          </execution>
160 172 
        </executions>
161 173 
      </plugin>
174 
       -->
162 175 
      <plugin>
163 176 
        <groupId>external.atlassian.jgitflow</groupId>
164 177 
        <artifactId>jgitflow-maven-plugin</artifactId>

Also available in: Unified diff