Skip to content

Commit

Permalink
Mimir version to 6.1, gate-core to 8.6
Browse files Browse the repository at this point in the history
  • Loading branch information
ianroberts committed Jun 10, 2019
1 parent 5214f32 commit 4af8bdf
Show file tree
Hide file tree
Showing 17 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion doc/mimir-version.tex
Original file line number Diff line number Diff line change
@@ -1 +1 @@
\newcommand{\mimirversion}{6.1-SNAPSHOT}
\newcommand{\mimirversion}{6.1}
6 changes: 3 additions & 3 deletions mimir-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>uk.ac.gate.mimir</groupId>
<artifactId>mimir-parent</artifactId>
<version>6.1-SNAPSHOT</version>
<version>6.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -25,13 +25,13 @@
<dependency>
<groupId>uk.ac.gate.mimir</groupId>
<artifactId>mimir-connector</artifactId>
<version>6.1-SNAPSHOT</version>
<version>6.1</version>
</dependency>

<dependency>
<groupId>uk.ac.gate.mimir</groupId>
<artifactId>mimir-core</artifactId>
<version>6.1-SNAPSHOT</version>
<version>6.1</version>
<exclusions>
<exclusion>
<groupId>it.unimi.di</groupId>
Expand Down
4 changes: 2 additions & 2 deletions mimir-connector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>uk.ac.gate.mimir</groupId>
<artifactId>mimir-parent</artifactId>
<version>6.1-SNAPSHOT</version>
<version>6.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -35,7 +35,7 @@
<dependency>
<groupId>uk.ac.gate</groupId>
<artifactId>gate-core</artifactId>
<version>8.6-SNAPSHOT</version>
<version>8.6</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand Down
4 changes: 2 additions & 2 deletions mimir-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>uk.ac.gate.mimir</groupId>
<artifactId>mimir-parent</artifactId>
<version>6.1-SNAPSHOT</version>
<version>6.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -25,7 +25,7 @@
<dependency>
<groupId>uk.ac.gate</groupId>
<artifactId>gate-core</artifactId>
<version>8.6-SNAPSHOT</version>
<version>8.6</version>
<scope>compile</scope>
<exclusions>
<!--
Expand Down
4 changes: 2 additions & 2 deletions mimir-indexing-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<!-- this is the description of this plugin -->
<groupId>uk.ac.gate.mimir</groupId>
<artifactId>mimir-indexing-plugin</artifactId>
<version>6.1-SNAPSHOT</version>
<version>6.1</version>

<name>Mímir indexer</name>
<description>Provides a PR to post documents to a Mímir index as part of a GATE pipeline</description>
Expand All @@ -38,7 +38,7 @@
<dependency>
<groupId>uk.ac.gate.mimir</groupId>
<artifactId>mimir-connector</artifactId>
<version>6.1-SNAPSHOT</version>
<version>6.1</version>
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions mimir-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>uk.ac.gate.mimir</groupId>
<artifactId>mimir-parent</artifactId>
<version>6.1-SNAPSHOT</version>
<version>6.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -25,14 +25,14 @@
<dependency>
<groupId>uk.ac.gate.mimir</groupId>
<artifactId>mimir-core</artifactId>
<version>6.1-SNAPSHOT</version>
<version>6.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>uk.ac.gate.mimir</groupId>
<artifactId>mimir-client</artifactId>
<version>6.1-SNAPSHOT</version>
<version>6.1</version>
<scope>test</scope>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions mimir-test/src/test/java/gate/mimir/test/TestQueries.java
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ public class TestQueries {
public static void oneTimeSetUp() throws Exception {
Gate.init();
// load the tokeniser plugin
Gate.getCreoleRegister().registerPlugin(new Plugin.Maven("uk.ac.gate.plugins", "annie", "8.6-SNAPSHOT"));
Gate.getCreoleRegister().registerPlugin(new Plugin.Maven("uk.ac.gate.plugins", "annie", "8.6"));
// load the DB plugin
Gate.getCreoleRegister().registerPlugin(new Plugin.Maven("uk.ac.gate.mimir", "mimir-plugin-dbh2", "6.1-SNAPSHOT"));
Gate.getCreoleRegister().registerPlugin(new Plugin.Maven("uk.ac.gate.mimir", "mimir-plugin-dbh2", "6.1"));
// load the measurements plugin
Gate.getCreoleRegister().registerPlugin(new Plugin.Maven("uk.ac.gate.mimir", "mimir-plugin-measurements", "6.1-SNAPSHOT"));
Gate.getCreoleRegister().registerPlugin(new Plugin.Maven("uk.ac.gate.mimir", "mimir-plugin-measurements", "6.1"));


indexDirs = new File[helperTypes.length];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public static void init() {
try {
Gate.init();
//Gate.getCreoleRegister().registerDirectories(new File(Gate.getPluginsHome(), "ANNIE").toURI().toURL());
Gate.getCreoleRegister().registerPlugin(new Plugin.Maven("uk.ac.gate.plugins", "annie", "8.6-SNAPSHOT"));
Gate.getCreoleRegister().registerPlugin(new Plugin.Maven("uk.ac.gate.plugins", "annie", "8.6"));
} catch(Exception e) {
fail("Gate initialization failed!");
}
Expand Down
6 changes: 3 additions & 3 deletions plugins/db-h2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<groupId>uk.ac.gate</groupId>
<artifactId>gate-plugin-base</artifactId>
<!-- this should be the version of GATE you wish to build against -->
<version>8.6-SNAPSHOT</version>
<version>8.6</version>

<!-- this forces the parent to always be resolved from the repo -->
<relativePath></relativePath>
Expand All @@ -17,7 +17,7 @@
<!-- this is the description of this plugin -->
<groupId>uk.ac.gate.mimir</groupId>
<artifactId>mimir-plugin-dbh2</artifactId>
<version>6.1-SNAPSHOT</version>
<version>6.1</version>

<name>H2 DB Semantic Annotation Helper</name>
<description>SemanticAnnotationHelper for Mímir storing annotation details in an H2 database.</description>
Expand All @@ -38,7 +38,7 @@
<dependency>
<groupId>uk.ac.gate.mimir</groupId>
<artifactId>mimir-core</artifactId>
<version>6.1-SNAPSHOT</version>
<version>6.1</version>
<scope>provided</scope>
</dependency>

Expand Down
8 changes: 4 additions & 4 deletions plugins/measurements/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<groupId>uk.ac.gate</groupId>
<artifactId>gate-plugin-base</artifactId>
<!-- this should be the version of GATE you wish to build against -->
<version>8.6-SNAPSHOT</version>
<version>8.6</version>

<!-- this forces the parent to always be resolved from the repo -->
<relativePath></relativePath>
Expand All @@ -17,7 +17,7 @@
<!-- this is the description of this plugin -->
<groupId>uk.ac.gate.mimir</groupId>
<artifactId>mimir-plugin-measurements</artifactId>
<version>6.1-SNAPSHOT</version>
<version>6.1</version>

<name>Measurements Semantic Annotation Helper</name>
<description>SemanticAnnotationHelper designed to allow flexible queries over Measurement annotations.</description>
Expand All @@ -38,14 +38,14 @@
<dependency>
<groupId>uk.ac.gate.mimir</groupId>
<artifactId>mimir-core</artifactId>
<version>6.1-SNAPSHOT</version>
<version>6.1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>uk.ac.gate.plugins</groupId>
<artifactId>tagger-measurements</artifactId>
<version>8.6-SNAPSHOT</version>
<version>8.6</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion plugins/measurements/src/main/resources/creole.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<!-- This plugin does not provide any GATE resources, but uses the CREOLE
mechanism to supply a set of jar files to be added to the classpath of the caller.-->
<CREOLE-DIRECTORY>
<REQUIRES GROUP="uk.ac.gate.plugins" ARTIFACT="tagger-measurements" VERSION="8.6-SNAPSHOT"/>
<REQUIRES GROUP="uk.ac.gate.plugins" ARTIFACT="tagger-measurements" VERSION="8.6"/>
</CREOLE-DIRECTORY>
6 changes: 3 additions & 3 deletions plugins/sparql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<groupId>uk.ac.gate</groupId>
<artifactId>gate-plugin-base</artifactId>
<!-- this should be the version of GATE you wish to build against -->
<version>8.6-SNAPSHOT</version>
<version>8.6</version>

<!-- this forces the parent to always be resolved from the repo -->
<relativePath></relativePath>
Expand All @@ -17,7 +17,7 @@
<!-- this is the description of this plugin -->
<groupId>uk.ac.gate.mimir</groupId>
<artifactId>mimir-plugin-sparql</artifactId>
<version>6.1-SNAPSHOT</version>
<version>6.1</version>

<name>SPARQL Semantic Annotation Helper</name>
<description>SemanticAnnotationHelper that adds SPARQL querying to another helper.</description>
Expand All @@ -38,7 +38,7 @@
<dependency>
<groupId>uk.ac.gate.mimir</groupId>
<artifactId>mimir-core</artifactId>
<version>6.1-SNAPSHOT</version>
<version>6.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>uk.ac.gate.mimir</groupId>
<artifactId>mimir-parent</artifactId>
<version>6.1-SNAPSHOT</version>
<version>6.1</version>
<packaging>pom</packaging>
<url>http://gate.ac.uk/mimir</url>

Expand Down
2 changes: 1 addition & 1 deletion webapp/mimir-cloud/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {
}
}

version "6.1-SNAPSHOT"
version "6.1"
group "uk.ac.gate"

apply plugin:"eclipse"
Expand Down
2 changes: 1 addition & 1 deletion webapp/mimir-web-ui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}
}

version "6.1-SNAPSHOT"
version "6.1"
group "uk.ac.gate.mimir"

apply plugin: 'java'
Expand Down
8 changes: 4 additions & 4 deletions webapp/mimir-web/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
}
}

version "6.1-SNAPSHOT"
version "6.1"
group "uk.ac.gate.mimir"

apply plugin:"eclipse"
Expand Down Expand Up @@ -57,9 +57,9 @@ dependencies {
exclude group:'org.slf4j', module:'slf4j-log4j12'
}

compile("uk.ac.gate.mimir:mimir-core:6.1-SNAPSHOT", exclLog4j)
compile("uk.ac.gate.mimir:mimir-client:6.1-SNAPSHOT", exclLog4j)
compile("uk.ac.gate:gate-spring:8.6-SNAPSHOT", exclLog4j)
compile("uk.ac.gate.mimir:mimir-core:6.1", exclLog4j)
compile("uk.ac.gate.mimir:mimir-client:6.1", exclLog4j)
compile("uk.ac.gate:gate-spring:8.6", exclLog4j)

console "org.grails:grails-console"
profile "org.grails.profiles:web-plugin"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<gate.creole.Plugin-Maven>
<group>uk.ac.gate.plugins</group>
<artifact>annie</artifact>
<version>8.6-SNAPSHOT</version>
<version>8.6</version>
</gate.creole.Plugin-Maven>
</localList>
<collectionType>java.util.ArrayList</collectionType>
Expand Down

0 comments on commit 4af8bdf

Please sign in to comment.