Skip to content

Commit

Permalink
Merge branch 'commons_lang_31_patch' into upstream_master
Browse files Browse the repository at this point in the history
  • Loading branch information
darkv committed Jan 8, 2015
2 parents 384424b + edc7dd1 commit 12195db
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Build/build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<property name="framework.erjars.commons.lang" value="commons-lang-2.6.jar" />
<property name="framework.erjars.httpclient" value="httpclient-4.3.1.jar" />
<property name="framework.erjars.httpcore" value="httpcore-4.3.jar" />
<property name="framework.erjars.commons.lang3" value="commons-lang3-3.1.jar" />
<property name="framework.erjars.icu4j" value="icu4j-3_8_1.jar" />
<property name="framework.erjars.joda" value="joda-time-2.3.jar" />
<property name="framework.erjars.junit" value="junit-4.10.jar" />
Expand All @@ -42,6 +43,7 @@
<available file="Frameworks/Core/ERJars/Libraries/${framework.erjars.commons.codec}" />
<available file="Frameworks/Core/ERJars/Libraries/${framework.erjars.commons.io}" />
<available file="Frameworks/Core/ERJars/Libraries/${framework.erjars.commons.lang}" />
<available file="Frameworks/Core/ERJars/Libraries/${framework.erjars.commons.lang3}" />
<available file="Frameworks/Core/ERJars/Libraries/${framework.erjars.httpclient}" />
<available file="Frameworks/Core/ERJars/Libraries/${framework.erjars.httpcore}" />
<available file="Frameworks/Core/ERJars/Libraries/${framework.erjars.icu4j}" />
Expand Down Expand Up @@ -1644,6 +1646,7 @@
<pathelement location="${build.root}/ERExtensions.${fRJ}/ERExtensions.jar" />
<pathelement location="${build.root}/ERChronic.${fRJ}/ERChronic.jar" />
<pathelement location="${build.root}/ERJars.${fRJ}/${framework.erjars.commons.lang}" />
<pathelement location="${build.root}/ERJars.${fRJ}/${framework.erjars.commons.lang3}" />
<pathelement location="${build.root}/ERJars.${fRJ}/ERFoundation.jar" />
<pathelement location="${build.root}/ERJars.${fRJ}/ERJars.jar" />
<pathelement location="${build.root}/ERJars.${fRJ}/ERWebObjects.jar" />
Expand Down

0 comments on commit 12195db

Please sign in to comment.