From a125396b5b413b60b64643bf4f701bd9d3243b3a Mon Sep 17 00:00:00 2001 From: Johann Petrak Date: Wed, 20 Mar 2019 15:41:56 +0100 Subject: [PATCH 1/3] Update version numbers, replace SNAPSHOT with release versions. --- pom.xml | 2 +- .../pipelines/LF_TrainTopicModel_Mallet_EN.xgapp | 14 +++++++------- .../wrappers/FileJsonPyTorch/gate-lf-pytorch-json | 2 +- .../learningframework/tests/ITEngineMalletSeq.java | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 6e605e7..1eeb448 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ uk.ac.gate.plugins learningframework - 4.1.1-SNAPSHOT + 4.1.1 Learning Framework diff --git a/src/main/resources/resources/pipelines/LF_TrainTopicModel_Mallet_EN.xgapp b/src/main/resources/resources/pipelines/LF_TrainTopicModel_Mallet_EN.xgapp index 8795f41..5e55919 100644 --- a/src/main/resources/resources/pipelines/LF_TrainTopicModel_Mallet_EN.xgapp +++ b/src/main/resources/resources/pipelines/LF_TrainTopicModel_Mallet_EN.xgapp @@ -4,7 +4,7 @@ uk.ac.gate.plugins learningframework - 4.1.1-SNAPSHOT + 4.1.1 @@ -58,7 +58,7 @@ scriptURL - creole://uk.ac.gate.plugins;learningframework;4.1.1-SNAPSHOT/resources/pipelines/groovy/filterTokens4LDA.groovy + creole://uk.ac.gate.plugins;learningframework;4.1.1/resources/pipelines/groovy/filterTokens4LDA.groovy @@ -86,7 +86,7 @@ scriptURL - creole://uk.ac.gate.plugins;learningframework;4.1.1-SNAPSHOT/resources/pipelines/groovy/filterTokens4LDA.groovy + creole://uk.ac.gate.plugins;learningframework;4.1.1/resources/pipelines/groovy/filterTokens4LDA.groovy @@ -135,7 +135,7 @@ configFileURL - creole://uk.ac.gate.plugins;learningframework;4.1.1-SNAPSHOT/resources/pipelines/gazetteer/stopwords-en-long.def + creole://uk.ac.gate.plugins;learningframework;4.1.1/resources/pipelines/gazetteer/stopwords-en-long.def @@ -184,7 +184,7 @@ configFileURL - creole://uk.ac.gate.plugins;learningframework;4.1.1-SNAPSHOT/resources/pipelines/gazetteer/stopwords-en-long.def + creole://uk.ac.gate.plugins;learningframework;4.1.1/resources/pipelines/gazetteer/stopwords-en-long.def @@ -217,7 +217,7 @@ patternFileURL - creole://uk.ac.gate.plugins;learningframework;4.1.1-SNAPSHOT/resources/pipelines/regexp/unwantedText4LDA.txt + creole://uk.ac.gate.plugins;learningframework;4.1.1/resources/pipelines/regexp/unwantedText4LDA.txt @@ -261,7 +261,7 @@ scriptURL - creole://uk.ac.gate.plugins;learningframework;4.1.1-SNAPSHOT/resources/pipelines/groovy/removeUnwantedTokens4LDA.groovy + creole://uk.ac.gate.plugins;learningframework;4.1.1/resources/pipelines/groovy/removeUnwantedTokens4LDA.groovy diff --git a/src/main/resources/resources/wrappers/FileJsonPyTorch/gate-lf-pytorch-json b/src/main/resources/resources/wrappers/FileJsonPyTorch/gate-lf-pytorch-json index 237ef31..d3e8989 160000 --- a/src/main/resources/resources/wrappers/FileJsonPyTorch/gate-lf-pytorch-json +++ b/src/main/resources/resources/wrappers/FileJsonPyTorch/gate-lf-pytorch-json @@ -1 +1 @@ -Subproject commit 237ef31362a5416bb3ebbf90550e9e4ff296a98a +Subproject commit d3e8989a7e15198cc262b293f0d7a88d5b9f55a7 diff --git a/src/test/java/gate/plugin/learningframework/tests/ITEngineMalletSeq.java b/src/test/java/gate/plugin/learningframework/tests/ITEngineMalletSeq.java index 645f688..2ee7393 100644 --- a/src/test/java/gate/plugin/learningframework/tests/ITEngineMalletSeq.java +++ b/src/test/java/gate/plugin/learningframework/tests/ITEngineMalletSeq.java @@ -69,8 +69,8 @@ public class ITEngineMalletSeq extends GATEPluginTests { @BeforeClass public static void init() throws GateException { gate.Gate.init(); - gate.Gate.getCreoleRegister().registerPlugin(new Plugin.Maven("uk.ac.gate.plugins", "format-fastinfoset", "8.5-SNAPSHOT")); - gate.Gate.getCreoleRegister().registerPlugin(new Plugin.Maven("uk.ac.gate.plugins", "evaluation", "0.8-SNAPSHOT")); + gate.Gate.getCreoleRegister().registerPlugin(new Plugin.Maven("uk.ac.gate.plugins", "format-fastinfoset", "8.5")); + gate.Gate.getCreoleRegister().registerPlugin(new Plugin.Maven("uk.ac.gate.plugins", "evaluation", "0.8")); } @Test From 42a47c715a6cf2c1912749ffabcb17e6c2d93271 Mon Sep 17 00:00:00 2001 From: Johann Petrak Date: Wed, 20 Mar 2019 18:18:47 +0100 Subject: [PATCH 2/3] Remove debug output, upgrade pytorch backend to very latest commit --- .../gate/plugin/learningframework/LF_TrainClassification.java | 2 +- .../resources/wrappers/FileJsonPyTorch/gate-lf-pytorch-json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/gate/plugin/learningframework/LF_TrainClassification.java b/src/main/java/gate/plugin/learningframework/LF_TrainClassification.java index 909302d..0db94c8 100644 --- a/src/main/java/gate/plugin/learningframework/LF_TrainClassification.java +++ b/src/main/java/gate/plugin/learningframework/LF_TrainClassification.java @@ -197,7 +197,7 @@ public void process(Document doc) { @Override public void controllerStarted(Controller controller) { - System.err.println("DEBUG: controllerStarted for id="+duplicateId); + // System.err.println("DEBUG: controllerStarted for id="+duplicateId); if("file".equals(dataDirectory.getProtocol())) { dataDirFile = gate.util.Files.fileFromURL(dataDirectory); } else { diff --git a/src/main/resources/resources/wrappers/FileJsonPyTorch/gate-lf-pytorch-json b/src/main/resources/resources/wrappers/FileJsonPyTorch/gate-lf-pytorch-json index d3e8989..609ed43 160000 --- a/src/main/resources/resources/wrappers/FileJsonPyTorch/gate-lf-pytorch-json +++ b/src/main/resources/resources/wrappers/FileJsonPyTorch/gate-lf-pytorch-json @@ -1 +1 @@ -Subproject commit d3e8989a7e15198cc262b293f0d7a88d5b9f55a7 +Subproject commit 609ed4380c16dce9aa10ef8df9dc6c0eb152c9ca From 7ca88ec5751fe4805291ffcf729fd0c7846f5728 Mon Sep 17 00:00:00 2001 From: "Mark A. Greenwood" Date: Wed, 17 Apr 2019 12:06:31 +0100 Subject: [PATCH 3/3] removed Jenkinsfile to avoid branch being built --- Jenkinsfile | 52 ---------------------------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 78a8f71..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,52 +0,0 @@ -pipeline { - agent any - triggers { - upstream(upstreamProjects: "gate-top", threshold: hudson.model.Result.SUCCESS) - } - tools { - maven 'Maven Current' - jdk 'JDK1.8' - } - options { - disableConcurrentBuilds() - } - stages { - stage ('Build') { - steps { - sh 'mvn -e clean install' - } - post { - always { - junit 'target/surefire-reports/**/*.xml' - jacoco exclusionPattern: '**/gate/gui/**,**/gate/resources/**' - warnings canRunOnFailed: true, canResolveRelativePaths: false, consoleParsers: [[parserName: 'Java Compiler (javac)']], defaultEncoding: 'UTF-8', excludePattern: '**/test/**', failedNewAll: '0', unstableNewAll: '0', useStableBuildAsReference: true - } - } - } - stage('Document') { - when{ - expression { currentBuild.result != "FAILED" && currentBuild.changeSets != null && currentBuild.changeSets.size() > 0 } - } - steps { - sh 'mvn -e -DskipTests site' - } - post { - always { - findbugs canRunOnFailed: true, excludePattern: '**/gate/resources/**', failedNewAll: '0', pattern: '**/findbugsXml.xml', unstableNewAll: '0', useStableBuildAsReference: true - } - success { - step([$class: 'JavadocArchiver', javadocDir: 'target/site/apidocs', keepAll: false]) - } - } - } - stage('Deploy') { - when{ - branch 'master' - expression { currentBuild.result == "SUCCESS" && currentBuild.changeSets != null && currentBuild.changeSets.size() > 0 } - } - steps { - sh 'mvn -e -Dmaven.test.skip=true source:jar javadoc:jar deploy' - } - } - } - }