Skip to content

Commit 87aba03

Browse files
committed
Do not use ivy any more, it causes too many problems.
For now we go back to having all the JARs for all dependencies in the lib folder and including that in the distribution.
1 parent 70f3757 commit 87aba03

33 files changed

+49
-97
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
/gateplugin-LearningFramework-*.zip
33
/gateplugin-LearningFramework.jar
44
/classes
5-
/lib
65
/build.properties
76
*~
87
#*#

LICENSES.txt

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
This plugin depends on the following software:
1+
This plugin directly depends on the following software:
22

33
Mallet: http://mallet.cs.umass.edu/
4-
License: https://opensource.org/licenses/cpl1.0.php
4+
License: Apache 2.0 https://github.com/mimno/Mallet/blob/master/LICENSE
55

66
SnakeYaml: https://bitbucket.org/asomov/snakeyaml
77
License: Apache License 2.0
88

99
LibSVM: https://www.csie.ntu.edu.tw/~cjlin/libsvm/
1010
License: http://www.csie.ntu.edu.tw/~cjlin/libsvm/COPYRIGHT
1111

12+
Modified CommonsCLI: https://github.com/johann-petrak/commons-cli
13+
License: Apache License 2.0
14+
based on:
1215
CommonsCLI: https://commons.apache.org/proper/commons-cli/
1316
License: Apache License 2.0
1417

@@ -17,3 +20,13 @@ This plugin depends on the following software:
1720

1821
JDOM: http://jdom.org/
1922
License: http://jdom.org/docs/faq.html#a0030 (Apache-like, more permissive)
23+
24+
Jackson Databind: https://github.com/FasterXML/jackson-databind
25+
License: Apache 2.0 http://www.apache.org/licenses/LICENSE-2.0
26+
27+
Unirest: http://unirest.io/
28+
License: MIT https://github.com/Mashape/unirest-java/blob/master/LICENSE
29+
30+
Please see each software for their own dependencies and their licenses.
31+
32+

build.xml

Lines changed: 6 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Lesser General Public License
1818
along with this software. If not, see <http://www.gnu.org/licenses/>.
1919
-->
2020

21-
<project name="gateplugin-LearningFramework" basedir="." default="build" xmlns:ivy="antlib:org.apache.ivy.ant" >
21+
<project name="gateplugin-LearningFramework" basedir="." default="jar" >
2222
<!-- Prevent Ant from warning about includeantruntime not being set -->
2323
<property name="build.sysclasspath" value="ignore" />
2424

@@ -46,42 +46,9 @@ along with this software. If not, see <http://www.gnu.org/licenses/>.
4646
<property name="src.dir" location="src" />
4747
<property name="classes.dir" location="classes" />
4848
<property name="doc.dir" location="doc" />
49-
<property name="build.dir" location="build" />
5049
<property name="javadoc.dir" location="${doc.dir}/javadoc" />
5150
<property name="jar.location" location="gateplugin-${plugin.name}.jar" />
5251

53-
<!-- Ivy setup -->
54-
<property name="ivy.dir" location="build" />
55-
<path id="ivy.lib.path">
56-
<fileset file="${gate.home}/build/lib/ivy.jar" />
57-
</path>
58-
<taskdef resource="org/apache/ivy/ant/antlib.xml"
59-
uri="antlib:org.apache.ivy.ant"
60-
classpathref="ivy.lib.path"/>
61-
62-
<taskdef classname="gate.util.ant.ExpandIvy" name="expandivy">
63-
<classpath>
64-
<pathelement location="${gate.jar}" />
65-
<fileset dir="${gate.lib}" includes="*.jar" />
66-
</classpath>
67-
</taskdef>
68-
<target name="expandivy">
69-
<expandivy dir="." />
70-
</target>
71-
72-
73-
<target name="initivy">
74-
<ivy:configure file="${build.dir}/ivysettings.xml"/>
75-
<!-- <ivy:retrieve sync="true" file="${build.dir}/ivy.xml" pattern="${libDir}/[artifact]-[revision].[ext]" /> -->
76-
<!-- <ivy:retrieve file="${build.dir}/ivy.xml"/> -->
77-
<ivy:resolve file="${build.dir}/ivy.xml"/>
78-
<!-- <ivy:report todir="${ivy.dir}/ivy-report" /> -->
79-
<ivy:cachepath pathid="ivylibs"/>
80-
</target>
81-
82-
<target name="prepare" depends="initivy">
83-
<mkdir dir="${classes.dir}" />
84-
8552
<!-- Path to compile - includes gate.jar and GATE/lib/*.jar -->
8653
<path id="gate.classpath">
8754
<pathelement location="${gate.jar}" />
@@ -94,21 +61,18 @@ along with this software. If not, see <http://www.gnu.org/licenses/>.
9461
<!-- GATE classes plus local lib jars -->
9562
<path id="compile.classpath">
9663
<path refid="gate.classpath" />
97-
<path refid="ivylibs" />
98-
<!--
9964
<fileset dir="lib">
10065
<include name="*.jar"/>
10166
</fileset>
102-
-->
103-
<fileset dir="lib-static">
104-
<include name="*.jar"/>
105-
</fileset>
10667
</path>
10768

10869
<path id="run.classpath">
10970
<path refid="compile.classpath" />
11071
<pathelement location="${jar.location}" />
11172
</path>
73+
74+
<target name="prepare">
75+
<mkdir dir="classes"/>
11276
</target>
11377

11478
<!-- compile the source -->
@@ -119,8 +83,8 @@ along with this software. If not, see <http://www.gnu.org/licenses/>.
11983
deprecation="true"
12084
debug="true"
12185
debuglevel="lines,source"
122-
source="1.7"
123-
target="1.7">
86+
source="1.8"
87+
target="1.8">
12488
<compilerarg value="-Xlint:unchecked"/>
12589
</javac>
12690
</target>
@@ -174,10 +138,6 @@ along with this software. If not, see <http://www.gnu.org/licenses/>.
174138
<delete dir="${classes.dir}" />
175139
</target>
176140

177-
<target name="clean.all" depends="clean" >
178-
<ivy:cleancache/>
179-
</target>
180-
181141
<!-- Clean up - remove .class and .jar files -->
182142
<target name="clean" depends="clean.classes" >
183143
<delete file="${jar.location}" />

build/ivy.xml

Lines changed: 0 additions & 28 deletions
This file was deleted.

build/ivysettings.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

creole.xml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,29 @@ along with this software. If not, see <http://www.gnu.org/licenses/>.
2525
HELPURL="https://github.com/GateNLP/gateplugin-LearningFramework/wiki"
2626
>
2727
<JAR scan="true">gateplugin-LearningFramework.jar</JAR>
28-
<JAR>lib-static/snakeyaml-1.16.jar</JAR>
29-
<IVY>build/ivy.xml</IVY>
30-
<JAR>lib-static/commons-cli-patched-1.4-SNAPSHOT.jar</JAR>
31-
<JAR>lib-static/libsvm.jar</JAR>
32-
<JAR>lib-static/interaction-3.5.1.jar</JAR>
28+
<JAR>lib/arpack_combined_all-0.1.jar</JAR>
29+
<JAR>lib/bsh-2.0b4.jar</JAR>
30+
<JAR>lib/commons-cli-patched-1.4-SNAPSHOT.jar</JAR>
31+
<JAR>lib/commons-codec-1.9.jar</JAR>
32+
<JAR>lib/commons-logging-1.2.jar</JAR>
33+
<JAR>lib/Evaluation.jar</JAR>
34+
<JAR>lib/hamcrest-core-1.1.jar</JAR>
35+
<JAR>lib/httpasyncclient-4.1.1.jar</JAR>
36+
<JAR>lib/httpclient-4.5.1.jar</JAR>
37+
<JAR>lib/httpcore-4.4.4.jar</JAR>
38+
<JAR>lib/httpcore-nio-4.4.4.jar</JAR>
39+
<JAR>lib/httpmime-4.5.2.jar</JAR>
40+
<JAR>lib/interaction-3.5.1.jar</JAR>
41+
<JAR>lib/jdom-1.1.jar</JAR>
42+
<JAR>lib/jgrapht-0.6.0.jar</JAR>
43+
<JAR>lib/json-20160212.jar</JAR>
44+
<JAR>lib/junit-4.10.jar</JAR>
45+
<JAR>lib/jwnl-1.4_rc3.jar</JAR>
46+
<JAR>lib/libsvm.jar</JAR>
47+
<JAR>lib/mallet-2.0.8.jar</JAR>
48+
<JAR>lib/mtj-0.9.14.jar</JAR>
49+
<JAR>lib/netlib-java-0.9.3.jar</JAR>
50+
<JAR>lib/snakeyaml-1.16.jar</JAR>
51+
<JAR>lib/trove4j-2.0.2.jar</JAR>
52+
<JAR>lib/unirest-java-1.4.9.jar</JAR>
3353
</CREOLE-DIRECTORY>
File renamed without changes.

lib/arpack_combined_all-0.1.jar

1.14 MB
Binary file not shown.

lib/bsh-2.0b4.jar

275 KB
Binary file not shown.

0 commit comments

Comments
 (0)