Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@essiembre
essiembre committed Nov 26, 2017
2 parents c83fdea + 31a5b1f commit 9a2deab
Show file tree
Hide file tree
Showing 38 changed files with 3,392 additions and 533 deletions.
14 changes: 11 additions & 3 deletions norconex-commons-lang/TODO.txt
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
TODO:
==============

- Upgrade to Commons Configuration 2.x
- Consider using Apache Commons Exec to replace SystemCommand?

- Allows to specify a velocity-tools.properties or equivalent in classpath
root (e.g. classes/ folder) to define custom classes/tools to be used
by Velocity.

- Upgrade to Commons Configuration 2.x
- Upgrade to Apache Velocity 2.x when available in Maven.

- See after upgrading above two if we can get rid of
Commons Collections 3.x and Commons Lang 2.x

- Upgrade to slf4j.

- Modify Jar copier to handle cases where snapshot are timestamped instead and
not being considered the latest when they should. Like:
norconex-commons-lang-1.13.0-20170328.184247-17.jar vs
norconex-commons-lang-1.13.0-SNAPSHOT.jar
https://github.com/Norconex/collector-http/issues/331#issuecomment-290196986

- Consider splitting Properties by \u001e by default (record separator).

- Redo DurationUtil to be more flexible (using fluid builder approach.
or check Apache or Java 8 equivalent classes if they can be made as flexible.
Look at:
Expand Down
75 changes: 50 additions & 25 deletions norconex-commons-lang/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,18 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.norconex.commons</groupId>
<artifactId>norconex-commons-lang</artifactId>
<version>1.13.1</version>
<version>1.14.0</version>
<packaging>jar</packaging>
<name>Norconex Commons Lang</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<site.baseurl/>
<currentStableVersion>1.13.1</currentStableVersion>
<currentStableVersion>1.14.0</currentStableVersion>

<commons-lang3.version>3.6</commons-lang3.version>
<commons-configuration.version>1.10</commons-configuration.version>
</properties>
<inceptionYear>2008</inceptionYear>

Expand All @@ -53,6 +56,22 @@
</repositories>

<dependencies>

<!-- Fix transitive dependencies versions: -->

<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
</dependency>

<!-- Other dependencies: -->

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -72,7 +91,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.5</version>
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
Expand All @@ -82,7 +106,7 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.10</version>
<version>${commons-configuration.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
Expand All @@ -99,28 +123,29 @@
<artifactId>xercesImpl-xsd11</artifactId>
<version>2.12-beta-r1667115</version>
</dependency>
<dependency>
<groupId>com.tdunning</groupId>
<artifactId>json</artifactId>
<version>1.8</version>
</dependency>

<!-- Switch to 1.10.1 or + when switching to Java 8. -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.1</version>
<version>1.9.9</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependency>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
</dependency>
</dependencies>
</dependencyManagement>
<!-- For optional Proxy class used only by some implementations. -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.3</version>
<scope>provided</scope>
</dependency>

</dependencies>

<build>
<resources>
Expand Down Expand Up @@ -270,8 +295,8 @@
<source>1.7</source>
<detectLinks>false</detectLinks>
<links>
<link>https://commons.apache.org/proper/commons-configuration/javadocs/v1.10/apidocs/</link>
<link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.5/</link>
<link>https://commons.apache.org/proper/commons-configuration/javadocs/v${commons-configuration.version}/apidocs/</link>
<link>https://commons.apache.org/proper/commons-lang/javadocs/api-${commons-lang3.version}/</link>
</links>
</configuration>
<executions>
Expand Down Expand Up @@ -429,8 +454,8 @@
<source>1.7</source>
<detectLinks>false</detectLinks>
<links>
<link>https://commons.apache.org/proper/commons-configuration/javadocs/v1.10/apidocs/</link>
<link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.5/</link>
<link>https://commons.apache.org/proper/commons-configuration/javadocs/v${commons-configuration.version}/apidocs/</link>
<link>https://commons.apache.org/proper/commons-lang/javadocs/api-${commons-lang3.version}/</link>
</links>
</configuration>
<reportSets>
Expand Down
94 changes: 94 additions & 0 deletions norconex-commons-lang/src/changes/changes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,100 @@
</properties>
<body>

<release version="1.14.0" date="2017-11-26" description="Feature release">
<action dev="essiembre" type="add">
Can now store and load Properties file as JSON.
</action>
<action dev="essiembre" type="add">
New StringUtil class with truncation methods replacing the truncated
part with a hash code.
</action>
<action dev="essiembre" type="add">
New ResourceLoader class.
</action>
<action dev="essiembre" type="add">
New ProxySettings class.
</action>
<action dev="essiembre" type="add">
New CircularRange class.
</action>
<action dev="essiembre" type="add">
New method variation on EhancedXMLStreamWriter to overwrite the
default "writeBlanks" setting.
</action>
<action dev="essiembre" type="add">
New FileUtil#createURLDirs method for creating directories matching
URL segments.
</action>
<action dev="essiembre" type="add">
New XMLConfigurationUtil#nullable* methods to consider empty
tags/attributes as null whereas not having the tag at all uses
the default value.
</action>
<action dev="essiembre" type="add">
New XMLConfigurationUtil#keyExists methods to find if a key exists
in XML even if empty.
</action>
<action dev="essiembre" type="add">
New EqualsUtil#equalsMap(...) method for checking if two maps are equal,
regardless of entry order.
</action>
<action dev="essiembre" type="add">
It is now possible to pass a Charset where a string was expected
for character encoding on a few utility classes.
</action>
<action dev="essiembre" type="add">
Added ZIP constant to ContentType.
</action>
<action dev="essiembre" type="add">
Added ICachedStream#getCacheDirectory().
</action>
<action dev="essiembre" type="update">
TextReader default maxReadSize is now 10 million characters (from
128,000) and now accepts -1 as the maxReadSize to mean unlimited.
</action>
<action dev="essiembre" type="update">
Properties with multi-values now have their values stored
as individual entries by default (as opposed to using a delimiter).
Also more storing/loading options are now available.
</action>
<action dev="essiembre" type="update">
TextReader#DEFAULT_MAX_READ_SIZE has been increased from 64 thousand
to 10 million characters.
</action>
<action dev="essiembre" type="update">
Dependency updates: Apache Commons Lang 3.6, Apache Commons Text 1.1,
Open JSON 1.8.
</action>
<action dev="essiembre" type="update">
ContentType now works better with types with parameters.
Added two new related methods: #toBaseTypeString() and #toBaseType().
</action>
<action dev="essiembre" type="fix">
Fixed SystemCommand not handling arguments with spaces when they
are properly quoted.
</action>
<action dev="essiembre" type="fix">
Fixed CachedInputStream returning -1 or throwing EOF exception when
it should not.
</action>
<action dev="essiembre" type="fix">
Fixed QueryString setting "UTF-8" as the URL when invoking empty
constructor (now blank).
</action>
<action dev="essiembre" type="fix">
Fixed DurationParser now returning default value in some cases
where the duration was invalid (returning 0 instead).
</action>
<action dev="essiembre" type="fix">
Fixed CachedInputStream sometimes returning null when using
#getCacheDirectory() method.
</action>
<action dev="essiembre" type="remove">
Removed Properties#isCaseSensitiveKeys(), deprecated since 1.8.0.
</action>
</release>

<release version="1.13.1" date="2017-05-16" description="Bugfix release">
<action dev="essiembre" type="fix">
Fixed XMLConfigurationUtil reporting a validation error when
Expand Down
Loading

0 comments on commit 9a2deab

Please sign in to comment.