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 2022/06/13 22:01:24 UTC
svn commit: r1901892 - in /db/derby/code/branches/10.16: ./ maven2/ maven2/client/ maven2/commons/ maven2/derbyLocale_cs/ maven2/derbyLocale_de_DE/ maven2/derbyLocale_es/ maven2/derbyLocale_fr/ maven2/derbyLocale_hu/ maven2/derbyLocale_it/ maven2/derby...
Author: rhillegas
Date: Mon Jun 13 22:01:24 2022
New Revision: 1901892
URL: http://svn.apache.org/viewvc?rev=1901892&view=rev
Log:
DERBY-7136: Port 1901891 from trunk to 10.16 branch.
Modified:
db/derby/code/branches/10.16/ (props changed)
db/derby/code/branches/10.16/maven2/client/pom.xml
db/derby/code/branches/10.16/maven2/commons/pom.xml
db/derby/code/branches/10.16/maven2/derbyLocale_cs/pom.xml
db/derby/code/branches/10.16/maven2/derbyLocale_de_DE/pom.xml
db/derby/code/branches/10.16/maven2/derbyLocale_es/pom.xml
db/derby/code/branches/10.16/maven2/derbyLocale_fr/pom.xml
db/derby/code/branches/10.16/maven2/derbyLocale_hu/pom.xml
db/derby/code/branches/10.16/maven2/derbyLocale_it/pom.xml
db/derby/code/branches/10.16/maven2/derbyLocale_ja_JP/pom.xml
db/derby/code/branches/10.16/maven2/derbyLocale_ko_KR/pom.xml
db/derby/code/branches/10.16/maven2/derbyLocale_pl/pom.xml
db/derby/code/branches/10.16/maven2/derbyLocale_pt_BR/pom.xml
db/derby/code/branches/10.16/maven2/derbyLocale_ru/pom.xml
db/derby/code/branches/10.16/maven2/derbyLocale_zh_CN/pom.xml
db/derby/code/branches/10.16/maven2/derbyLocale_zh_TW/pom.xml
db/derby/code/branches/10.16/maven2/engine/pom.xml
db/derby/code/branches/10.16/maven2/net/pom.xml
db/derby/code/branches/10.16/maven2/optionaltools/pom.xml
db/derby/code/branches/10.16/maven2/pom.xml
db/derby/code/branches/10.16/maven2/tools/pom.xml
db/derby/code/branches/10.16/maven2/war/pom.xml
Propchange: db/derby/code/branches/10.16/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1901891
Modified: db/derby/code/branches/10.16/maven2/client/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/client/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/client/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/client/pom.xml Mon Jun 13 22:01:24 2022
@@ -50,13 +50,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbyclient.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/commons/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/commons/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/commons/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/commons/pom.xml Mon Jun 13 22:01:24 2022
@@ -41,13 +41,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbyshared.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/derbyLocale_cs/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/derbyLocale_cs/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/derbyLocale_cs/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/derbyLocale_cs/pom.xml Mon Jun 13 22:01:24 2022
@@ -50,13 +50,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbyLocale_cs.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/derbyLocale_de_DE/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/derbyLocale_de_DE/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/derbyLocale_de_DE/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/derbyLocale_de_DE/pom.xml Mon Jun 13 22:01:24 2022
@@ -50,13 +50,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbyLocale_de_DE.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/derbyLocale_es/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/derbyLocale_es/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/derbyLocale_es/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/derbyLocale_es/pom.xml Mon Jun 13 22:01:24 2022
@@ -50,13 +50,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbyLocale_es.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/derbyLocale_fr/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/derbyLocale_fr/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/derbyLocale_fr/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/derbyLocale_fr/pom.xml Mon Jun 13 22:01:24 2022
@@ -50,13 +50,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbyLocale_fr.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/derbyLocale_hu/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/derbyLocale_hu/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/derbyLocale_hu/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/derbyLocale_hu/pom.xml Mon Jun 13 22:01:24 2022
@@ -50,13 +50,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbyLocale_hu.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/derbyLocale_it/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/derbyLocale_it/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/derbyLocale_it/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/derbyLocale_it/pom.xml Mon Jun 13 22:01:24 2022
@@ -50,13 +50,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbyLocale_it.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/derbyLocale_ja_JP/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/derbyLocale_ja_JP/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/derbyLocale_ja_JP/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/derbyLocale_ja_JP/pom.xml Mon Jun 13 22:01:24 2022
@@ -50,13 +50,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbyLocale_ja_JP.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/derbyLocale_ko_KR/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/derbyLocale_ko_KR/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/derbyLocale_ko_KR/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/derbyLocale_ko_KR/pom.xml Mon Jun 13 22:01:24 2022
@@ -50,13 +50,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbyLocale_ko_KR.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/derbyLocale_pl/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/derbyLocale_pl/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/derbyLocale_pl/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/derbyLocale_pl/pom.xml Mon Jun 13 22:01:24 2022
@@ -50,13 +50,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbyLocale_pl.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/derbyLocale_pt_BR/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/derbyLocale_pt_BR/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/derbyLocale_pt_BR/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/derbyLocale_pt_BR/pom.xml Mon Jun 13 22:01:24 2022
@@ -50,13 +50,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbyLocale_pt_BR.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/derbyLocale_ru/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/derbyLocale_ru/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/derbyLocale_ru/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/derbyLocale_ru/pom.xml Mon Jun 13 22:01:24 2022
@@ -50,13 +50,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbyLocale_ru.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/derbyLocale_zh_CN/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/derbyLocale_zh_CN/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/derbyLocale_zh_CN/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/derbyLocale_zh_CN/pom.xml Mon Jun 13 22:01:24 2022
@@ -50,13 +50,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbyLocale_zh_CN.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/derbyLocale_zh_TW/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/derbyLocale_zh_TW/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/derbyLocale_zh_TW/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/derbyLocale_zh_TW/pom.xml Mon Jun 13 22:01:24 2022
@@ -50,13 +50,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbyLocale_zh_TW.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/engine/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/engine/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/engine/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/engine/pom.xml Mon Jun 13 22:01:24 2022
@@ -50,13 +50,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derby.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/net/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/net/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/net/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/net/pom.xml Mon Jun 13 22:01:24 2022
@@ -62,13 +62,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbynet.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/optionaltools/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/optionaltools/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/optionaltools/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/optionaltools/pom.xml Mon Jun 13 22:01:24 2022
@@ -62,13 +62,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbyoptionaltools.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/pom.xml Mon Jun 13 22:01:24 2022
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>10</version>
+ <version>26</version>
</parent>
<artifactId>derby-project</artifactId>
<version>ALPHA_VERSION</version>
Modified: db/derby/code/branches/10.16/maven2/tools/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/tools/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/tools/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/tools/pom.xml Mon Jun 13 22:01:24 2022
@@ -50,13 +50,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derbytools.jar"
tofile="${basedir}/target/${project.build.finalName}.jar"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: db/derby/code/branches/10.16/maven2/war/pom.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/war/pom.xml?rev=1901892&r1=1901891&r2=1901892&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/war/pom.xml (original)
+++ db/derby/code/branches/10.16/maven2/war/pom.xml Mon Jun 13 22:01:24 2022
@@ -48,13 +48,13 @@
<execution>
<phase>package</phase>
<configuration>
- <tasks>
+ <target>
<copy file="${basedir}/../../jars/${sanity}/derby.war"
tofile="${basedir}/target/${project.build.finalName}.war"
overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>