Revision: 16668
http://sourceforge.net/p/gate/code/16668
Author: valyt
Date: 2013-04-30 17:16:13 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
Upgraded all sub-projects to:
- gate-core 7.1
- grails 2.2.2
- mg4j 5.2.1
- ...and dependencies
All sub-projects now compile.
There is one logging framework conflict. Given the size of the classpath, and
the state of Java logging frameworks, it's a miracle there's only one...
Old indexes can be opened and searched.
M?\195?\173mir now requires Java 7 to compile.
Modified Paths:
--------------
mimir/trunk/mimir-cloud/.classpath
mimir/trunk/mimir-cloud/grails-app/conf/BuildConfig.groovy.template
mimir/trunk/mimir-cloud/grails-app/conf/MimirConfig.groovy
mimir/trunk/mimir-core/build/ivy.xml
mimir/trunk/mimir-web/.classpath
mimir/trunk/mimir-web/grails-app/conf/BuildConfig.groovy.template
mimir/trunk/mimir-web/src/groovy/gate/mimir/util/TokenFeaturesHandler.groovy
mimir/trunk/mimir-web/src/templates/conf/MimirConfig.groovy
Modified: mimir/trunk/mimir-cloud/.classpath
===================================================================
--- mimir/trunk/mimir-cloud/.classpath 2013-04-29 16:35:35 UTC (rev 16667)
+++ mimir/trunk/mimir-cloud/.classpath 2013-04-30 17:16:13 UTC (rev 16668)
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con"
path="org.grails.ide.eclipse.core.CLASSPATH_CONTAINER"/>
- <classpathentry kind="src" path="/mimir-web">
- <attributes>
- <attribute
name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
- </attributes>
- </classpathentry>
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="src" path="src/groovy"/>
<classpathentry kind="src" path="grails-app/conf"/>
@@ -177,5 +171,11 @@
<attribute
name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
+ <classpathentry exported="true" kind="src" path="/mimir-web">
+ <attributes>
+ <attribute
name="org.grails.ide.eclipse.core.SOURCE_FOLDER" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con"
path="org.grails.ide.eclipse.core.CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target-eclipse/classes"/>
</classpath>
Modified: mimir/trunk/mimir-cloud/grails-app/conf/BuildConfig.groovy.template
===================================================================
--- mimir/trunk/mimir-cloud/grails-app/conf/BuildConfig.groovy.template
2013-04-29 16:35:35 UTC (rev 16667)
+++ mimir/trunk/mimir-cloud/grails-app/conf/BuildConfig.groovy.template
2013-04-30 17:16:13 UTC (rev 16668)
@@ -33,7 +33,6 @@
}
dependencies {
// specify dependencies here under either 'build', 'compile',
'runtime', 'test' or 'provided' scopes eg.
-
// runtime 'mysql:mysql-connector-java:5.1.20'
compile 'org.apache.commons:commons-compress:1.1'
runtime 'org.hsqldb:hsqldb:2.2.9'
@@ -56,4 +55,4 @@
// Version of GWT to use - this will be downloaded automatically using Ivy
gwt {
version = "@gwtversion@"
-}
+}
\ No newline at end of file
Modified: mimir/trunk/mimir-cloud/grails-app/conf/MimirConfig.groovy
===================================================================
--- mimir/trunk/mimir-cloud/grails-app/conf/MimirConfig.groovy 2013-04-29
16:35:35 UTC (rev 16667)
+++ mimir/trunk/mimir-cloud/grails-app/conf/MimirConfig.groovy 2013-04-30
17:16:13 UTC (rev 16668)
@@ -1,6 +1,6 @@
-import it.unimi.dsi.big.mg4j.search.score.BM25Scorer
-import it.unimi.dsi.big.mg4j.search.score.CountScorer
-import it.unimi.dsi.big.mg4j.search.score.TfIdfScorer
+import it.unimi.di.big.mg4j.search.score.BM25Scorer
+import it.unimi.di.big.mg4j.search.score.CountScorer
+import it.unimi.di.big.mg4j.search.score.TfIdfScorer
import gate.mimir.search.score.BindingScorer
import gate.mimir.search.score.DelegatingScoringQueryExecutor
Modified: mimir/trunk/mimir-core/build/ivy.xml
===================================================================
--- mimir/trunk/mimir-core/build/ivy.xml 2013-04-29 16:35:35 UTC (rev
16667)
+++ mimir/trunk/mimir-core/build/ivy.xml 2013-04-30 17:16:13 UTC (rev
16668)
@@ -13,16 +13,16 @@
<dependencies defaultconf="*->master(default),runtime(default)" >
<!-- GATE -->
- <dependency name="gate-core" org="uk.ac.gate" rev="7.0">
+ <dependency name="gate-core" org="uk.ac.gate" rev="7.1">
<artifact name="gate-core" type="jar" />
</dependency>
<!-- MG4J -->
<dependency org="it.unimi.di" name="mg4j-big" rev="5.2.1" >
<artifact name="mg4j-big" type="jar" />
+ <exclude org="org.apache.hadoop" module="hadoop-common"/>
</dependency>
- <!-- Force Ivy to use the correct version -->
- <dependency org="commons-configuration" name="commons-configuration"
rev="1.8"/>
-
+ <!-- Don't bring transitive deps, as we don't actually use hadoop for
anything -->
+ <dependency org="org.apache.hadoop" name="hadoop-common" rev="0.23.6"
transitive="false" />
<!-- Exclude xmlbeans as it includes forbidden classes
(a copy excluding the offending classes is included in lib/ -->
Modified: mimir/trunk/mimir-web/.classpath
===================================================================
--- mimir/trunk/mimir-web/.classpath 2013-04-29 16:35:35 UTC (rev 16667)
+++ mimir/trunk/mimir-web/.classpath 2013-04-30 17:16:13 UTC (rev 16668)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con"
path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
<classpathentry kind="con"
path="org.grails.ide.eclipse.core.CLASSPATH_CONTAINER"/>
<classpathentry kind="src" path="src/java"/>
Modified: mimir/trunk/mimir-web/grails-app/conf/BuildConfig.groovy.template
===================================================================
--- mimir/trunk/mimir-web/grails-app/conf/BuildConfig.groovy.template
2013-04-29 16:35:35 UTC (rev 16667)
+++ mimir/trunk/mimir-web/grails-app/conf/BuildConfig.groovy.template
2013-04-30 17:16:13 UTC (rev 16668)
@@ -24,13 +24,19 @@
dependencies {
// specify dependencies here under either 'build', 'compile', 'runtime',
'test' or 'provided' scopes eg.
// runtime 'mysql:mysql-connector-java:5.1.18'
- compile ('uk.ac.gate:gate-core:7.0',
- 'it.unimi.dsi:mg4j-big:4.0.4',
- 'it.unimi.dsi:webgraph:3.0.7',
- 'com.google.guava:guava:12.0') {
+ compile ('uk.ac.gate:gate-core:7.1',
+ 'com.google.guava:guava:12.0',
+ "org.grails:grails-webflow:$grailsVersion") {
// Exclude dependencies that conflict with Grails
excludes 'xml-apis', 'xmlbeans', 'ant'
}
+ // exclude hadoop here, and bring it in later, without transitive deps.
+ compile ('it.unimi.di:mg4j-big:5.2.1') {
+ excludes 'hadoop-common'
+ }
+ compile('org.apache.hadoop:hadoop-common:0.23.6') {
+ transitive = false
+ }
// We must use the same version of Ant as the one provided by Grails
// For Grails 2.1.1, this is Ant 1.8.2
@@ -45,8 +51,10 @@
export = false
}
compile(":hibernate:$grailsVersion")
- compile(":webflow:2.0.0")
- compile(":gwt:0.8") {
+ compile(':webflow:2.0.0'){
+ exclude 'grails-webflow'
+ }
+ compile(':gwt:0.8') {
excludes 'resources'
}
}
Modified:
mimir/trunk/mimir-web/src/groovy/gate/mimir/util/TokenFeaturesHandler.groovy
===================================================================
---
mimir/trunk/mimir-web/src/groovy/gate/mimir/util/TokenFeaturesHandler.groovy
2013-04-29 16:35:35 UTC (rev 16667)
+++
mimir/trunk/mimir-web/src/groovy/gate/mimir/util/TokenFeaturesHandler.groovy
2013-04-30 17:16:13 UTC (rev 16668)
@@ -13,9 +13,9 @@
package gate.mimir.util
import gate.mimir.IndexConfig.TokenIndexerConfig
-import it.unimi.dsi.big.mg4j.index.TermProcessor
-import it.unimi.dsi.big.mg4j.index.DowncaseTermProcessor
-import it.unimi.dsi.big.mg4j.index.NullTermProcessor
+import it.unimi.di.big.mg4j.index.TermProcessor
+import it.unimi.di.big.mg4j.index.DowncaseTermProcessor
+import it.unimi.di.big.mg4j.index.NullTermProcessor
/**
* Class used as closure delegate to handle the mimir.rpcIndexer.tokenFeatures
Modified: mimir/trunk/mimir-web/src/templates/conf/MimirConfig.groovy
===================================================================
--- mimir/trunk/mimir-web/src/templates/conf/MimirConfig.groovy 2013-04-29
16:35:35 UTC (rev 16667)
+++ mimir/trunk/mimir-web/src/templates/conf/MimirConfig.groovy 2013-04-30
17:16:13 UTC (rev 16668)
@@ -1,6 +1,6 @@
-import it.unimi.dsi.big.mg4j.search.score.BM25Scorer
-import it.unimi.dsi.big.mg4j.search.score.CountScorer
-import it.unimi.dsi.big.mg4j.search.score.TfIdfScorer
+import it.unimi.di.big.mg4j.search.score.BM25Scorer
+import it.unimi.di.big.mg4j.search.score.CountScorer
+import it.unimi.di.big.mg4j.search.score.TfIdfScorer
import gate.mimir.search.score.BindingScorer
import gate.mimir.search.score.DelegatingScoringQueryExecutor
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
