diff options
author | Christopher Lott (cl778h) <clott@research.att.com> | 2017-08-24 14:34:31 -0400 |
---|---|---|
committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-08-24 15:01:27 -0400 |
commit | f57e82d8c734e59977c39bc6a0139174cb7f0649 (patch) | |
tree | a13cad24453a699a572ee8381da6de95b1ca428a /ecomp-portal-BE-os | |
parent | 978dbcf0a196acbafad72fe1e2478ec0e384f02f (diff) |
Repair DDL duplicate-index name issue
This blocked the portal-db container from starting, which blocked
the app servers from starting.
Issue: PORTAL-80
Change-Id: I4c0b6b378bda29355111b137cae32c8f219d9921
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-portal-BE-os')
-rw-r--r-- | ecomp-portal-BE-os/pom.xml | 51 |
1 files changed, 21 insertions, 30 deletions
diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml index a8c19a54..966a7020 100644 --- a/ecomp-portal-BE-os/pom.xml +++ b/ecomp-portal-BE-os/pom.xml @@ -13,7 +13,8 @@ <epsdk.version>1.3.0-SNAPSHOT</epsdk.version> <portal.version>1.3.0-SNAPSHOT</portal.version> <encoding>UTF-8</encoding> - <!-- Tests usually require some setup that maven cannot do, so skip. --> + <!-- If Skiptests is false use mvn clean jacoco:prepare-agent install jacoco:report + to run jacoco report --> <skipTests>true</skipTests> <!-- Jenkins SHOULD invoke mvn with argument -Dbuild.number=${BUILD_NUMBER} --> <build.number>0</build.number> @@ -158,34 +159,7 @@ </execution> </executions> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>3.0.2</version> - <executions> - <execution> - <id>copy-src</id> - <phase>generate-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/classes</outputDirectory> - <overwrite>false</overwrite> - <skip>${skipTests}</skip> - <resources> - <resource> - <directory>${basedir}/../ecomp-portal-BE-common/target/classes</directory> - </resource> - </resources> - </configuration> - </execution> - - </executions> - </plugin> - - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> @@ -253,7 +227,7 @@ <plugin> <artifactId>maven-resources-plugin</artifactId> - <version>3.0.1</version> + <version>3.0.2</version> <!-- Your own property files can be placed in ecomp-portal-be/../../overrides directory and they will override the generic source controlled versions at build time allowing you to test locally with your own settings. --> @@ -317,6 +291,23 @@ </resources> </configuration> </execution> + <execution> + <id>copy-src</id> + <phase>generate-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/target/classes</outputDirectory> + <overwrite>false</overwrite> + <skip>${skipTests}</skip> + <resources> + <resource> + <directory>${basedir}/../ecomp-portal-BE-common/target/classes</directory> + </resource> + </resources> + </configuration> + </execution> </executions> </plugin> </plugins> |