[maven-scm/f18] Remove unneeded mockito build dependency
by Stanislav Ochotnicky
commit 6a5427c19541b1a1c9b6b5c649582c8096c1fbae
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Aug 21 18:51:59 2012 +0200
Remove unneeded mockito build dependency
- Use new pom_ macros instead of patches
...emove-cvs-support-for-removing-of-netbean.patch | 59 --------------------
010-set-project-sourceenoding.patch | 10 ---
011-remove-providers-integrity-fixed.patch | 28 ---------
maven-scm.spec | 34 ++++++-----
4 files changed, 19 insertions(+), 112 deletions(-)
---
diff --git a/maven-scm.spec b/maven-scm.spec
index 4406010..560f048 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -30,7 +30,7 @@
Name: maven-scm
Version: 1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Common API for doing SCM operations
License: ASL 2.0
Group: Development/Libraries
@@ -43,12 +43,6 @@ Source1: %{name}-jpp-depmap.xml
Patch0: 005_maven-scm_fix-vss-provider-pom.patch
# replace plexus-maven-plugin for plexus-component-metadata
Patch1: 007_maven-scm_migration-to-component-metadata.patch
-# remove cvsjava from providers-cvs
-Patch2: 008-Partially-remove-cvs-support-for-removing-of-netbean.patch
-# remove providers-integrity from build (required mks-api packaged for it)
-Patch3: 011-remove-providers-integrity-fixed.patch
-# set source encoding (tests fail)
-Patch4: 010-set-project-sourceenoding.patch
# plexus-maven-plugin -> plexus-component-metadata
Patch5: 012-plexus-component-metadata.patch
@@ -78,7 +72,6 @@ BuildRequires: bzr
BuildRequires: subversion
BuildRequires: plexus-containers-component-metadata
BuildRequires: plexus-classworlds
-BuildRequires: mockito
Requires: junit >= 3.8.2
Requires: apache-commons-collections >= 3.1
@@ -112,18 +105,25 @@ Javadoc for %{name}.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%patch5 -p1
-# We dont have mockito, needed for accurev tests, disable for now
-find maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev -type f -name "*Test*" -exec rm -f '{}' \;
+%pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin
+%pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin maven-scm-plugin
+# remove providers-integrity from build (we don't have mks-api)
+%pom_remove_dep org.apache.maven.scm:maven-scm-provider-integrity maven-scm-providers/maven-scm-providers-standard
+%pom_disable_module maven-scm-provider-integrity maven-scm-providers
+
+# Partially remove cvs support for removal of netbeans-cvsclient
+# It still works with cvsexe provider
+%pom_remove_dep org.apache.maven.scm:maven-scm-provider-cvsjava maven-scm-client
+%pom_remove_dep org.apache.maven.scm:maven-scm-provider-cvsjava maven-scm-providers/maven-scm-providers-standard
+%pom_disable_module maven-scm-provider-cvsjava maven-scm-providers/maven-scm-providers-cvs
-%build
-mvn-rpmbuild \
+%build
+# we don't have all test dependencies to run full testsuite anyway
+mvn-rpmbuild -Dproject.build.sourceEncoding=ISO-8859-1 \
-Dmaven.test.skip=true \
-Dmaven.local.depmap.file=%{SOURCE1} \
install javadoc:aggregate
@@ -182,6 +182,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/*
%changelog
+* Tue Aug 21 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.7-3
+- Remove unneeded mockito build dependency
+- Use new pom_ macros instead of patches
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 10 months
[jtds] Initial import (#818943).
by gil
commit bae6a8c58c2ea94839b0fb09514614015ef82bad
Author: gil <puntogil(a)libero.it>
Date: Tue Aug 21 18:33:43 2012 +0200
Initial import (#818943).
.gitignore | 1 +
jtds-1.2.5-pom.patch | 20 +
jtds-1.2.6-build.patch | 66 ++
jtds-1.2.6-update-fsf-address.patch | 1305 +++++++++++++++++++++++++++++++++++
jtds.spec | 116 +++
sources | 1 +
6 files changed, 1509 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..c66a490 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/jtds-1.2.6-clean-src.tar.gz
diff --git a/jtds-1.2.5-pom.patch b/jtds-1.2.5-pom.patch
new file mode 100644
index 0000000..1c84a36
--- /dev/null
+++ b/jtds-1.2.5-pom.patch
@@ -0,0 +1,20 @@
+--- pom.xml 2009-12-30 16:45:52.000000000 +0100
++++ pom.xml-gil 2011-09-09 18:18:00.827307267 +0200
+@@ -41,7 +41,7 @@
+ <defaultGoal>package</defaultGoal>
+ <plugins>
+
+- <plugin>
++ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>truezip-maven-plugin</artifactId>
+ <version>1.0-beta-2</version>
+@@ -73,7 +73,7 @@
+ </configuration>
+ </execution>
+ </executions>
+- </plugin>
++ </plugin-->
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
diff --git a/jtds-1.2.6-build.patch b/jtds-1.2.6-build.patch
new file mode 100644
index 0000000..6a8261d
--- /dev/null
+++ b/jtds-1.2.6-build.patch
@@ -0,0 +1,66 @@
+--- build.xml 2012-08-15 19:32:46.000000000 +0200
++++ build.xml-gil 2012-08-21 18:05:47.085440317 +0200
+@@ -3,7 +3,8 @@
+ <project basedir="." default="compile" name="jtds">
+
+ <path id="libs">
+- <fileset dir="lib" includes="*.jar"/>
++ <pathelement location="/usr/share/java/jcifs.jar"/>
++ <pathelement location="${java.home}/jre/lib/rt.jar"/>
+ </path>
+
+ <target name="init">
+@@ -35,23 +36,23 @@
+ <copy todir="${build}/src">
+ <fileset dir="${src}/main" includes="**/*.java"/>
+ </copy>
+- <copy todir="${build}/src">
++ <!--copy todir="${build}/src">
+ <fileset dir="${src}/test" includes="**/*.java"/>
+- </copy>
++ </copy-->
+ <copy todir="${build}/classes">
+ <fileset dir="${src}/main" includes="**/*.properties"/>
+ </copy>
+ </target>
+
+ <target name="compile" depends="init,prepare">
+- <javac destdir="${build}/classes" srcdir="${build}/src" classpathref="libs" debug="${javac.debug}" optimize="${javac.optimize}" encoding="latin1"/>
++ <javac destdir="${build}/classes" srcdir="${build}/src" classpathref="libs" debug="${javac.debug}" optimize="${javac.optimize}" source="1.5" target="1.5" encoding="utf-8"/>
+ </target>
+
+ <target name="javadoc" depends="prepare">
+ <mkdir dir="${build}/doc"/>
+ <javadoc sourcepath="${build}/src" destdir="${build}/doc" packagenames="net.sourceforge.jtds.*" Author="true"
+ Doctitle="jTDS API Documentation" Use="true" Version="true" bottom="Generated on ${TODAY}"
+- Windowtitle="jTDS API" Private="true" classpathref="libs" encoding="latin1">
++ Windowtitle="jTDS API" Private="true" classpathref="libs" source="1.5" encoding="utf-8">
+ <tag name="todo" description="To do:"/>
+ <tag name="created" description="Created:"/>
+ </javadoc>
+@@ -88,7 +89,6 @@
+ <attribute name="Implementation-URL" value="http://jtds.sourceforge.net"/>
+ <attribute name="Specification-Title" value="JDBC"/>
+ <attribute name="Specification-Version" value="3.0"/>
+- <attribute name="Class-Path" value="jcifs.jar"/>
+ <attribute name="Main-Class" value="net.sourceforge.jtds.jdbc.Driver"/>
+ </manifest>
+ </jar>
+@@ -112,7 +112,7 @@
+ </copy>
+
+
+- <mkdir dir="${dist}/tmp/x86/XA"/>
++ <!--mkdir dir="${dist}/tmp/x86/XA"/>
+ <copy todir="${dist}/tmp/x86/XA">
+ <fileset dir="lib/x86/XA" includes="JtdsXA.dll"/>
+ <fileset dir="src/XA" includes="*.sql"/>
+@@ -130,7 +130,7 @@
+ <mkdir dir="${dist}/tmp/IA64/SSO"/>
+ <copy todir="${dist}/tmp/IA64/SSO">
+ <fileset dir="lib/IA64/SSO" includes="ntlmauth.dll"/>
+- </copy>
++ </copy-->
+
+ <zip basedir="${dist}/tmp" includes="**/*" zipfile="${dist}/${ant.project.name}-${version}-dist.zip"/>
+ <delete dir="${dist}/tmp"/>
diff --git a/jtds-1.2.6-update-fsf-address.patch b/jtds-1.2.6-update-fsf-address.patch
new file mode 100644
index 0000000..2307db4
--- /dev/null
+++ b/jtds-1.2.6-update-fsf-address.patch
@@ -0,0 +1,1305 @@
+diff -Nru jtds-1.2.6/LICENSE jtds-1.2.6-gil/LICENSE
+--- jtds-1.2.6/LICENSE 2012-08-21 18:17:41.254458798 +0200
++++ jtds-1.2.6-gil/LICENSE 2012-08-21 18:17:18.209117282 +0200
+@@ -2,7 +2,7 @@
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+@@ -485,7 +485,7 @@
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Also add information on how to contact you by electronic and paper mail.
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/BlobImpl.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/BlobImpl.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/BlobImpl.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/BlobImpl.java 2012-08-21 18:17:18.255116032 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/cache/ProcedureCache.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/cache/ProcedureCache.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/cache/ProcedureCache.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/cache/ProcedureCache.java 2012-08-21 18:17:18.241116412 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc.cache;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/cache/SimpleLRUCache.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/cache/SimpleLRUCache.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/cache/SimpleLRUCache.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/cache/SimpleLRUCache.java 2012-08-21 18:17:18.240116440 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc.cache;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/cache/SQLCacheKey.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/cache/SQLCacheKey.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/cache/SQLCacheKey.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/cache/SQLCacheKey.java 2012-08-21 18:17:18.240116440 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc.cache;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/cache/StatementCache.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/cache/StatementCache.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/cache/StatementCache.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/cache/StatementCache.java 2012-08-21 18:17:18.241116412 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc.cache;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/CachedResultSet.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/CachedResultSet.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/CachedResultSet.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/CachedResultSet.java 2012-08-21 18:17:18.272115570 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/CharsetInfo.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/CharsetInfo.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/CharsetInfo.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/CharsetInfo.java 2012-08-21 18:17:18.239116467 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ClobImpl.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ClobImpl.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ClobImpl.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ClobImpl.java 2012-08-21 18:17:18.270115625 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ColInfo.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ColInfo.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ColInfo.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ColInfo.java 2012-08-21 18:17:18.294114973 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ConnectionJDBC2.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ConnectionJDBC2.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ConnectionJDBC2.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ConnectionJDBC2.java 2012-08-21 18:17:18.269115652 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ConnectionJDBC3.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ConnectionJDBC3.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ConnectionJDBC3.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ConnectionJDBC3.java 2012-08-21 18:17:18.285115217 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/DateTime.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/DateTime.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/DateTime.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/DateTime.java 2012-08-21 18:17:18.245116304 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/DefaultProperties.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/DefaultProperties.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/DefaultProperties.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/DefaultProperties.java 2012-08-21 18:17:18.258115951 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/Driver.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/Driver.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/Driver.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/Driver.java 2012-08-21 18:17:18.260115896 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/JtdsCallableStatement.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/JtdsCallableStatement.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/JtdsCallableStatement.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/JtdsCallableStatement.java 2012-08-21 18:17:18.280115353 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/JtdsDatabaseMetaData.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/JtdsDatabaseMetaData.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/JtdsDatabaseMetaData.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/JtdsDatabaseMetaData.java 2012-08-21 18:17:18.252116113 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/JtdsPreparedStatement.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/JtdsPreparedStatement.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/JtdsPreparedStatement.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/JtdsPreparedStatement.java 2012-08-21 18:17:18.278115407 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/JtdsResultSet.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/JtdsResultSet.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/JtdsResultSet.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/JtdsResultSet.java 2012-08-21 18:17:18.285115217 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/JtdsResultSetMetaData.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/JtdsResultSetMetaData.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/JtdsResultSetMetaData.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/JtdsResultSetMetaData.java 2012-08-21 18:17:18.264115787 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/JtdsStatement.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/JtdsStatement.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/JtdsStatement.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/JtdsStatement.java 2012-08-21 18:17:18.276115460 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/Messages.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/Messages.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/Messages.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/Messages.java 2012-08-21 18:17:18.263115815 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/MSCursorResultSet.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/MSCursorResultSet.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/MSCursorResultSet.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/MSCursorResultSet.java 2012-08-21 18:17:18.243116357 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/MSSqlServerInfo.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/MSSqlServerInfo.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/MSSqlServerInfo.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/MSSqlServerInfo.java 2012-08-21 18:17:18.286115190 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/NtlmAuth.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/NtlmAuth.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/NtlmAuth.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/NtlmAuth.java 2012-08-21 18:17:18.259115924 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ParameterMetaDataImpl.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ParameterMetaDataImpl.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ParameterMetaDataImpl.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ParameterMetaDataImpl.java 2012-08-21 18:17:18.293115000 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ParamInfo.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ParamInfo.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ParamInfo.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ParamInfo.java 2012-08-21 18:17:18.273115543 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ProcEntry.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ProcEntry.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ProcEntry.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ProcEntry.java 2012-08-21 18:17:18.294114973 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ProtocolException.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ProtocolException.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ProtocolException.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ProtocolException.java 2012-08-21 18:17:18.259115924 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/RequestStream.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/RequestStream.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/RequestStream.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/RequestStream.java 2012-08-21 18:17:18.264115787 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ResponseStream.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ResponseStream.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/ResponseStream.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/ResponseStream.java 2012-08-21 18:17:18.226116820 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/SavepointImpl.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/SavepointImpl.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/SavepointImpl.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/SavepointImpl.java 2012-08-21 18:17:18.244116331 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/Semaphore.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/Semaphore.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/Semaphore.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/Semaphore.java 2012-08-21 18:17:18.262115842 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/SharedLocalNamedPipe.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/SharedLocalNamedPipe.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/SharedLocalNamedPipe.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/SharedLocalNamedPipe.java 2012-08-21 18:17:18.259115924 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/SharedNamedPipe.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/SharedNamedPipe.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/SharedNamedPipe.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/SharedNamedPipe.java 2012-08-21 18:17:18.276115460 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/SharedSocket.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/SharedSocket.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/SharedSocket.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/SharedSocket.java 2012-08-21 18:17:18.254116058 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/SQLDiagnostic.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/SQLDiagnostic.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/SQLDiagnostic.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/SQLDiagnostic.java 2012-08-21 18:17:18.281115326 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/SQLParser.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/SQLParser.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/SQLParser.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/SQLParser.java 2012-08-21 18:17:18.257115978 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/Support.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/Support.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/Support.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/Support.java 2012-08-21 18:17:18.239116467 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/TdsCore.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/TdsCore.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/TdsCore.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/TdsCore.java 2012-08-21 18:17:18.293115000 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/TdsData.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/TdsData.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/TdsData.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/TdsData.java 2012-08-21 18:17:18.236116549 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/TypeInfo.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/TypeInfo.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/TypeInfo.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/TypeInfo.java 2012-08-21 18:17:18.222116929 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/UniqueIdentifier.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/UniqueIdentifier.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/UniqueIdentifier.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/UniqueIdentifier.java 2012-08-21 18:17:18.244116331 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/XASupport.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/XASupport.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbc/XASupport.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbc/XASupport.java 2012-08-21 18:17:18.262115842 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/JtdsDataSource.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/JtdsDataSource.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/JtdsDataSource.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/JtdsDataSource.java 2012-08-21 18:17:18.310114537 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbcx;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/JtdsObjectFactory.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/JtdsObjectFactory.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/JtdsObjectFactory.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/JtdsObjectFactory.java 2012-08-21 18:17:18.311114509 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbcx;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/JtdsXAConnection.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/JtdsXAConnection.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/JtdsXAConnection.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/JtdsXAConnection.java 2012-08-21 18:17:18.311114509 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbcx;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/JtdsXAResource.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/JtdsXAResource.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/JtdsXAResource.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/JtdsXAResource.java 2012-08-21 18:17:18.311114509 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbcx;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/JtdsXid.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/JtdsXid.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/JtdsXid.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/JtdsXid.java 2012-08-21 18:17:18.309114565 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbcx;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/PooledConnection.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/PooledConnection.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/PooledConnection.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/PooledConnection.java 2012-08-21 18:17:18.312114482 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbcx;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/proxy/CallableStatementProxy.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/proxy/CallableStatementProxy.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/proxy/CallableStatementProxy.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/proxy/CallableStatementProxy.java 2012-08-21 18:17:18.305114674 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbcx.proxy;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/proxy/ConnectionProxy.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/proxy/ConnectionProxy.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/proxy/ConnectionProxy.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/proxy/ConnectionProxy.java 2012-08-21 18:17:18.307114619 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbcx.proxy;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/proxy/PreparedStatementProxy.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/proxy/PreparedStatementProxy.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/proxy/PreparedStatementProxy.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/proxy/PreparedStatementProxy.java 2012-08-21 18:17:18.308114592 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbcx.proxy;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/proxy/StatementProxy.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/proxy/StatementProxy.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/jdbcx/proxy/StatementProxy.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/jdbcx/proxy/StatementProxy.java 2012-08-21 18:17:18.302114755 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbcx.proxy;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/ssl/Ssl.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/ssl/Ssl.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/ssl/Ssl.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/ssl/Ssl.java 2012-08-21 18:17:18.313114456 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.ssl;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/ssl/TdsTlsSocket.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/ssl/TdsTlsSocket.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/ssl/TdsTlsSocket.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/ssl/TdsTlsSocket.java 2012-08-21 18:17:18.312114482 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.ssl;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/util/BlobBuffer.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/util/BlobBuffer.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/util/BlobBuffer.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/util/BlobBuffer.java 2012-08-21 18:17:18.299114835 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.util;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/util/DESEngine.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/util/DESEngine.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/util/DESEngine.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/util/DESEngine.java 2012-08-21 18:17:18.295114945 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+
+ package net.sourceforge.jtds.util;
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/util/Logger.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/util/Logger.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/util/Logger.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/util/Logger.java 2012-08-21 18:17:18.300114808 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.util;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/util/SSPIJNIClient.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/util/SSPIJNIClient.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/util/SSPIJNIClient.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/util/SSPIJNIClient.java 2012-08-21 18:17:18.294114973 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.util;
+
+diff -Nru jtds-1.2.6/src/main/net/sourceforge/jtds/util/TimerThread.java jtds-1.2.6-gil/src/main/net/sourceforge/jtds/util/TimerThread.java
+--- jtds-1.2.6/src/main/net/sourceforge/jtds/util/TimerThread.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/main/net/sourceforge/jtds/util/TimerThread.java 2012-08-21 18:17:18.300114808 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.util;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/AsTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/AsTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/AsTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/AsTest.java 2012-08-21 18:17:18.334113885 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/BatchTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/BatchTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/BatchTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/BatchTest.java 2012-08-21 18:17:18.361113152 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/CallableStatementJDBC3Test.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/CallableStatementJDBC3Test.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/CallableStatementJDBC3Test.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/CallableStatementJDBC3Test.java 2012-08-21 18:17:18.344113614 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/CallableStatementTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/CallableStatementTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/CallableStatementTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/CallableStatementTest.java 2012-08-21 18:17:18.347113532 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/ClientSideCursorTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/ClientSideCursorTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/ClientSideCursorTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/ClientSideCursorTest.java 2012-08-21 18:17:18.343113641 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/ConnectionJDBC2UnitTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/ConnectionJDBC2UnitTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/ConnectionJDBC2UnitTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/ConnectionJDBC2UnitTest.java 2012-08-21 18:17:18.358113233 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/ConnectionJDBC3Test.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/ConnectionJDBC3Test.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/ConnectionJDBC3Test.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/ConnectionJDBC3Test.java 2012-08-21 18:17:18.326114102 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/CSUnitTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/CSUnitTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/CSUnitTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/CSUnitTest.java 2012-08-21 18:17:18.325114128 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+
+ package net.sourceforge.jtds.jdbc;
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/DatabaseMetaDataJDBC3Test.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/DatabaseMetaDataJDBC3Test.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/DatabaseMetaDataJDBC3Test.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/DatabaseMetaDataJDBC3Test.java 2012-08-21 18:17:18.347113532 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/DatabaseMetaDataTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/DatabaseMetaDataTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/DatabaseMetaDataTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/DatabaseMetaDataTest.java 2012-08-21 18:17:18.360113179 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/DatabaseMetaDataTypeInfoTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/DatabaseMetaDataTypeInfoTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/DatabaseMetaDataTypeInfoTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/DatabaseMetaDataTypeInfoTest.java 2012-08-21 18:17:18.347113532 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/DatabaseTestCase.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/DatabaseTestCase.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/DatabaseTestCase.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/DatabaseTestCase.java 2012-08-21 18:17:18.348113505 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+
+ package net.sourceforge.jtds.jdbc;
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/DefaultPropertiesTester.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/DefaultPropertiesTester.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/DefaultPropertiesTester.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/DefaultPropertiesTester.java 2012-08-21 18:17:18.343113641 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/DefaultPropertiesTestLibrary.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/DefaultPropertiesTestLibrary.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/DefaultPropertiesTestLibrary.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/DefaultPropertiesTestLibrary.java 2012-08-21 18:17:18.352113395 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/DefaultPropertiesUnitTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/DefaultPropertiesUnitTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/DefaultPropertiesUnitTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/DefaultPropertiesUnitTest.java 2012-08-21 18:17:18.354113342 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/DriverUnitTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/DriverUnitTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/DriverUnitTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/DriverUnitTest.java 2012-08-21 18:17:18.362113124 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/EncodingTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/EncodingTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/EncodingTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/EncodingTest.java 2012-08-21 18:17:18.353113369 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/GenKeyTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/GenKeyTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/GenKeyTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/GenKeyTest.java 2012-08-21 18:17:18.314114429 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/JDBC3Test.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/JDBC3Test.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/JDBC3Test.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/JDBC3Test.java 2012-08-21 18:17:18.353113369 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+
+ package net.sourceforge.jtds.jdbc;
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/JtdsDataSourceUnitTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/JtdsDataSourceUnitTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/JtdsDataSourceUnitTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/JtdsDataSourceUnitTest.java 2012-08-21 18:17:18.351113422 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/JtdsObjectFactoryUnitTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/JtdsObjectFactoryUnitTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/JtdsObjectFactoryUnitTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/JtdsObjectFactoryUnitTest.java 2012-08-21 18:17:18.326114102 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/LargeLOBTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/LargeLOBTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/LargeLOBTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/LargeLOBTest.java 2012-08-21 18:17:18.333113913 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/LOBTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/LOBTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/LOBTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/LOBTest.java 2012-08-21 18:17:18.333113913 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/MessagesPropertiesUnitTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/MessagesPropertiesUnitTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/MessagesPropertiesUnitTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/MessagesPropertiesUnitTest.java 2012-08-21 18:17:18.333113913 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/MetaDataTestCase.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/MetaDataTestCase.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/MetaDataTestCase.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/MetaDataTestCase.java 2012-08-21 18:17:18.317114348 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/NamedPipeUnitTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/NamedPipeUnitTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/NamedPipeUnitTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/NamedPipeUnitTest.java 2012-08-21 18:17:18.335113858 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/NtlmAuthTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/NtlmAuthTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/NtlmAuthTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/NtlmAuthTest.java 2012-08-21 18:17:18.316114375 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+
+ package net.sourceforge.jtds.jdbc;
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/PreparedStatementTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/PreparedStatementTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/PreparedStatementTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/PreparedStatementTest.java 2012-08-21 18:17:18.350113450 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/ReadTextTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/ReadTextTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/ReadTextTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/ReadTextTest.java 2012-08-21 18:17:18.353113369 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/ResultSetTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/ResultSetTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/ResultSetTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/ResultSetTest.java 2012-08-21 18:17:18.339113749 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/SAfeTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/SAfeTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/SAfeTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/SAfeTest.java 2012-08-21 18:17:18.357113261 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+
+ package net.sourceforge.jtds.jdbc;
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/SanityTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/SanityTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/SanityTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/SanityTest.java 2012-08-21 18:17:18.340113721 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+
+ package net.sourceforge.jtds.jdbc;
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/SavepointTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/SavepointTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/SavepointTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/SavepointTest.java 2012-08-21 18:17:18.343113641 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/StatementTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/StatementTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/StatementTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/StatementTest.java 2012-08-21 18:17:18.351113422 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/SunTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/SunTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/SunTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/SunTest.java 2012-08-21 18:17:18.341113694 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/SupportUnitTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/SupportUnitTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/SupportUnitTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/SupportUnitTest.java 2012-08-21 18:17:18.339113749 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/Tds5Test.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/Tds5Test.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/Tds5Test.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/Tds5Test.java 2012-08-21 18:17:18.345113586 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+
+ package net.sourceforge.jtds.jdbc;
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/Tds8Test.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/Tds8Test.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/Tds8Test.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/Tds8Test.java 2012-08-21 18:17:18.315114402 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/TestBase.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/TestBase.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/TestBase.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/TestBase.java 2012-08-21 18:17:18.335113858 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+
+ package net.sourceforge.jtds.jdbc;
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/TimestampTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/TimestampTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/TimestampTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/TimestampTest.java 2012-08-21 18:17:18.322114211 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+
+ package net.sourceforge.jtds.jdbc;
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/TimeZoneTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/TimeZoneTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/TimeZoneTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/TimeZoneTest.java 2012-08-21 18:17:18.317114348 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/TlsTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/TlsTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/TlsTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/TlsTest.java 2012-08-21 18:17:18.350113450 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/TypeInfoTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/TypeInfoTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/TypeInfoTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/TypeInfoTest.java 2012-08-21 18:17:18.317114348 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/UnitTestBase.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/UnitTestBase.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/UnitTestBase.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/UnitTestBase.java 2012-08-21 18:17:18.340113721 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/UpdateTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/UpdateTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/UpdateTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/UpdateTest.java 2012-08-21 18:17:18.317114348 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+
+ package net.sourceforge.jtds.jdbc;
+diff -Nru jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/XaTest.java jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/XaTest.java
+--- jtds-1.2.6/src/test/net/sourceforge/jtds/jdbc/XaTest.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/test/net/sourceforge/jtds/jdbc/XaTest.java 2012-08-21 18:17:18.316114375 +0200
+@@ -13,7 +13,7 @@
+ //
+ //You should have received a copy of the GNU Lesser General Public
+ //License along with this library; if not, write to the Free Software
+-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++//Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.jdbc;
+
+diff -Nru jtds-1.2.6/src/tools/net/sourceforge/jtds/tools/TestAllPipeInstancesAreBusy.java jtds-1.2.6-gil/src/tools/net/sourceforge/jtds/tools/TestAllPipeInstancesAreBusy.java
+--- jtds-1.2.6/src/tools/net/sourceforge/jtds/tools/TestAllPipeInstancesAreBusy.java 2012-08-15 19:32:46.000000000 +0200
++++ jtds-1.2.6-gil/src/tools/net/sourceforge/jtds/tools/TestAllPipeInstancesAreBusy.java 2012-08-21 18:17:18.363113096 +0200
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ //
+ package net.sourceforge.jtds.tools;
+
diff --git a/jtds.spec b/jtds.spec
new file mode 100644
index 0000000..534c4c4
--- /dev/null
+++ b/jtds.spec
@@ -0,0 +1,116 @@
+Name: jtds
+Version: 1.2.6
+Release: 1%{?dist}
+Summary: SQL Server and Sybase JDBC driver
+Group: Development/Libraries
+License: MIT and LGPLv2+
+URL: http://jtds.sourceforge.net/
+# wget http://sourceforge.net/projects/jtds/files/jtds/1.2.6/jtds-1.2.6-src.zip
+# cleanup
+# rm -rf lib doc html *.bat
+# Files without proper copyright notices and unused
+# rm -vrf src/SSO
+# rm -vrf src/XA
+# rm -vf src/test/net/sourceforge/jtds/test/{AsTest.java,CSUnitTest.java,DatabaseTestCase.java,JDBC3Test.java,NtlmAuthTest.java,SAfeTest.java,SanityTest.java,Tds5Test.java,TestBase.java,TimestampTest.java,UpdateTest.java}
+# rm -vf src/tools/net/sourceforge/jtds/tools/{PacketLogger.java,SQLProxy.java,SqlForwarder.java}
+# find . -name '*.jar' -o -name '*.class' -o -name '*.bat' -delete
+# tar czf jtds-1.2.6-clean-src.tar.gz jtds-1.2.6
+Source0: %{name}-%{version}-clean-src.tar.gz
+# remove org.codehaus.mojo truezip-maven-plugin 1.0-beta-2
+Patch0: %{name}-1.2.5-pom.patch
+# fix libraries path
+# disable test unavailable deps
+# fix javac/javadoc source/target/encoding parameters
+# remove classpath from manifest
+Patch1: %{name}-%{version}-build.patch
+
+Patch2: %{name}-%{version}-update-fsf-address.patch
+
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+
+BuildRequires: ant
+BuildRequires: jcifs
+BuildRequires: jdbc-stdext
+
+Requires: jcifs
+
+Requires: java
+Requires: jpackage-utils
+BuildArch: noarch
+
+%description
+TDS is an open source 100% pure Java (type 4) JDBC 3.0 driver
+for Microsoft SQL Server (6.5, 7, 2000,2005, and 2008) and
+Sybase (10, 11, 12, 15). jTDS is based on FreeTDS and is currently the
+fastest production-ready JDBC driver for SQL Server and Sybase.
+jTDS is 100% JDBC 3.0 compatible, supporting forward-only and
+scrollable/updateable ResultSets, concurrent (completely
+independent) Statements and implementing all the DatabaseMetaData and
+ResultSetMetaData methods.
+
+%package javadoc
+Group: Documentation
+Summary: Javadoc for %{name}
+Requires: jpackage-utils
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q
+
+for d in CHANGELOG LICENSE README* ; do
+ iconv -f iso8859-1 -t utf-8 $d > $d.conv && mv -f $d.conv $d
+ sed -i 's/\r//' $d
+done
+
+%patch0 -p0
+%patch1 -p0
+%patch2 -p1
+
+# fix non ASCII chars
+for s in src/main/net/sourceforge/jtds/jdbc/JtdsDatabaseMetaData.java;do
+ native2ascii -encoding UTF8 ${s} ${s}
+done
+
+%build
+
+%ant dist
+
+%install
+
+mkdir -p %{buildroot}%{_javadir}
+install -m 644 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name}
+
+%files
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+%doc CHANGELOG LICENSE README*
+
+%files javadoc
+%{_javadocdir}/%{name}
+%doc LICENSE
+
+%changelog
+* Tue Aug 21 2012 gil cattaneo <puntogil(a)libero.it> 1.2.6-1
+- update to 1.2.6
+
+* Tue Jul 24 2012 gil cattaneo <puntogil(a)libero.it> 1.2.5-3
+- edit license field
+- corrected FSF address
+
+* Mon Jul 23 2012 gil cattaneo <puntogil(a)libero.it> 1.2.5-2
+- remvoved BR zip
+- repackaged SOURCE0 (removed bundled libraries and no permissible code or content)
+
+* Fri May 04 2012 gil cattaneo <puntogil(a)libero.it> 1.2.5-1
+- initial rpm
\ No newline at end of file
diff --git a/sources b/sources
index e69de29..8608043 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+334374fe53dffcbf3dbf53f5347e8946 jtds-1.2.6-clean-src.tar.gz
11 years, 10 months
[maven-invoker-plugin] Updated to v1.6
by Stanislav Ochotnicky
commit 54aeb385a7d8add0a048a807fc746381054d6358
Author: Tomas Radej <tradej(a)redhat.com>
Date: Tue Aug 21 16:31:26 2012 +0200
Updated to v1.6
.gitignore | 1 +
maven-invoker-plugin.spec | 26 +++++++++++++-------------
sources | 2 +-
3 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0cb14e5..a4bf56b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-invoker-plugin-1.5.tgz
/maven-invoker-plugin-1.5-source-release.zip
+/maven-invoker-plugin-1.6-source-release.zip
diff --git a/maven-invoker-plugin.spec b/maven-invoker-plugin.spec
index a48dafd..9b25009 100644
--- a/maven-invoker-plugin.spec
+++ b/maven-invoker-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-invoker-plugin
-Version: 1.5
-Release: 7%{?dist}
+Version: 1.6
+Release: 1%{?dist}
Summary: Maven Invoker Plugin
Group: Development/Libraries
@@ -27,6 +27,7 @@ BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-surefire-plugin
BuildRequires: maven-plugin-cobertura
BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-script-interpreter
BuildRequires: maven-shared-invoker
# Others
@@ -39,8 +40,7 @@ Requires: jpackage-utils
Requires: maven-shared-invoker
Requires: maven-shared-reporting-api
Requires: maven-shared-reporting-impl
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
+Requires: maven-script-interpreter
Provides: maven2-plugin-invoker = 1:%{version}-%{release}
Obsoletes: maven2-plugin-invoker <= 0:2.0.8
@@ -62,33 +62,30 @@ API documentation for %{name}.
%prep
%setup -q
+%pom_add_dep org.apache.maven:maven-core
+%pom_add_dep org.apache.maven:maven-compat
+
%build
mvn-rpmbuild \
-Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
+ install javadoc:aggregate
%install
# jars
install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-%add_to_maven_depmap org.apache.maven.plugins maven-invoker-plugin %{version} JPP maven-invoker-plugin
-
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%{_javadir}/*
%{_mavenpomdir}/*
@@ -98,6 +95,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Tue Aug 21 2012 Tomas Radej <tradej(a)redhat.com> - 1.6-1
+- Updated to v1.6
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.5-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index a779567..dc02e3c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5df332e1360956f46c3f42767dd78cd4 maven-invoker-plugin-1.5-source-release.zip
+268ecb9de4aa8f1ec3c5a14114793f53 maven-invoker-plugin-1.6-source-release.zip
11 years, 10 months
[jetty] Convert systemd scriplets to macros, resolves #850176
by Mikolaj Izdebski
commit 18066639a2cf1d013a0190182a6cc7d6b6551d17
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Aug 21 15:59:00 2012 +0200
Convert systemd scriplets to macros, resolves #850176
jetty.spec | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 3ff3775..7282ce5 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -44,7 +44,7 @@
Name: jetty
Version: 8.1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
@@ -847,24 +847,13 @@ getent passwd %username &>/dev/null || useradd -r -u %jtuid -g %username \
-d %homedir -M -s /sbin/nologin %username || :
%post
-if [ $1 -eq 1 ] ; then
- # Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post jetty.service
%preun
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
- /bin/systemctl --no-reload disable %{name}.service >/dev/null 2>&1 || :
- /bin/systemctl stop %{name}.service >/dev/null 2>&1 || :
-fi
+%systemd_preun jetty.service
%postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart jetty.service
# Remove the user even during upgrade, it will be added later in %%post.
# This is required to force incorrect UID to be replaced with the new one.
userdel %username &>/dev/null || :
@@ -1049,6 +1038,9 @@ groupdel %username &>/dev/null || :
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Aug 21 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.5-4
+- Convert systemd scriplets to macros, resolves #850176
+
* Tue Aug 21 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.5-3
- Don't redirect useradd and groupadd output to the bit bucket
11 years, 10 months