Fixed bug in weka-package where MOA classes weren't being discovered.

Waikato · May 13, 2020 · 50b28aa · 50b28aa
1 parent a2d5582
commit 50b28aa
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/moa/pom.xml b/moa/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>nz.ac.waikato.cms.moa</groupId>
     <artifactId>moa-pom</artifactId>
-    <version>2019.05.1-SNAPSHOT</version>
+    <version>2020.05.0-HOTFIX</version>
   </parent>
 
   <artifactId>moa</artifactId>

diff --git a/moa/src/main/java/moa/core/AutoClassDiscovery.java b/moa/src/main/java/moa/core/AutoClassDiscovery.java
@@ -59,7 +59,7 @@ protected static synchronized void initCache() {
             m_Cache = new ClassCache();
             // failed to locate any classes on the classpath, maybe inside Weka?
             // try loading fixed list of classes
-            if (m_Cache.isEmpty()) {
+            if (m_Cache.getClassnames("moa.classifiers.trees").isEmpty()) {
                 InputStream inputStream = null;
                 try {
                     inputStream = m_Cache.getClass().getResourceAsStream(CLASS_LIST);

diff --git a/moa/src/main/java/moa/core/Globals.java b/moa/src/main/java/moa/core/Globals.java
@@ -29,9 +29,9 @@ public class Globals {
 
     public static final String workbenchTitle = "{M}assive {O}nline {A}nalysis";
 
-    public static final String versionString = " 19.05 May 2019";
+    public static final String versionString = " 20.05 May 2020";
 
-    public static final String copyrightNotice = "(C) 2007-2019 University of Waikato, Hamilton, New Zealand";
+    public static final String copyrightNotice = "(C) 2007-2020 University of Waikato, Hamilton, New Zealand";
 
     public static final String webAddress = "http://moa.cms.waikato.ac.nz/";
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>nz.ac.waikato.cms.moa</groupId>
   <artifactId>moa-pom</artifactId>
   <packaging>pom</packaging>
-  <version>2019.05.1-SNAPSHOT</version>
+  <version>2020.05.0-HOTFIX</version>
 
   <name>MOA: meta-package</name>
   <description>

diff --git a/release.xml b/release.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>nz.ac.waikato.cms.moa</groupId>
     <artifactId>moa-pom</artifactId>
-    <version>2019.05.1-SNAPSHOT</version>  <!-- adjust -->
+    <version>2020.05.0-HOTFIX</version>  <!-- adjust -->
   </parent>
 
   <artifactId>moa-release</artifactId>

diff --git a/weka-package/Description.props b/weka-package/Description.props
@@ -2,10 +2,10 @@
 PackageName=massiveOnlineAnalysis
 
 # Version (required)
-Version=2019.05.0
+Version=2020.05.0-HOTFIX
 
 #Date
-Date=2019-05-17
+Date=2020-05-13
 
 # Title (required)
 Title=MOA (Massive On-line Analysis).
@@ -16,7 +16,7 @@ Category=Data streams
 Author=MOA team.
 
 # Maintainer (required)
-Maintainer=Abert Bifet <abifet@cs.waikato.ac.nz>
+Maintainer=Albert Bifet <abifet@cs.waikato.ac.nz>
 
 # License (required)
 License=GPL 3.0
@@ -27,7 +27,7 @@ Description=Massive On-line Analysis is an environment for massive data mining.
 Changes=
 
 # Package URL for obtaining the package archive (required)
-PackageURL=http://prdownloads.sourceforge.net/weka/massiveOnlineAnalysis-2019.05.0.zip?download
+PackageURL=https://github.com/Waikato/moa/releases/download/2019.05.0/massiveOnlineAnalysis-2020.05.0-HOTFIX.zip
 
 # URL for further information
 URL=http://moa.cs.waikato.ac.nz/

diff --git a/weka-package/pom.xml b/weka-package/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>nz.ac.waikato.cms.moa</groupId>
     <artifactId>moa-pom</artifactId>
-    <version>2019.05.1-SNAPSHOT</version>
+    <version>2020.05.0-HOTFIX</version>
   </parent>
 
   <artifactId>weka-package</artifactId>

diff --git a/weka-package/update_libs.xml b/weka-package/update_libs.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>nz.ac.waikato.cms.moa</groupId>
     <artifactId>moa-pom</artifactId>
-    <version>2019.05.1-SNAPSHOT</version>
+    <version>2020.05.0-HOTFIX</version>
   </parent>
 
   <artifactId>weka-package</artifactId>