[pleiades] 15/21: Imported Debian patch 1.4.0-dfsg-3
Hideki Yamane
henrich at moszumanska.debian.org
Thu Jan 2 10:18:26 UTC 2014
This is an automated email from the git hooks/post-receive script.
henrich pushed a commit to branch master
in repository pleiades.
commit 910a4c9f1795cc2f8f4e24e9981ad93a25f6f38c
Author: Hideki Yamane <henrich at debian.org>
Date: Tue Jun 25 18:40:44 2013 +0900
Imported Debian patch 1.4.0-dfsg-3
---
debian/changelog | 11 ++
debian/control | 2 +-
.../bug713779_dont-specify-encoding-as-null.patch | 30 +++
debian/patches/build.xml | 2 +-
debian/patches/series | 2 +
debian/patches/use_org.apache.commons.lang3 | 209 +++++++++++++++++++++
debian/patches/use_org.apache.commons.lang3.patch | 187 ++++++++++++++++++
7 files changed, 441 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5822bc9..9e15586 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+pleiades (1.4.0-dfsg-3) unstable; urgency=medium
+
+ * debian/control
+ - set "Build-Depends-Indep: libcommons-lang3-java"
+ * debian/patches
+ - add use_org.apache.commons.lang3.patch, due to above changes
+ - update build.xml to use above libcommons-lang3-java library
+ - add bug713779_dont-specify-encoding-as-null.patch (Closes: #713779)
+
+ -- Hideki Yamane <henrich at debian.org> Tue, 25 Jun 2013 18:40:44 +0900
+
pleiades (1.4.0-dfsg-2) unstable; urgency=low
* upload to unstable
diff --git a/debian/control b/debian/control
index 4413744..0f7a1bc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
Priority: extra
Maintainer: Hideki Yamane <henrich at debian.org>
Build-Depends: debhelper (>= 9), ant, default-jdk, ant-optional, junit
-Build-Depends-Indep: libcommons-lang-java, libcommons-io-java, libjavassist-java, zip, unzip
+Build-Depends-Indep: libcommons-lang3-java, libcommons-io-java, libjavassist-java, zip, unzip
Standards-Version: 3.9.4
Homepage: http://mergedoc.sourceforge.jp/
diff --git a/debian/patches/bug713779_dont-specify-encoding-as-null.patch b/debian/patches/bug713779_dont-specify-encoding-as-null.patch
new file mode 100644
index 0000000..65e4674
--- /dev/null
+++ b/debian/patches/bug713779_dont-specify-encoding-as-null.patch
@@ -0,0 +1,30 @@
+Description: not set null as encoding to avoid build failure with commons-io (>= 2.3)
+
+ From 2.3, commons-io added new readLines
+ http://commons.apache.org/proper/commons-io/javadocs/api-release/org/apache/commons/io/FileUtils.html#readLines(java.io.File, java.nio.charset.Charset)
+
+ And also it already has another readLines
+ http://commons.apache.org/proper/commons-io/javadocs/api-release/org/apache/commons/io/FileUtils.html#readLines(java.io.File, java.lang.String)
+
+ Pleiades upstream bundled 1.4, so probably want to use later one, and it's equivalent
+ to http://commons.apache.org/proper/commons-io/javadocs/api-release/org/apache/commons/io/FileUtils.html#readLines(java.io.File)
+
+
+Author: Hideki Yamane <henrich at debian.org>
+
+---
+Bug-Debian: http://bugs.debian.org/713779
+Forwarded: no
+Last-Update: 2013-06-25
+
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/resource/ExcludeClassNameCache.java
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/resource/ExcludeClassNameCache.java
+@@ -77,7 +77,7 @@ public class ExcludeClassNameCache {
+ } else {
+
+ try {
+- set.addAll(FileUtils.readLines(cacheFile, null));
++ set.addAll(FileUtils.readLines(cacheFile));
+ log.info("load %6d エントリー %s", set.size(), cacheFile.getName());
+
+ } catch (Exception e) {
diff --git a/debian/patches/build.xml b/debian/patches/build.xml
index 42c7439..3838d60 100644
--- a/debian/patches/build.xml
+++ b/debian/patches/build.xml
@@ -50,7 +50,7 @@ Index: pleiades-1.4.0-dfsg/build.xml
- </fileset>
+ <pathelement location="/usr/share/java/javassist.jar"/>
+ <pathelement location="/usr/share/java/commons-io.jar"/>
-+ <pathelement location="/usr/share/java/commons-lang.jar"/>
++ <pathelement location="/usr/share/java/commons-lang3.jar"/>
+ <pathelement location="/usr/share/java/junit.jar"/>
</path>
diff --git a/debian/patches/series b/debian/patches/series
index c5469f7..a387529 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ disable-create-src_zip
build.xml
compile_junit.patch
not_run_integrate.patch
+use_org.apache.commons.lang3.patch
+bug713779_dont-specify-encoding-as-null.patch
diff --git a/debian/patches/use_org.apache.commons.lang3 b/debian/patches/use_org.apache.commons.lang3
new file mode 100644
index 0000000..ccc7c9e
--- /dev/null
+++ b/debian/patches/use_org.apache.commons.lang3
@@ -0,0 +1,209 @@
+Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/PleiadesOption.java
+===================================================================
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/PleiadesOption.java 2013-06-25 18:52:21.000000000 +0900
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/PleiadesOption.java 2013-06-25 18:52:21.000000000 +0900
+@@ -10,7 +10,7 @@
+ import jp.sourceforge.mergedoc.pleiades.log.Logger.Level;
+ import jp.sourceforge.mergedoc.pleiades.resource.TranslationNotFoundProperties;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+
+ /**
+ * Pleiades 起動オプションです。
+Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherEclipseTransformer.java
+===================================================================
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherEclipseTransformer.java 2013-06-25 18:52:21.000000000 +0900
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherEclipseTransformer.java 2013-06-25 18:52:21.000000000 +0900
+@@ -23,7 +23,7 @@
+ import jp.sourceforge.mergedoc.pleiades.resource.Files;
+ import jp.sourceforge.mergedoc.pleiades.resource.PropertySet;
+
+-import org.apache.commons.lang.ArrayUtils;
++import org.apache.commons.lang3.ArrayUtils;
+
+ /**
+ * Eclipse 起動時のバイトコード変換を行うトランスフォーマーです。
+Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherTransformer.java
+===================================================================
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherTransformer.java 2013-06-25 18:52:21.000000000 +0900
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherTransformer.java 2013-06-25 18:52:21.000000000 +0900
+@@ -28,7 +28,7 @@
+ import jp.sourceforge.mergedoc.pleiades.aspect.resource.TransformedClassCache;
+ import jp.sourceforge.mergedoc.pleiades.log.Logger;
+
+-import org.apache.commons.lang.ArrayUtils;
++import org.apache.commons.lang3.ArrayUtils;
+
+ /**
+ * Java アプリケーション起動時のバイトコード変換を行うトランスフォーマーです。
+Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/TranslationEditor.java
+===================================================================
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/TranslationEditor.java 2013-06-25 18:52:21.000000000 +0900
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/TranslationEditor.java 2013-06-25 18:52:21.000000000 +0900
+@@ -25,7 +25,7 @@
+ import jp.sourceforge.mergedoc.pleiades.log.Logger;
+ import jp.sourceforge.mergedoc.pleiades.log.Logger.Level;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+
+ /**
+ * 翻訳処理をクラス・オブジェクトに埋め込むエディターです。
+Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/JointPoint.java
+===================================================================
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/JointPoint.java 2013-06-25 18:52:21.000000000 +0900
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/JointPoint.java 2013-06-25 18:52:21.000000000 +0900
+@@ -6,11 +6,11 @@
+ */
+ package jp.sourceforge.mergedoc.pleiades.aspect.advice;
+
+-import org.apache.commons.lang.StringUtils;
+-import org.apache.commons.lang.builder.EqualsBuilder;
+-import org.apache.commons.lang.builder.HashCodeBuilder;
+-import org.apache.commons.lang.builder.ToStringBuilder;
+-import org.apache.commons.lang.builder.ToStringStyle;
++import org.apache.commons.lang3.....StringUtils;
++import org.apache.commons.lang3.....builder.EqualsBuilder;
++import org.apache.commons.lang3.....builder.HashCodeBuilder;
++import org.apache.commons.lang3.....builder.ToStringBuilder;
++import org.apache.commons.lang3.....builder.ToStringStyle;
+
+ /**
+ * ジョイント・ポイントです。
+Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PleiadesConfig.java
+===================================================================
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PleiadesConfig.java 2013-06-25 18:52:21.000000000 +0900
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PleiadesConfig.java 2013-06-25 18:52:21.000000000 +0900
+@@ -22,8 +22,8 @@
+ import jp.sourceforge.mergedoc.pleiades.log.Logger;
+ import jp.sourceforge.mergedoc.pleiades.resource.Files;
+
+-import org.apache.commons.lang.builder.ToStringBuilder;
+-import org.apache.commons.lang.builder.ToStringStyle;
++import org.apache.commons.lang3..builder.ToStringBuilder;
++import org.apache.commons.lang3..builder.ToStringStyle;
+
+ /**
+ * Pleiades 構成クラスです。<br>
+Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PointCut.java
+===================================================================
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PointCut.java 2013-06-25 18:52:21.000000000 +0900
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PointCut.java 2013-06-25 18:52:21.000000000 +0900
+@@ -9,9 +9,9 @@
+ import java.util.LinkedList;
+ import java.util.List;
+
+-import org.apache.commons.lang.StringUtils;
+-import org.apache.commons.lang.builder.ToStringBuilder;
+-import org.apache.commons.lang.builder.ToStringStyle;
++import org.apache.commons.lang3...StringUtils;
++import org.apache.commons.lang3...builder.ToStringBuilder;
++import org.apache.commons.lang3...builder.ToStringStyle;
+
+ /**
+ * ポイント・カットです。
+Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/resource/TraceableTranslationDictionary.java
+===================================================================
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/resource/TraceableTranslationDictionary.java 2013-06-25 18:52:21.000000000 +0900
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/resource/TraceableTranslationDictionary.java 2013-06-25 18:52:21.000000000 +0900
+@@ -10,7 +10,7 @@
+ import jp.sourceforge.mergedoc.pleiades.aspect.advice.PleiadesConfig;
+ import jp.sourceforge.mergedoc.pleiades.log.Logger;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+
+ /**
+ * 翻訳単語のトレース調査を行うための辞書クラスです。
+Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/Generator.java
+===================================================================
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/generator/Generator.java 2013-06-25 18:52:21.000000000 +0900
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/Generator.java 2013-06-25 18:52:21.000000000 +0900
+@@ -22,7 +22,7 @@
+ import jp.sourceforge.mergedoc.pleiades.resource.PropertySet;
+
+ import org.apache.commons.io.FileUtils;
+-import org.apache.commons.lang.ArrayUtils;
++import org.apache.commons.lang3.ArrayUtils;
+
+ /**
+ * 複数のプロパティー・ファイルをマージし、1 つのプロパティー・ファイル
+Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/AbstractExtractor.java
+===================================================================
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/generator/nls/AbstractExtractor.java 2013-06-25 18:52:21.000000000 +0900
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/AbstractExtractor.java 2013-06-25 18:52:21.000000000 +0900
+@@ -18,7 +18,7 @@
+ import jp.sourceforge.mergedoc.pleiades.resource.PropertySet;
+
+ import org.apache.commons.io.FileUtils;
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+
+ /**
+ * 言語パックから日本語訳を抽出し Pleiades 形式の
+Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/HelpExtractor.java
+===================================================================
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/generator/nls/HelpExtractor.java 2013-06-25 18:52:21.000000000 +0900
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/HelpExtractor.java 2013-06-25 18:52:21.000000000 +0900
+@@ -23,7 +23,7 @@
+ import jp.sourceforge.mergedoc.pleiades.resource.Property;
+ import jp.sourceforge.mergedoc.pleiades.resource.PropertySet;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+
+ /**
+ * 言語パックから、ヘルプに関する日本語訳を抽出し、Pleiades 形式の
+Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/UIExtractor.java
+===================================================================
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/generator/nls/UIExtractor.java 2013-06-25 18:52:21.000000000 +0900
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/UIExtractor.java 2013-06-25 18:52:21.000000000 +0900
+@@ -23,7 +23,7 @@
+ import jp.sourceforge.mergedoc.pleiades.resource.PropertySet;
+ import jp.sourceforge.mergedoc.pleiades.resource.TranslationString;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+
+ /**
+ * 言語パックから、UI に関する日本語訳を抽出し、Pleiades 形式の
+Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/log/Logger.java
+===================================================================
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/log/Logger.java 2013-06-25 18:52:21.000000000 +0900
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/log/Logger.java 2013-06-25 18:52:21.000000000 +0900
+@@ -13,7 +13,7 @@
+ import java.util.HashMap;
+ import java.util.Map;
+
+-import org.apache.commons.lang.ArrayUtils;
++import org.apache.commons.lang3.ArrayUtils;
+
+ /**
+ * Log4J ライクなインタフェースを持つ抽象ロガーです。
+Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/resource/PropertySet.java
+===================================================================
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/resource/PropertySet.java 2013-06-25 18:52:21.000000000 +0900
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/resource/PropertySet.java 2013-06-25 18:52:21.000000000 +0900
+@@ -35,7 +35,7 @@
+ import jp.sourceforge.mergedoc.pleiades.log.Logger;
+
+ import org.apache.commons.io.IOUtils;
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+
+ /**
+ * プロパティー・セット・クラスです。
+Index: pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/resource/TranslationString.java
+===================================================================
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/resource/TranslationString.java 2013-06-25 18:52:21.000000000 +0900
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/resource/TranslationString.java 2013-06-25 18:52:21.000000000 +0900
+@@ -14,7 +14,7 @@
+
+ import jp.sourceforge.mergedoc.pleiades.log.Logger;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+
+ /**
+ * 翻訳対象となる項目を表すクラスです。
diff --git a/debian/patches/use_org.apache.commons.lang3.patch b/debian/patches/use_org.apache.commons.lang3.patch
new file mode 100644
index 0000000..2c11bb2
--- /dev/null
+++ b/debian/patches/use_org.apache.commons.lang3.patch
@@ -0,0 +1,187 @@
+Description: <short summary of the patch>
+Author: Hideki Yamane <henrich at debian.org>
+
+---
+Bug-Debian: http://bugs.debian.org/713779
+Forwarded: no
+Last-Update: 2013-06-25
+
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/PleiadesOption.java
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/PleiadesOption.java
+@@ -10,7 +10,7 @@ import jp.sourceforge.mergedoc.pleiades.
+ import jp.sourceforge.mergedoc.pleiades.log.Logger.Level;
+ import jp.sourceforge.mergedoc.pleiades.resource.TranslationNotFoundProperties;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+
+ /**
+ * Pleiades 起動オプションです。
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/generator/Generator.java
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/Generator.java
+@@ -22,7 +22,7 @@ import jp.sourceforge.mergedoc.pleiades.
+ import jp.sourceforge.mergedoc.pleiades.resource.PropertySet;
+
+ import org.apache.commons.io.FileUtils;
+-import org.apache.commons.lang.ArrayUtils;
++import org.apache.commons.lang3.ArrayUtils;
+
+ /**
+ * 複数のプロパティー・ファイルをマージし、1 つのプロパティー・ファイル
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/generator/nls/HelpExtractor.java
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/HelpExtractor.java
+@@ -23,7 +23,7 @@ import jp.sourceforge.mergedoc.pleiades.
+ import jp.sourceforge.mergedoc.pleiades.resource.Property;
+ import jp.sourceforge.mergedoc.pleiades.resource.PropertySet;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+
+ /**
+ * 言語パックから、ヘルプに関する日本語訳を抽出し、Pleiades 形式の
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/generator/nls/AbstractExtractor.java
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/AbstractExtractor.java
+@@ -18,7 +18,7 @@ import jp.sourceforge.mergedoc.pleiades.
+ import jp.sourceforge.mergedoc.pleiades.resource.PropertySet;
+
+ import org.apache.commons.io.FileUtils;
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+
+ /**
+ * 言語パックから日本語訳を抽出し Pleiades 形式の
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/generator/nls/UIExtractor.java
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/generator/nls/UIExtractor.java
+@@ -23,7 +23,7 @@ import jp.sourceforge.mergedoc.pleiades.
+ import jp.sourceforge.mergedoc.pleiades.resource.PropertySet;
+ import jp.sourceforge.mergedoc.pleiades.resource.TranslationString;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+
+ /**
+ * 言語パックから、UI に関する日本語訳を抽出し、Pleiades 形式の
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/resource/TranslationString.java
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/resource/TranslationString.java
+@@ -14,7 +14,7 @@ import java.util.regex.Pattern;
+
+ import jp.sourceforge.mergedoc.pleiades.log.Logger;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+
+ /**
+ * 翻訳対象となる項目を表すクラスです。
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/resource/PropertySet.java
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/resource/PropertySet.java
+@@ -35,7 +35,7 @@ import java.util.zip.ZipOutputStream;
+ import jp.sourceforge.mergedoc.pleiades.log.Logger;
+
+ import org.apache.commons.io.IOUtils;
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+
+ /**
+ * プロパティー・セット・クラスです。
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/log/Logger.java
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/log/Logger.java
+@@ -13,7 +13,7 @@ import java.util.Date;
+ import java.util.HashMap;
+ import java.util.Map;
+
+-import org.apache.commons.lang.ArrayUtils;
++import org.apache.commons.lang3.ArrayUtils;
+
+ /**
+ * Log4J ライクなインタフェースを持つ抽象ロガーです。
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherEclipseTransformer.java
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherEclipseTransformer.java
+@@ -23,7 +23,7 @@ import jp.sourceforge.mergedoc.pleiades.
+ import jp.sourceforge.mergedoc.pleiades.resource.Files;
+ import jp.sourceforge.mergedoc.pleiades.resource.PropertySet;
+
+-import org.apache.commons.lang.ArrayUtils;
++import org.apache.commons.lang3.ArrayUtils;
+
+ /**
+ * Eclipse 起動時のバイトコード変換を行うトランスフォーマーです。
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherTransformer.java
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/LauncherTransformer.java
+@@ -28,7 +28,7 @@ import jp.sourceforge.mergedoc.pleiades.
+ import jp.sourceforge.mergedoc.pleiades.aspect.resource.TransformedClassCache;
+ import jp.sourceforge.mergedoc.pleiades.log.Logger;
+
+-import org.apache.commons.lang.ArrayUtils;
++import org.apache.commons.lang3.ArrayUtils;
+
+ /**
+ * Java アプリケーション起動時のバイトコード変換を行うトランスフォーマーです。
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/TranslationEditor.java
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/TranslationEditor.java
+@@ -25,7 +25,7 @@ import jp.sourceforge.mergedoc.pleiades.
+ import jp.sourceforge.mergedoc.pleiades.log.Logger;
+ import jp.sourceforge.mergedoc.pleiades.log.Logger.Level;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+
+ /**
+ * 翻訳処理をクラス・オブジェクトに埋め込むエディターです。
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/JointPoint.java
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/JointPoint.java
+@@ -6,11 +6,11 @@
+ */
+ package jp.sourceforge.mergedoc.pleiades.aspect.advice;
+
+-import org.apache.commons.lang.StringUtils;
+-import org.apache.commons.lang.builder.EqualsBuilder;
+-import org.apache.commons.lang.builder.HashCodeBuilder;
+-import org.apache.commons.lang.builder.ToStringBuilder;
+-import org.apache.commons.lang.builder.ToStringStyle;
++import org.apache.commons.lang3.StringUtils;
++import org.apache.commons.lang3.builder.EqualsBuilder;
++import org.apache.commons.lang3.builder.HashCodeBuilder;
++import org.apache.commons.lang3.builder.ToStringBuilder;
++import org.apache.commons.lang3.builder.ToStringStyle;
+
+ /**
+ * ジョイント・ポイントです。
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PleiadesConfig.java
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PleiadesConfig.java
+@@ -22,8 +22,8 @@ import jp.sourceforge.mergedoc.pleiades.
+ import jp.sourceforge.mergedoc.pleiades.log.Logger;
+ import jp.sourceforge.mergedoc.pleiades.resource.Files;
+
+-import org.apache.commons.lang.builder.ToStringBuilder;
+-import org.apache.commons.lang.builder.ToStringStyle;
++import org.apache.commons.lang3.builder.ToStringBuilder;
++import org.apache.commons.lang3.builder.ToStringStyle;
+
+ /**
+ * Pleiades 構成クラスです。<br>
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PointCut.java
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/advice/PointCut.java
+@@ -9,9 +9,9 @@ package jp.sourceforge.mergedoc.pleiades
+ import java.util.LinkedList;
+ import java.util.List;
+
+-import org.apache.commons.lang.StringUtils;
+-import org.apache.commons.lang.builder.ToStringBuilder;
+-import org.apache.commons.lang.builder.ToStringStyle;
++import org.apache.commons.lang3.StringUtils;
++import org.apache.commons.lang3.builder.ToStringBuilder;
++import org.apache.commons.lang3.builder.ToStringStyle;
+
+ /**
+ * ポイント・カットです。
+--- pleiades-1.4.0-dfsg.orig/src/jp/sourceforge/mergedoc/pleiades/aspect/resource/TraceableTranslationDictionary.java
++++ pleiades-1.4.0-dfsg/src/jp/sourceforge/mergedoc/pleiades/aspect/resource/TraceableTranslationDictionary.java
+@@ -10,7 +10,7 @@ import jp.sourceforge.mergedoc.pleiades.
+ import jp.sourceforge.mergedoc.pleiades.aspect.advice.PleiadesConfig;
+ import jp.sourceforge.mergedoc.pleiades.log.Logger;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+
+ /**
+ * 翻訳単語のトレース調査を行うための辞書クラスです。
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/pleiades.git
More information about the pkg-java-commits
mailing list