From 16da420ad7a4c609d8832fcf4d953acaf56272ac Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Nov 29 2011 13:16:30 +0000
Subject: Update to newer upstream version.


---

diff --git a/.gitignore b/.gitignore
index 230226a..da8c470 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 db-derby-10.6.1.0-src.tar.gz
+db-derby-10.6.2.1-src.tar.gz
diff --git a/derby-10.6.1.0.pom b/derby-10.6.1.0.pom
deleted file mode 100644
index 713a376..0000000
--- a/derby-10.6.1.0.pom
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <parent>
-    <groupId>org.apache.derby</groupId>
-    <artifactId>derby-project</artifactId>
-    <version>10.6.1.0</version>
-  </parent>
-  <artifactId>derby</artifactId>
-  <name>Apache Derby Database Engine and Embedded JDBC Driver</name>
-  <description>Contains the core Apache Derby database engine, which also includes the embedded JDBC driver.</description>
-
-  <build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <configuration>
-                        <tasks>
-
-                <copy file="${basedir}/../../jars/${sanity}/derby.jar"
-                      tofile="${basedir}/target/${project.build.finalName}.jar"
-                      overwrite="true"/>
-
-                        </tasks>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-
-        <!-- 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-gpg-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>sign-artifacts</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>sign</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      -->
-
-    </plugins>
-  </build>
-
-</project>
diff --git a/derby-10.6.2.1.pom b/derby-10.6.2.1.pom
new file mode 100644
index 0000000..943d5c7
--- /dev/null
+++ b/derby-10.6.2.1.pom
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <parent>
+    <groupId>org.apache.derby</groupId>
+    <artifactId>derby-project</artifactId>
+    <version>10.6.2.1</version>
+  </parent>
+  <artifactId>derby</artifactId>
+  <name>Apache Derby Database Engine and Embedded JDBC Driver</name>
+  <description>Contains the core Apache Derby database engine, which also includes the embedded JDBC driver.</description>
+
+  <build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <configuration>
+                        <tasks>
+
+                <copy file="${basedir}/../../jars/${sanity}/derby.jar"
+                      tofile="${basedir}/target/${project.build.finalName}.jar"
+                      overwrite="true"/>
+
+                        </tasks>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+
+        <!-- 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-gpg-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>sign-artifacts</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>sign</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      -->
+
+    </plugins>
+  </build>
+
+</project>
diff --git a/derby-project-10.6.1.0.pom b/derby-project-10.6.1.0.pom
deleted file mode 100644
index 9943244..0000000
--- a/derby-project-10.6.1.0.pom
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <artifactId>derby-project</artifactId>
-  <version>10.6.1.0</version>
-  <packaging>pom</packaging>
-  <name>Apache Derby Project</name>
-  <description>Apache Derby is an open source relational database implemented entirely in Java.</description>
-  <url>http://db.apache.org/derby/</url>
-  <inceptionYear>2004</inceptionYear>
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://db.apache.org/</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>Apache 2</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-      <comments>A business-friendly OSS license</comments>
-    </license>
-  </licenses>
-  <mailingLists>
-    <mailingList>
-      <name>Derby User List</name>
-      <subscribe>derby-user-subscribe@db.apache.org</subscribe>
-      <unsubscribe>derby-user-unsubscribe@db.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/db-derby-user/</archive>
-      <otherArchives>
-        <otherArchive>http://www.nabble.com/Apache-Derby-Users-f93.html</otherArchive>
-      </otherArchives>
-    </mailingList>
-    <mailingList>
-      <name>Derby Developer List</name>
-      <subscribe>derby-dev-subscribe@db.apache.org</subscribe>
-      <unsubscribe>derby-dev-unsubscribe@db.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/db-derby-dev/</archive>
-      <otherArchives>
-        <otherArchive>http://www.nabble.com/Apache-Derby-Developers-f91.html</otherArchive>
-      </otherArchives>
-    </mailingList>
-    <mailingList>
-      <name>Derby Commit List</name>
-      <subscribe>derby-commits-subscribe@db.apache.org</subscribe>
-      <unsubscribe>derby-commits-unsubscribe@db.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/db-derby-commits/</archive>
-    </mailingList>
-  </mailingLists>
-  <issueManagement>
-    <system>JIRA</system>
-    <url>https://issues.apache.org/jira/browse/DERBY</url>
-  </issueManagement>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/db/derby/code/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/derby/code/trunk</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/db/derby/code/trunk/?root=Apache-SVN</url>
-  </scm>
-
-  <modules>
-    <module>engine</module>
-    <module>net</module>
-    <module>client</module>
-    <module>tools</module>
-    <module>war</module>
-    <module>derbyLocale_cs</module>
-    <module>derbyLocale_de_DE</module>
-    <module>derbyLocale_es</module>
-    <module>derbyLocale_fr</module>
-    <module>derbyLocale_hu</module>
-    <module>derbyLocale_it</module>
-    <module>derbyLocale_ja_JP</module>
-    <module>derbyLocale_ko_KR</module>
-    <module>derbyLocale_pl</module>
-    <module>derbyLocale_pt_BR</module>
-    <module>derbyLocale_ru</module>
-    <module>derbyLocale_zh_CN</module>
-    <module>derbyLocale_zh_TW</module>
-  </modules>
-
-  <!-- Specify where we want to deploy the artifacts. -->
-  <distributionManagement>
-    <repository>
-      <id>apache.releases</id>
-      <name>Apache Software Foundation Maven2 repository</name>
-      <!-- Specify scpexe to deploy using external commands (i.e. ssh/scp). -->
-      <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-      <layout>default</layout>
-      <uniqueVersion>false</uniqueVersion>
-    </repository>
-  </distributionManagement>
-
-  <build>
-    <plugins>
-      <!-- Generate signatures for the artifacts using GnuPG.
-           This requires that you have GnuPG installed and in the search path.
-        -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-gpg-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>sign-artifacts</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>sign</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Workaround until Maven has been updated with version 2.3 or
-           greater of maven-install-plugin. A bug in version 2.2 caused
-           checksums for artifacts with POM packaging to be generated.
-           See http://jira.codehaus.org/browse/MINSTALL-56
-       -->
-      <plugin>
-        <artifactId>maven-install-plugin</artifactId>
-        <version>2.3</version>
-      </plugin>
-
-  </plugins>
-  </build>
-
-  <!-- Properties used throughout the build / install. -->
-  <properties>
-    <!-- RELEASE_DATA: How to specify your signing key passphrase.
-         If you're not using an agent, you will have to enter the signing key
-         phassphrase a lot of times. Since this file will be deployed, DO NOT
-         specify the passphrase here. If you don't have an agent running,
-         use a command-line property when invoking maven
-         (-Dgpg.passpharse=PASSPHRASE) or configure GnuPG to obtain your
-         passphrase another way.
-    <gpg.passphrase>DO_NOT_SPECIFY_YOUR_PASSPHRASE_HERE</gpg.passphrase>
-      -->
-    <gpg.useagent>true</gpg.useagent>
-    <!-- Have Maven generate checksums (MD5 and SHA1) for the artifacts. -->
-    <createChecksum>true</createChecksum>
-    <!-- All plugins should use this value.
-         See http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding
-      -->
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <!-- Specifies whether to package the sane (debug) or insane jar.
-         Valid values: sane|insane
-      -->
-    <sanity>insane</sanity>
-  </properties>
-
-</project>
diff --git a/derby-project-10.6.2.1.pom b/derby-project-10.6.2.1.pom
new file mode 100644
index 0000000..6dcc29d
--- /dev/null
+++ b/derby-project-10.6.2.1.pom
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <artifactId>derby-project</artifactId>
+  <version>10.6.2.1</version>
+  <packaging>pom</packaging>
+  <name>Apache Derby Project</name>
+  <description>Apache Derby is an open source relational database implemented entirely in Java.</description>
+  <url>http://db.apache.org/derby/</url>
+  <inceptionYear>2004</inceptionYear>
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://db.apache.org/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache 2</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+      <comments>A business-friendly OSS license</comments>
+    </license>
+  </licenses>
+  <mailingLists>
+    <mailingList>
+      <name>Derby User List</name>
+      <subscribe>derby-user-subscribe@db.apache.org</subscribe>
+      <unsubscribe>derby-user-unsubscribe@db.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/db-derby-user/</archive>
+      <otherArchives>
+        <otherArchive>http://www.nabble.com/Apache-Derby-Users-f93.html</otherArchive>
+      </otherArchives>
+    </mailingList>
+    <mailingList>
+      <name>Derby Developer List</name>
+      <subscribe>derby-dev-subscribe@db.apache.org</subscribe>
+      <unsubscribe>derby-dev-unsubscribe@db.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/db-derby-dev/</archive>
+      <otherArchives>
+        <otherArchive>http://www.nabble.com/Apache-Derby-Developers-f91.html</otherArchive>
+      </otherArchives>
+    </mailingList>
+    <mailingList>
+      <name>Derby Commit List</name>
+      <subscribe>derby-commits-subscribe@db.apache.org</subscribe>
+      <unsubscribe>derby-commits-unsubscribe@db.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/db-derby-commits/</archive>
+    </mailingList>
+  </mailingLists>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>https://issues.apache.org/jira/browse/DERBY</url>
+  </issueManagement>
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/db/derby/code/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/derby/code/trunk</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/db/derby/code/trunk/?root=Apache-SVN</url>
+  </scm>
+
+  <modules>
+    <module>engine</module>
+    <module>net</module>
+    <module>client</module>
+    <module>tools</module>
+    <module>war</module>
+    <module>derbyLocale_cs</module>
+    <module>derbyLocale_de_DE</module>
+    <module>derbyLocale_es</module>
+    <module>derbyLocale_fr</module>
+    <module>derbyLocale_hu</module>
+    <module>derbyLocale_it</module>
+    <module>derbyLocale_ja_JP</module>
+    <module>derbyLocale_ko_KR</module>
+    <module>derbyLocale_pl</module>
+    <module>derbyLocale_pt_BR</module>
+    <module>derbyLocale_ru</module>
+    <module>derbyLocale_zh_CN</module>
+    <module>derbyLocale_zh_TW</module>
+  </modules>
+
+  <!-- Specify where we want to deploy the artifacts. -->
+  <distributionManagement>
+    <repository>
+      <id>apache.releases</id>
+      <name>Apache Software Foundation Maven2 repository</name>
+      <!-- Specify scpexe to deploy using external commands (i.e. ssh/scp). -->
+      <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+      <layout>default</layout>
+      <uniqueVersion>false</uniqueVersion>
+    </repository>
+  </distributionManagement>
+
+  <build>
+    <plugins>
+      <!-- Generate signatures for the artifacts using GnuPG.
+           This requires that you have GnuPG installed and in the search path.
+        -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-gpg-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>sign-artifacts</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>sign</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Workaround until Maven has been updated with version 2.3 or
+           greater of maven-install-plugin. A bug in version 2.2 caused
+           checksums for artifacts with POM packaging to be generated.
+           See http://jira.codehaus.org/browse/MINSTALL-56
+       -->
+      <plugin>
+        <artifactId>maven-install-plugin</artifactId>
+        <version>2.3</version>
+      </plugin>
+
+  </plugins>
+  </build>
+
+  <!-- Properties used throughout the build / install. -->
+  <properties>
+    <!-- RELEASE_DATA: How to specify your signing key passphrase.
+         If you're not using an agent, you will have to enter the signing key
+         phassphrase a lot of times. Since this file will be deployed, DO NOT
+         specify the passphrase here. If you don't have an agent running,
+         use a command-line property when invoking maven
+         (-Dgpg.passpharse=PASSPHRASE) or configure GnuPG to obtain your
+         passphrase another way.
+    <gpg.passphrase>DO_NOT_SPECIFY_YOUR_PASSPHRASE_HERE</gpg.passphrase>
+      -->
+    <gpg.useagent>true</gpg.useagent>
+    <!-- Have Maven generate checksums (MD5 and SHA1) for the artifacts. -->
+    <createChecksum>true</createChecksum>
+    <!-- All plugins should use this value.
+         See http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding
+      -->
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <!-- Specifies whether to package the sane (debug) or insane jar.
+         Valid values: sane|insane
+      -->
+    <sanity>insane</sanity>
+  </properties>
+
+</project>
diff --git a/derby.spec b/derby.spec
index 39a638a..63d4d37 100644
--- a/derby.spec
+++ b/derby.spec
@@ -1,14 +1,13 @@
 Name:           derby
-Version:        10.6.1.0
-Release:        6%{?dist}
+Version:        10.6.2.1
+Release:        1%{?dist}
 Summary:        Relational database implemented entirely in Java
 
 Group:          Applications/Databases
 License:        ASL 2.0
 URL:            http://db.apache.org/derby/
-Source0:        http://www.apache.org/dist/db/%{name}/db-%{name}-%{version}/db-%{name}-%{version}-src.tar.gz
+Source0:        http://archive.apache.org/dist/db/%{name}/db-%{name}-%{version}/db-%{name}-%{version}-src.tar.gz
 Source1:        derby-script
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Source10:       http://repo1.maven.org/maven2/org/apache/%{name}/derby/%{version}/derby-%{version}.pom
 Source11:       http://repo1.maven.org/maven2/org/apache/%{name}/derby-project/%{version}/derby-project-%{version}.pom
@@ -31,13 +30,13 @@ Source27:       http://repo1.maven.org/maven2/org/apache/%{name}/derbytools/%{ve
 
 BuildRequires:  java-devel >= 1.6
 BuildRequires:  jpackage-utils
-BuildRequires:  servletapi5
+BuildRequires:  servlet25
 BuildRequires:  jakarta-oro
 BuildRequires:  javacc
 BuildRequires:  junit4
 BuildRequires:  xalan-j2
 BuildRequires:  xerces-j2
-BuildRequires:  ant-nodeps
+BuildRequires:  ant
 Requires:       java
 Requires:       jpackage-utils
 
@@ -59,7 +58,7 @@ find -name '*.jar' -delete
 
 # tools/ant/properties/extrapath.properties
 ln -sf $(build-classpath javacc) tools/java/javacc.jar
-ln -sf $(build-classpath servletapi5) \
+ln -sf $(build-classpath servlet25) \
         tools/java/geronimo-spec-servlet-2.4-rc4.jar
 ln -sf $(build-classpath xalan-j2) tools/java/xalan.jar
 ln -sf $(build-classpath oro) tools/java/jakarta-oro-2.0.8.jar
@@ -81,11 +80,10 @@ ant buildjars -Dderby.source.rpm=%{version}
 
 %install
 cd db-%{name}-%{version}-src
-rm -rf $RPM_BUILD_ROOT
 
 # Library
 install -d $RPM_BUILD_ROOT%{_javadir}/%{name}
-for i in jars/insane/*.jar
+for i in jars/sane/*.jar
 do
         B=$(basename $i |sed 's/.jar$//')
         install -m644 $i $RPM_BUILD_ROOT%{_javadir}/%{name}/$B-%{version}.jar
@@ -149,25 +147,7 @@ install -p -m644 %{SOURCE27} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.derby-derbytools
 %add_to_maven_depmap org.apache.derby derbytools %{version} JPP/derby derbytools
 
 
-%check
-#TODO
-#ant junit-all
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post
-%update_maven_depmap
-
-
-%postun
-%update_maven_depmap
-
-
 %files
-%defattr(-,root,root,-)
 %{_bindir}/*
 %{_javadir}/%{name}
 %doc db-%{name}-%{version}-src/LICENSE
@@ -180,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Nov 29 2011 Alexander Kurtakov <akurtako@redhat.com> 10.6.2.1-1
+- Update to newer upstream version.
+
 * Fri Feb 25 2011 Lubomir Rintel <lkundrak@v3.sk> - 10.6.1.0-6
 - Fix startup script (Thomas Meyer, #668828)
 
diff --git a/derbyLocale_cs-10.6.1.0.pom b/derbyLocale_cs-10.6.1.0.pom
deleted file mode 100644
index 7d9c6c5..0000000
--- a/derbyLocale_cs-10.6.1.0.pom
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <parent>
-    <groupId>org.apache.derby</groupId>
-    <artifactId>derby-project</artifactId>
-    <version>10.6.1.0</version>
-  </parent>
-  <artifactId>derbyLocale_cs</artifactId>
-  <name>Apache Derby messages: Czech</name>
-  <description>Localized (Czech) messages for Apache Derby</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.6.1.0</version>
-      <optional>false</optional>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <configuration>
-                        <tasks>
-
-            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_cs.jar"
-                  tofile="${basedir}/target/${project.build.finalName}.jar"
-                  overwrite="true"/>
-
-                        </tasks>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/derbyLocale_cs-10.6.2.1.pom b/derbyLocale_cs-10.6.2.1.pom
new file mode 100644
index 0000000..81cdc4d
--- /dev/null
+++ b/derbyLocale_cs-10.6.2.1.pom
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <parent>
+    <groupId>org.apache.derby</groupId>
+    <artifactId>derby-project</artifactId>
+    <version>10.6.2.1</version>
+  </parent>
+  <artifactId>derbyLocale_cs</artifactId>
+  <name>Apache Derby messages: Czech</name>
+  <description>Localized (Czech) messages for Apache Derby</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.6.2.1</version>
+      <optional>false</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <configuration>
+                        <tasks>
+
+            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_cs.jar"
+                  tofile="${basedir}/target/${project.build.finalName}.jar"
+                  overwrite="true"/>
+
+                        </tasks>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/derbyLocale_de_DE-10.6.1.0.pom b/derbyLocale_de_DE-10.6.1.0.pom
deleted file mode 100644
index b7ef8e3..0000000
--- a/derbyLocale_de_DE-10.6.1.0.pom
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <parent>
-    <groupId>org.apache.derby</groupId>
-    <artifactId>derby-project</artifactId>
-    <version>10.6.1.0</version>
-  </parent>
-  <artifactId>derbyLocale_de_DE</artifactId>
-  <name>Apache Derby messages: German</name>
-  <description>Localized (German) messages for Apache Derby</description>
-
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.6.1.0</version>
-      <optional>false</optional>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <configuration>
-                        <tasks>
-
-            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_de_DE.jar"
-                  tofile="${basedir}/target/${project.build.finalName}.jar"
-                  overwrite="true"/>
-
-                        </tasks>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/derbyLocale_de_DE-10.6.2.1.pom b/derbyLocale_de_DE-10.6.2.1.pom
new file mode 100644
index 0000000..7a0b453
--- /dev/null
+++ b/derbyLocale_de_DE-10.6.2.1.pom
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <parent>
+    <groupId>org.apache.derby</groupId>
+    <artifactId>derby-project</artifactId>
+    <version>10.6.2.1</version>
+  </parent>
+  <artifactId>derbyLocale_de_DE</artifactId>
+  <name>Apache Derby messages: German</name>
+  <description>Localized (German) messages for Apache Derby</description>
+
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.6.2.1</version>
+      <optional>false</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <configuration>
+                        <tasks>
+
+            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_de_DE.jar"
+                  tofile="${basedir}/target/${project.build.finalName}.jar"
+                  overwrite="true"/>
+
+                        </tasks>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/derbyLocale_es-10.6.1.0.pom b/derbyLocale_es-10.6.1.0.pom
deleted file mode 100644
index 82fc932..0000000
--- a/derbyLocale_es-10.6.1.0.pom
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <parent>
-    <groupId>org.apache.derby</groupId>
-    <artifactId>derby-project</artifactId>
-    <version>10.6.1.0</version>
-  </parent>
-  <artifactId>derbyLocale_es</artifactId>
-  <name>Apache Derby messages: Spanish</name>
-  <description>Localized (Spanish) messages for Apache Derby</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.6.1.0</version>
-      <optional>false</optional>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <configuration>
-                        <tasks>
-
-            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_es.jar"
-                  tofile="${basedir}/target/${project.build.finalName}.jar"
-                  overwrite="true"/>
-
-                        </tasks>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/derbyLocale_es-10.6.2.1.pom b/derbyLocale_es-10.6.2.1.pom
new file mode 100644
index 0000000..a2d6423
--- /dev/null
+++ b/derbyLocale_es-10.6.2.1.pom
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <parent>
+    <groupId>org.apache.derby</groupId>
+    <artifactId>derby-project</artifactId>
+    <version>10.6.2.1</version>
+  </parent>
+  <artifactId>derbyLocale_es</artifactId>
+  <name>Apache Derby messages: Spanish</name>
+  <description>Localized (Spanish) messages for Apache Derby</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.6.2.1</version>
+      <optional>false</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <configuration>
+                        <tasks>
+
+            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_es.jar"
+                  tofile="${basedir}/target/${project.build.finalName}.jar"
+                  overwrite="true"/>
+
+                        </tasks>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/derbyLocale_fr-10.6.1.0.pom b/derbyLocale_fr-10.6.1.0.pom
deleted file mode 100644
index e6b5bb7..0000000
--- a/derbyLocale_fr-10.6.1.0.pom
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <parent>
-    <groupId>org.apache.derby</groupId>
-    <artifactId>derby-project</artifactId>
-    <version>10.6.1.0</version>
-  </parent>
-  <artifactId>derbyLocale_fr</artifactId>
-  <name>Apache Derby messages: French</name>
-  <description>Localized (French) messages for Apache Derby</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.6.1.0</version>
-      <optional>false</optional>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <configuration>
-                        <tasks>
-
-            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_fr.jar"
-                  tofile="${basedir}/target/${project.build.finalName}.jar"
-                  overwrite="true"/>
-
-                        </tasks>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/derbyLocale_fr-10.6.2.1.pom b/derbyLocale_fr-10.6.2.1.pom
new file mode 100644
index 0000000..e532e9e
--- /dev/null
+++ b/derbyLocale_fr-10.6.2.1.pom
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <parent>
+    <groupId>org.apache.derby</groupId>
+    <artifactId>derby-project</artifactId>
+    <version>10.6.2.1</version>
+  </parent>
+  <artifactId>derbyLocale_fr</artifactId>
+  <name>Apache Derby messages: French</name>
+  <description>Localized (French) messages for Apache Derby</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.6.2.1</version>
+      <optional>false</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <configuration>
+                        <tasks>
+
+            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_fr.jar"
+                  tofile="${basedir}/target/${project.build.finalName}.jar"
+                  overwrite="true"/>
+
+                        </tasks>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/derbyLocale_hu-10.6.1.0.pom b/derbyLocale_hu-10.6.1.0.pom
deleted file mode 100644
index 9b9c330..0000000
--- a/derbyLocale_hu-10.6.1.0.pom
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <parent>
-    <groupId>org.apache.derby</groupId>
-    <artifactId>derby-project</artifactId>
-    <version>10.6.1.0</version>
-  </parent>
-  <artifactId>derbyLocale_hu</artifactId>
-  <name>Apache Derby messages: Hungarian</name>
-  <description>Localized (Hungarian) messages for Apache Derby</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.6.1.0</version>
-      <optional>false</optional>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <configuration>
-                        <tasks>
-
-            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_hu.jar"
-                  tofile="${basedir}/target/${project.build.finalName}.jar"
-                  overwrite="true"/>
-
-                        </tasks>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/derbyLocale_hu-10.6.2.1.pom b/derbyLocale_hu-10.6.2.1.pom
new file mode 100644
index 0000000..5b429e7
--- /dev/null
+++ b/derbyLocale_hu-10.6.2.1.pom
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <parent>
+    <groupId>org.apache.derby</groupId>
+    <artifactId>derby-project</artifactId>
+    <version>10.6.2.1</version>
+  </parent>
+  <artifactId>derbyLocale_hu</artifactId>
+  <name>Apache Derby messages: Hungarian</name>
+  <description>Localized (Hungarian) messages for Apache Derby</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.6.2.1</version>
+      <optional>false</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <configuration>
+                        <tasks>
+
+            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_hu.jar"
+                  tofile="${basedir}/target/${project.build.finalName}.jar"
+                  overwrite="true"/>
+
+                        </tasks>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/derbyLocale_it-10.6.1.0.pom b/derbyLocale_it-10.6.1.0.pom
deleted file mode 100644
index 92f085c..0000000
--- a/derbyLocale_it-10.6.1.0.pom
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <parent>
-    <groupId>org.apache.derby</groupId>
-    <artifactId>derby-project</artifactId>
-    <version>10.6.1.0</version>
-  </parent>
-  <artifactId>derbyLocale_it</artifactId>
-  <name>Apache Derby messages: Italian</name>
-  <description>Localized (Italian) messages for Apache Derby</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.6.1.0</version>
-      <optional>false</optional>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <configuration>
-                        <tasks>
-
-            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_it.jar"
-                  tofile="${basedir}/target/${project.build.finalName}.jar"
-                  overwrite="true"/>
-
-                        </tasks>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/derbyLocale_it-10.6.2.1.pom b/derbyLocale_it-10.6.2.1.pom
new file mode 100644
index 0000000..f93aa6a
--- /dev/null
+++ b/derbyLocale_it-10.6.2.1.pom
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <parent>
+    <groupId>org.apache.derby</groupId>
+    <artifactId>derby-project</artifactId>
+    <version>10.6.2.1</version>
+  </parent>
+  <artifactId>derbyLocale_it</artifactId>
+  <name>Apache Derby messages: Italian</name>
+  <description>Localized (Italian) messages for Apache Derby</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.6.2.1</version>
+      <optional>false</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <configuration>
+                        <tasks>
+
+            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_it.jar"
+                  tofile="${basedir}/target/${project.build.finalName}.jar"
+                  overwrite="true"/>
+
+                        </tasks>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/derbyLocale_ja_JP-10.6.1.0.pom b/derbyLocale_ja_JP-10.6.1.0.pom
deleted file mode 100644
index 316f75e..0000000
--- a/derbyLocale_ja_JP-10.6.1.0.pom
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <parent>
-    <groupId>org.apache.derby</groupId>
-    <artifactId>derby-project</artifactId>
-    <version>10.6.1.0</version>
-  </parent>
-  <artifactId>derbyLocale_ja_JP</artifactId>
-  <name>Apache Derby messages: Japanese</name>
-  <description>Localized (Japanese) messages for Apache Derby</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.6.1.0</version>
-      <optional>false</optional>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <configuration>
-                        <tasks>
-
-            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_ja_JP.jar"
-                  tofile="${basedir}/target/${project.build.finalName}.jar"
-                  overwrite="true"/>
-
-                        </tasks>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/derbyLocale_ja_JP-10.6.2.1.pom b/derbyLocale_ja_JP-10.6.2.1.pom
new file mode 100644
index 0000000..7330312
--- /dev/null
+++ b/derbyLocale_ja_JP-10.6.2.1.pom
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <parent>
+    <groupId>org.apache.derby</groupId>
+    <artifactId>derby-project</artifactId>
+    <version>10.6.2.1</version>
+  </parent>
+  <artifactId>derbyLocale_ja_JP</artifactId>
+  <name>Apache Derby messages: Japanese</name>
+  <description>Localized (Japanese) messages for Apache Derby</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.6.2.1</version>
+      <optional>false</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <configuration>
+                        <tasks>
+
+            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_ja_JP.jar"
+                  tofile="${basedir}/target/${project.build.finalName}.jar"
+                  overwrite="true"/>
+
+                        </tasks>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/derbyLocale_ko_KR-10.6.1.0.pom b/derbyLocale_ko_KR-10.6.1.0.pom
deleted file mode 100644
index 0a5bdf6..0000000
--- a/derbyLocale_ko_KR-10.6.1.0.pom
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <parent>
-    <groupId>org.apache.derby</groupId>
-    <artifactId>derby-project</artifactId>
-    <version>10.6.1.0</version>
-  </parent>
-  <artifactId>derbyLocale_ko_KR</artifactId>
-  <name>Apache Derby messages: Korean</name>
-  <description>Localized (Korean) messages for Apache Derby</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.6.1.0</version>
-      <optional>false</optional>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <configuration>
-                        <tasks>
-
-            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_ko_KR.jar"
-                  tofile="${basedir}/target/${project.build.finalName}.jar"
-                  overwrite="true"/>
-
-                        </tasks>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/derbyLocale_ko_KR-10.6.2.1.pom b/derbyLocale_ko_KR-10.6.2.1.pom
new file mode 100644
index 0000000..74d8c45
--- /dev/null
+++ b/derbyLocale_ko_KR-10.6.2.1.pom
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <parent>
+    <groupId>org.apache.derby</groupId>
+    <artifactId>derby-project</artifactId>
+    <version>10.6.2.1</version>
+  </parent>
+  <artifactId>derbyLocale_ko_KR</artifactId>
+  <name>Apache Derby messages: Korean</name>
+  <description>Localized (Korean) messages for Apache Derby</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.6.2.1</version>
+      <optional>false</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <configuration>
+                        <tasks>
+
+            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_ko_KR.jar"
+                  tofile="${basedir}/target/${project.build.finalName}.jar"
+                  overwrite="true"/>
+
+                        </tasks>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/derbyLocale_pl-10.6.1.0.pom b/derbyLocale_pl-10.6.1.0.pom
deleted file mode 100644
index 37adca2..0000000
--- a/derbyLocale_pl-10.6.1.0.pom
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <parent>
-    <groupId>org.apache.derby</groupId>
-    <artifactId>derby-project</artifactId>
-    <version>10.6.1.0</version>
-  </parent>
-  <artifactId>derbyLocale_pl</artifactId>
-  <name>Apache Derby messages: Polish</name>
-  <description>Localized (Polish) messages for Apache Derby</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.6.1.0</version>
-      <optional>false</optional>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <configuration>
-                        <tasks>
-
-            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_pl.jar"
-                  tofile="${basedir}/target/${project.build.finalName}.jar"
-                  overwrite="true"/>
-
-                        </tasks>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/derbyLocale_pl-10.6.2.1.pom b/derbyLocale_pl-10.6.2.1.pom
new file mode 100644
index 0000000..5e48f06
--- /dev/null
+++ b/derbyLocale_pl-10.6.2.1.pom
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <parent>
+    <groupId>org.apache.derby</groupId>
+    <artifactId>derby-project</artifactId>
+    <version>10.6.2.1</version>
+  </parent>
+  <artifactId>derbyLocale_pl</artifactId>
+  <name>Apache Derby messages: Polish</name>
+  <description>Localized (Polish) messages for Apache Derby</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.6.2.1</version>
+      <optional>false</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <configuration>
+                        <tasks>
+
+            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_pl.jar"
+                  tofile="${basedir}/target/${project.build.finalName}.jar"
+                  overwrite="true"/>
+
+                        </tasks>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/derbyLocale_pt_BR-10.6.1.0.pom b/derbyLocale_pt_BR-10.6.1.0.pom
deleted file mode 100644
index 6b1bdfe..0000000
--- a/derbyLocale_pt_BR-10.6.1.0.pom
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <parent>
-    <groupId>org.apache.derby</groupId>
-    <artifactId>derby-project</artifactId>
-    <version>10.6.1.0</version>
-  </parent>
-  <artifactId>derbyLocale_pt_BR</artifactId>
-  <name>Apache Derby messages: Portuguese (Brazilian)</name>
-  <description>Localized (Portuguese) messages for Apache Derby</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.6.1.0</version>
-      <optional>false</optional>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <configuration>
-                        <tasks>
-
-            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_pt_BR.jar"
-                  tofile="${basedir}/target/${project.build.finalName}.jar"
-                  overwrite="true"/>
-
-                        </tasks>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/derbyLocale_pt_BR-10.6.2.1.pom b/derbyLocale_pt_BR-10.6.2.1.pom
new file mode 100644
index 0000000..73cd52f
--- /dev/null
+++ b/derbyLocale_pt_BR-10.6.2.1.pom
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <parent>
+    <groupId>org.apache.derby</groupId>
+    <artifactId>derby-project</artifactId>
+    <version>10.6.2.1</version>
+  </parent>
+  <artifactId>derbyLocale_pt_BR</artifactId>
+  <name>Apache Derby messages: Portuguese (Brazilian)</name>
+  <description>Localized (Portuguese) messages for Apache Derby</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.6.2.1</version>
+      <optional>false</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <configuration>
+                        <tasks>
+
+            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_pt_BR.jar"
+                  tofile="${basedir}/target/${project.build.finalName}.jar"
+                  overwrite="true"/>
+
+                        </tasks>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/derbyLocale_ru-10.6.1.0.pom b/derbyLocale_ru-10.6.1.0.pom
deleted file mode 100644
index 9844fa2..0000000
--- a/derbyLocale_ru-10.6.1.0.pom
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <parent>
-    <groupId>org.apache.derby</groupId>
-    <artifactId>derby-project</artifactId>
-    <version>10.6.1.0</version>
-  </parent>
-  <artifactId>derbyLocale_ru</artifactId>
-  <name>Apache Derby messages: Russian</name>
-  <description>Localized (Russian) messages for Apache Derby</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.6.1.0</version>
-      <optional>false</optional>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <configuration>
-                        <tasks>
-
-            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_ru.jar"
-                  tofile="${basedir}/target/${project.build.finalName}.jar"
-                  overwrite="true"/>
-
-                        </tasks>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/derbyLocale_ru-10.6.2.1.pom b/derbyLocale_ru-10.6.2.1.pom
new file mode 100644
index 0000000..f083c5a
--- /dev/null
+++ b/derbyLocale_ru-10.6.2.1.pom
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <parent>
+    <groupId>org.apache.derby</groupId>
+    <artifactId>derby-project</artifactId>
+    <version>10.6.2.1</version>
+  </parent>
+  <artifactId>derbyLocale_ru</artifactId>
+  <name>Apache Derby messages: Russian</name>
+  <description>Localized (Russian) messages for Apache Derby</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.6.2.1</version>
+      <optional>false</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <configuration>
+                        <tasks>
+
+            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_ru.jar"
+                  tofile="${basedir}/target/${project.build.finalName}.jar"
+                  overwrite="true"/>
+
+                        </tasks>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/derbyLocale_zh_CN-10.6.1.0.pom b/derbyLocale_zh_CN-10.6.1.0.pom
deleted file mode 100644
index 58d958d..0000000
--- a/derbyLocale_zh_CN-10.6.1.0.pom
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <parent>
-    <groupId>org.apache.derby</groupId>
-    <artifactId>derby-project</artifactId>
-    <version>10.6.1.0</version>
-  </parent>
-  <artifactId>derbyLocale_zh_CN</artifactId>
-  <name>Apache Derby messages: Chinese (Simplified)</name>
-  <description>Localized (Chinese) messages for Apache Derby</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.6.1.0</version>
-      <optional>false</optional>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <configuration>
-                        <tasks>
-
-            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_zh_CN.jar"
-                  tofile="${basedir}/target/${project.build.finalName}.jar"
-                  overwrite="true"/>
-
-                        </tasks>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/derbyLocale_zh_CN-10.6.2.1.pom b/derbyLocale_zh_CN-10.6.2.1.pom
new file mode 100644
index 0000000..fd95053
--- /dev/null
+++ b/derbyLocale_zh_CN-10.6.2.1.pom
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <parent>
+    <groupId>org.apache.derby</groupId>
+    <artifactId>derby-project</artifactId>
+    <version>10.6.2.1</version>
+  </parent>
+  <artifactId>derbyLocale_zh_CN</artifactId>
+  <name>Apache Derby messages: Chinese (Simplified)</name>
+  <description>Localized (Chinese) messages for Apache Derby</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.6.2.1</version>
+      <optional>false</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <configuration>
+                        <tasks>
+
+            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_zh_CN.jar"
+                  tofile="${basedir}/target/${project.build.finalName}.jar"
+                  overwrite="true"/>
+
+                        </tasks>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/derbyLocale_zh_TW-10.6.1.0.pom b/derbyLocale_zh_TW-10.6.1.0.pom
deleted file mode 100644
index 0b966da..0000000
--- a/derbyLocale_zh_TW-10.6.1.0.pom
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <parent>
-    <groupId>org.apache.derby</groupId>
-    <artifactId>derby-project</artifactId>
-    <version>10.6.1.0</version>
-  </parent>
-  <artifactId>derbyLocale_zh_TW</artifactId>
-  <name>Apache Derby messages: Chinese (Traditional)</name>
-  <description>Localized (Chinese) messages for Apache Derby</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.6.1.0</version>
-      <optional>false</optional>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <configuration>
-                        <tasks>
-
-            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_zh_TW.jar"
-                  tofile="${basedir}/target/${project.build.finalName}.jar"
-                  overwrite="true"/>
-
-                        </tasks>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/derbyLocale_zh_TW-10.6.2.1.pom b/derbyLocale_zh_TW-10.6.2.1.pom
new file mode 100644
index 0000000..3ffdbf4
--- /dev/null
+++ b/derbyLocale_zh_TW-10.6.2.1.pom
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <parent>
+    <groupId>org.apache.derby</groupId>
+    <artifactId>derby-project</artifactId>
+    <version>10.6.2.1</version>
+  </parent>
+  <artifactId>derbyLocale_zh_TW</artifactId>
+  <name>Apache Derby messages: Chinese (Traditional)</name>
+  <description>Localized (Chinese) messages for Apache Derby</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.6.2.1</version>
+      <optional>false</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <configuration>
+                        <tasks>
+
+            <copy file="${basedir}/../../jars/${sanity}/derbyLocale_zh_TW.jar"
+                  tofile="${basedir}/target/${project.build.finalName}.jar"
+                  overwrite="true"/>
+
+                        </tasks>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/derbyclient-10.6.1.0.pom b/derbyclient-10.6.1.0.pom
deleted file mode 100644
index 0e56817..0000000
--- a/derbyclient-10.6.1.0.pom
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <parent>
-    <groupId>org.apache.derby</groupId>
-    <artifactId>derby-project</artifactId>
-    <version>10.6.1.0</version>
-  </parent>
-  <artifactId>derbyclient</artifactId>
-  <name>Apache Derby Client JDBC Driver</name>
-  <description>The Derby client JDBC driver, used to connect to a Derby server over a network connection.</description>
-
-  <build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <configuration>
-                        <tasks>
-
-                <copy file="${basedir}/../../jars/${sanity}/derbyclient.jar"
-                      tofile="${basedir}/target/${project.build.finalName}.jar"
-                      overwrite="true"/>
-
-                        </tasks>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/derbyclient-10.6.2.1.pom b/derbyclient-10.6.2.1.pom
new file mode 100644
index 0000000..87a6840
--- /dev/null
+++ b/derbyclient-10.6.2.1.pom
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <parent>
+    <groupId>org.apache.derby</groupId>
+    <artifactId>derby-project</artifactId>
+    <version>10.6.2.1</version>
+  </parent>
+  <artifactId>derbyclient</artifactId>
+  <name>Apache Derby Client JDBC Driver</name>
+  <description>The Derby client JDBC driver, used to connect to a Derby server over a network connection.</description>
+
+  <build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <configuration>
+                        <tasks>
+
+                <copy file="${basedir}/../../jars/${sanity}/derbyclient.jar"
+                      tofile="${basedir}/target/${project.build.finalName}.jar"
+                      overwrite="true"/>
+
+                        </tasks>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/derbynet-10.6.1.0.pom b/derbynet-10.6.1.0.pom
deleted file mode 100644
index 5fb838e..0000000
--- a/derbynet-10.6.1.0.pom
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <parent>
-    <groupId>org.apache.derby</groupId>
-    <artifactId>derby-project</artifactId>
-    <version>10.6.1.0</version>
-  </parent>
-  <artifactId>derbynet</artifactId>
-  <name>Apache Derby Network Server</name>
-  <description>Contains the Apache Derby network server, which allows remote clients to connect to Derby databases over a network connection using the Derby client JDBC driver.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.6.1.0</version>
-      <optional>false</optional>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <configuration>
-                        <tasks>
-
-                <copy file="${basedir}/../../jars/${sanity}/derbynet.jar"
-                      tofile="${basedir}/target/${project.build.finalName}.jar"
-                      overwrite="true"/>
-
-                        </tasks>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/derbynet-10.6.2.1.pom b/derbynet-10.6.2.1.pom
new file mode 100644
index 0000000..57755d0
--- /dev/null
+++ b/derbynet-10.6.2.1.pom
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <parent>
+    <groupId>org.apache.derby</groupId>
+    <artifactId>derby-project</artifactId>
+    <version>10.6.2.1</version>
+  </parent>
+  <artifactId>derbynet</artifactId>
+  <name>Apache Derby Network Server</name>
+  <description>Contains the Apache Derby network server, which allows remote clients to connect to Derby databases over a network connection using the Derby client JDBC driver.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.6.2.1</version>
+      <optional>false</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <configuration>
+                        <tasks>
+
+                <copy file="${basedir}/../../jars/${sanity}/derbynet.jar"
+                      tofile="${basedir}/target/${project.build.finalName}.jar"
+                      overwrite="true"/>
+
+                        </tasks>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/derbytools-10.6.1.0.pom b/derbytools-10.6.1.0.pom
deleted file mode 100644
index 5bec4a1..0000000
--- a/derbytools-10.6.1.0.pom
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.derby</groupId>
-  <parent>
-    <groupId>org.apache.derby</groupId>
-    <artifactId>derby-project</artifactId>
-    <version>10.6.1.0</version>
-  </parent>
-  <artifactId>derbytools</artifactId>
-  <name>Apache Derby Tools</name>
-  <description>Contains Apache Derby tools like ij, sysinfo, and dblook.</description>
-
-  <build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <configuration>
-                        <tasks>
-
-                <copy file="${basedir}/../../jars/${sanity}/derbytools.jar"
-                      tofile="${basedir}/target/${project.build.finalName}.jar"
-                      overwrite="true"/>
-
-                        </tasks>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/derbytools-10.6.2.1.pom b/derbytools-10.6.2.1.pom
new file mode 100644
index 0000000..b03043d
--- /dev/null
+++ b/derbytools-10.6.2.1.pom
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.derby</groupId>
+  <parent>
+    <groupId>org.apache.derby</groupId>
+    <artifactId>derby-project</artifactId>
+    <version>10.6.2.1</version>
+  </parent>
+  <artifactId>derbytools</artifactId>
+  <name>Apache Derby Tools</name>
+  <description>Contains Apache Derby tools like ij, sysinfo, and dblook.</description>
+
+  <build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <configuration>
+                        <tasks>
+
+                <copy file="${basedir}/../../jars/${sanity}/derbytools.jar"
+                      tofile="${basedir}/target/${project.build.finalName}.jar"
+                      overwrite="true"/>
+
+                        </tasks>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/sources b/sources
index aa2976e..8fa9a8c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 8efaafa8f7704c8990908cd323034d29  db-derby-10.6.1.0-src.tar.gz
+fdb187f65d48596c4509d68da55aa4f8  db-derby-10.6.2.1-src.tar.gz