You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/05/20 14:48:18 UTC
[maven-jxr] branch 151 created (now fbcc4dd)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch 151
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git.
at fbcc4dd update commons lang
This branch includes the following new commits:
new fbcc4dd update commons lang
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-jxr] 01/01: update commons lang
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch 151
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git
commit fbcc4dd14fdafcee9f3519c92762d8ac22e22edf
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Wed May 20 10:48:02 2020 -0400
update commons lang
---
maven-jxr/pom.xml | 6 +++---
.../main/java/org/apache/maven/jxr/JavaCodeTransform.java | 12 +++---------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/maven-jxr/pom.xml b/maven-jxr/pom.xml
index 3f5e81d..4848599 100644
--- a/maven-jxr/pom.xml
+++ b/maven-jxr/pom.xml
@@ -108,9 +108,9 @@ under the License.
<version>2.0</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.8.1</version>
</dependency>
<dependency>
diff --git a/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java b/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
index 106280f..6f35d20 100644
--- a/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
+++ b/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
@@ -30,7 +30,7 @@ package org.apache.maven.jxr;
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.jxr.pacman.ClassType;
import org.apache.maven.jxr.pacman.FileManager;
import org.apache.maven.jxr.pacman.ImportType;
@@ -196,11 +196,6 @@ public class JavaCodeTransform
private String revision = null;
/**
- * The input encoding
- */
- private String inputEncoding = null;
-
- /**
* The output encoding
*/
private String outputEncoding = null;
@@ -397,12 +392,11 @@ public class JavaCodeTransform
* @param bottom string
* @throws IOException
*/
- private void transform( Reader sourceReader, Writer destWriter, Locale locale, String inputEncoding,
+ private void transform( Reader sourceReader, Writer destWriter, Locale locale,
String outputEncoding, Path javadocLinkDir, String revision, String bottom )
throws IOException
{
this.locale = locale;
- this.inputEncoding = inputEncoding;
this.outputEncoding = outputEncoding;
this.javadocLinkDir = javadocLinkDir;
this.revision = revision;
@@ -458,7 +452,7 @@ public class JavaCodeTransform
try ( Reader fr = getReader( sourcefile, inputEncoding ); Writer fw = getWriter( destfile, outputEncoding ) )
{
- transform( fr, fw, locale, inputEncoding, outputEncoding, javadocLinkDir, revision, bottom );
+ transform( fr, fw, locale, outputEncoding, javadocLinkDir, revision, bottom );
}
catch ( RuntimeException e )
{