You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2019/03/07 16:11:59 UTC
svn commit: r1854988 - in /db/derby/code/branches/10.15: ./
maven2/war/pom.xml
Author: rhillegas
Date: Thu Mar 7 16:11:59 2019
New Revision: 1854988
URL: http://svn.apache.org/viewvc?rev=1854988&view=rev
Log:
DERBY-7010: Merge 1854986 from trunk to 10.15 branch.
Modified:
db/derby/code/branches/10.15/ (props changed)
db/derby/code/branches/10.15/maven2/war/pom.xml
Propchange: db/derby/code/branches/10.15/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 7 16:11:59 2019
@@ -2,4 +2,4 @@
/db/derby/code/branches/10.7:1061570,1061578,1082235
/db/derby/code/branches/10.8:1177474,1234973,1464951
/db/derby/code/branches/10.9:1373148
-/db/derby/code/trunk:1063809,1851719-1851720,1854928
+/db/derby/code/trunk:1063809,1851719-1851720,1854928,1854986
Modified: db/derby/code/branches/10.15/maven2/war/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.15/maven2/war/pom.xml?rev=1854988&r1=1854987&r2=1854988&view=diff
==============================================================================
--- db/derby/code/branches/10.15/maven2/war/pom.xml (original)
+++ db/derby/code/branches/10.15/maven2/war/pom.xml Thu Mar 7 16:11:59 2019
@@ -37,6 +37,11 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>