Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update some libraries in ERJars #625

Merged
merged 4 commits into from
Jan 15, 2015
Merged

update some libraries in ERJars #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45b7e1f
update some of ERJars libraries
darkv Jan 8, 2015
ad728b3
add javadocs to some libraries
darkv Jan 8, 2015
4e4a431
update build.xml for updated libraries
darkv Jan 8, 2015
4753136
match versions of libraries for maven users
darkv Jan 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions Build/build/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,19 @@
<property name="framework.erjars.commons.codec" value="commons-codec-1.6.jar" />
<property name="framework.erjars.commons.io" value="commons-io-2.2.jar" />
<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.fluent-hc" value="fluent-hc-4.3.6.jar" />
<property name="framework.erjars.httpclient" value="httpclient-4.3.6.jar" />
<property name="framework.erjars.httpclient-cache" value="httpclient-cache-4.3.6.jar" />
<property name="framework.erjars.httpcore" value="httpcore-4.3.3.jar" />
<property name="framework.erjars.httpmime" value="httpmime-4.3.6.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" />
<property name="framework.erjars.log4j" value="log4j-1.2.17.jar" />
<property name="framework.erjars.ognl" value="ognl-2.6.7.jar" />
<property name="framework.erjars.slf4j.api" value="slf4j-api-1.7.5.jar" />
<property name="framework.erjars.slf4j.log4j12" value="slf4j-log4j12-1.7.5.jar" />
<property name="framework.erjars.slf4j.api" value="slf4j-api-1.7.10.jar" />
<property name="framework.erjars.slf4j.log4j12" value="slf4j-log4j12-1.7.10.jar" />

<target name="ERJars.all">
<fail message="Please check versions of jar files included in ERJars project. See properties in Build/build//build.xml.">
Expand All @@ -44,8 +47,11 @@
<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.fluent-hc}" />
<available file="Frameworks/Core/ERJars/Libraries/${framework.erjars.httpclient}" />
<available file="Frameworks/Core/ERJars/Libraries/${framework.erjars.httpclient-cache}" />
<available file="Frameworks/Core/ERJars/Libraries/${framework.erjars.httpcore}" />
<available file="Frameworks/Core/ERJars/Libraries/${framework.erjars.httpmime}" />
<available file="Frameworks/Core/ERJars/Libraries/${framework.erjars.icu4j}" />
<available file="Frameworks/Core/ERJars/Libraries/${framework.erjars.joda}" />
<available file="Frameworks/Core/ERJars/Libraries/${framework.erjars.junit}" />
Expand Down
64 changes: 52 additions & 12 deletions Frameworks/Core/ERJars/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,57 @@
<classpathentry exported="true" kind="lib" path="Libraries/icu4j-3_8_1.jar"/>
<classpathentry exported="true" kind="lib" path="Libraries/ognl-2.6.7.jar"/>
<classpathentry exported="true" kind="lib" path="Libraries/log4j-1.2.17.jar"/>
<classpathentry exported="true" kind="lib" path="Libraries/commons-codec-1.6.jar" sourcepath="LibrarySources/commons-codec-1.6-sources.jar"/>
<classpathentry exported="true" kind="lib" path="Libraries/commons-cli-1.2.jar" sourcepath="LibrarySources/commons-cli-1.2-sources.jar"/>
<classpathentry exported="true" kind="lib" path="Libraries/commons-io-2.2.jar" sourcepath="LibrarySources/commons-io-2.2-sources.jar"/>
<classpathentry exported="true" kind="lib" path="Libraries/slf4j-api-1.7.5.jar" sourcepath="LibrarySources/slf4j-api-1.7.5-sources.jar"/>
<classpathentry exported="true" kind="lib" path="Libraries/slf4j-log4j12-1.7.5.jar" sourcepath="LibrarySources/slf4j-log4j12-1.7.5-sources.jar"/>
<classpathentry exported="true" kind="lib" path="Libraries/commons-logging-1.1.3.jar"/>
<classpathentry exported="true" kind="lib" path="Libraries/fluent-hc-4.3.1.jar"/>
<classpathentry exported="true" kind="lib" path="Libraries/httpclient-4.3.1.jar"/>
<classpathentry exported="true" kind="lib" path="Libraries/httpclient-cache-4.3.1.jar"/>
<classpathentry exported="true" kind="lib" path="Libraries/httpcore-4.3.jar"/>
<classpathentry exported="true" kind="lib" path="Libraries/httpmime-4.3.1.jar"/>
<classpathentry exported="true" kind="lib" path="Libraries/commons-lang3-3.1.jar" sourcepath="LibrarySources/commons-lang3-3.1-sources.jar"/>
<classpathentry exported="true" kind="lib" path="Libraries/commons-codec-1.6.jar" sourcepath="LibrarySources/commons-codec-1.6-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/ERJars/LibraryJavadocs/commons-codec-1.6-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="Libraries/commons-cli-1.2.jar" sourcepath="LibrarySources/commons-cli-1.2-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/ERJars/LibraryJavadocs/commons-cli-1.2-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="Libraries/commons-io-2.2.jar" sourcepath="LibrarySources/commons-io-2.2-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/ERJars/LibraryJavadocs/commons-io-2.2-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="Libraries/commons-lang3-3.1.jar" sourcepath="LibrarySources/commons-lang3-3.1-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/ERJars/LibraryJavadocs/commons-lang3-3.1-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="Libraries/commons-logging-1.2.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/ERJars/LibraryJavadocs/commons-logging-1.2-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="Libraries/fluent-hc-4.3.6.jar" sourcepath="LibrarySources/fluent-hc-4.3.6-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/ERJars/LibraryJavadocs/fluent-hc-4.3.6-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="Libraries/httpclient-4.3.6.jar" sourcepath="LibrarySources/httpclient-4.3.6-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/ERJars/LibraryJavadocs/httpclient-4.3.6-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="Libraries/httpclient-cache-4.3.6.jar" sourcepath="LibrarySources/httpclient-cache-4.3.6-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/ERJars/LibraryJavadocs/httpclient-cache-4.3.6-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="Libraries/httpcore-4.3.3.jar" sourcepath="LibrarySources/httpcore-4.3.3-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/ERJars/LibraryJavadocs/httpcore-4.3.3-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="Libraries/httpmime-4.3.6.jar" sourcepath="LibrarySources/httpmime-4.3.6-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/ERJars/LibraryJavadocs/httpmime-4.3.6-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="Libraries/slf4j-api-1.7.10.jar" sourcepath="LibrarySources/slf4j-api-1.7.10-sources.jar"/>
<classpathentry exported="true" kind="lib" path="Libraries/slf4j-log4j12-1.7.10.jar" sourcepath="LibrarySources/slf4j-log4j12-1.7.10-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Binary file removed Frameworks/Core/ERJars/Libraries/commons-logging-1.1.3.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/Libraries/commons-logging-1.2.jar
View file
Open in desktop
Binary file not shown.
Binary file removed Frameworks/Core/ERJars/Libraries/fluent-hc-4.3.1.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/Libraries/fluent-hc-4.3.6.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed ...ore/ERJars/Libraries/httpclient-4.3.1.jar → ...ore/ERJars/Libraries/httpclient-4.3.6.jar
View file
Open in desktop
Binary file not shown.
Binary file removed Frameworks/Core/ERJars/Libraries/httpclient-cache-4.3.1.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/Libraries/httpclient-cache-4.3.6.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed ...ks/Core/ERJars/Libraries/httpcore-4.3.jar → .../Core/ERJars/Libraries/httpcore-4.3.3.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed .../Core/ERJars/Libraries/httpmime-4.3.1.jar → .../Core/ERJars/Libraries/httpmime-4.3.6.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/Libraries/slf4j-api-1.7.10.jar
View file
Open in desktop
Binary file not shown.
Binary file removed Frameworks/Core/ERJars/Libraries/slf4j-api-1.7.5.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/Libraries/slf4j-log4j12-1.7.10.jar
View file
Open in desktop
Binary file not shown.
Binary file removed Frameworks/Core/ERJars/Libraries/slf4j-log4j12-1.7.5.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/LibraryJavadocs/commons-cli-1.2-javadoc.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/LibraryJavadocs/commons-codec-1.6-javadoc.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/LibraryJavadocs/commons-io-2.2-javadoc.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/LibraryJavadocs/commons-lang3-3.1-javadoc.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/LibraryJavadocs/commons-logging-1.2-javadoc.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/LibraryJavadocs/fluent-hc-4.3.6-javadoc.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/LibraryJavadocs/httpclient-4.3.6-javadoc.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/LibraryJavadocs/httpclient-cache-4.3.6-javadoc.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/LibraryJavadocs/httpcore-4.3.3-javadoc.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/LibraryJavadocs/httpmime-4.3.6-javadoc.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/LibrarySources/fluent-hc-4.3.6-sources.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/LibrarySources/httpclient-4.3.6-sources.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/LibrarySources/httpclient-cache-4.3.6-sources.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/LibrarySources/httpcore-4.3.3-sources.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/LibrarySources/httpmime-4.3.6-sources.jar
View file
Open in desktop
Binary file not shown.
Binary file added Frameworks/Core/ERJars/LibrarySources/slf4j-api-1.7.10-sources.jar
View file
Open in desktop
Binary file not shown.
Binary file removed Frameworks/Core/ERJars/LibrarySources/slf4j-api-1.7.5-sources.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed ...rySources/slf4j-log4j12-1.7.5-sources.jar → ...ySources/slf4j-log4j12-1.7.10-sources.jar
View file
Open in desktop
Binary file not shown.
23 changes: 14 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,12 +374,12 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<version>4.10</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
Expand All @@ -389,12 +389,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>1.7.10</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.5</version>
<version>1.7.10</version>
</dependency>
<dependency>
<groupId>ognl</groupId>
Expand Down Expand Up @@ -451,7 +451,7 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.1</version>
<version>1.2</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
Expand Down Expand Up @@ -501,7 +501,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.3</version>
<version>1.2</version>
</dependency>
<dependency>
<groupId>com.gammastream</groupId>
Expand Down Expand Up @@ -546,7 +546,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.0.1</version>
<version>4.3.6</version>
</dependency>
<dependency>
<groupId>org.htmlparser</groupId>
Expand Down Expand Up @@ -650,6 +650,11 @@
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.1</version>
</dependency>
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
Expand Down Expand Up @@ -704,12 +709,12 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3.1</version>
<version>4.3.6</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.3</version>
<version>4.3.3</version>
</dependency>
<dependency>
<groupId>com.drewnoakes</groupId>
Expand Down