Changeset 6077


Ignore:
Timestamp:
Nov 24, 2020, 8:44:17 AM (18 months ago)
Author:
Nicklas Nordborg
Message:

Fixes #1279: Switch to BASE 3.17

Also updated some external libraries to match those that are used in BASE 3.17.

Location:
extensions/net.sf.basedb.reggie/trunk
Files:
3 added
3 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/.classpath

    r6064 r6077  
    33  <classpathentry kind="src" path="src"/>
    44  <classpathentry kind="lib" path="lib/compile/servlet-api.jar"/>
    5   <classpathentry kind="lib" path="lib/compile/slf4j-api-1.6.4.jar"/>
    6   <classpathentry kind="lib" path="lib/compile/jdom-2.0.5.jar"/>
    75  <classpathentry kind="lib" path="META-INF/lib/zip4j_1.3.2.jar"/>
    86  <classpathentry kind="lib" path="lib/compile/opengrid.jar"/>
    97  <classpathentry kind="lib" path="lib/compile/commons-io-1.4.jar"/>
    108  <classpathentry kind="lib" path="lib/compile/json-simple-1.1.1-1.jar"/>
    11   <classpathentry kind="lib" path="lib/compile/base-core-3.16.0.jar"/>
    12   <classpathentry kind="lib" path="lib/compile/base-coreplugins-3.16.0.jar"/>
    13   <classpathentry kind="lib" path="lib/compile/base-webclient-3.16.0.jar"/>
     9  <classpathentry kind="lib" path="lib/compile/base-core-3.17.0.jar"/>
     10  <classpathentry kind="lib" path="lib/compile/base-coreplugins-3.17.0.jar"/>
     11  <classpathentry kind="lib" path="lib/compile/base-webclient-3.17.0.jar"/>
    1412  <classpathentry kind="lib" path="META-INF/lib/io-7.1.13.jar"/>
    1513  <classpathentry kind="lib" path="META-INF/lib/kernel-7.1.13.jar"/>
    1614  <classpathentry kind="lib" path="META-INF/lib/barcodes-7.1.13.jar"/>
    1715  <classpathentry kind="lib" path="META-INF/lib/svg-7.1.13.jar"/>
     16  <classpathentry kind="lib" path="lib/compile/poi-4.1.2.jar"/>
     17  <classpathentry kind="lib" path="lib/compile/jdom-2.0.6.jar"/>
     18  <classpathentry kind="lib" path="lib/compile/slf4j-api-1.7.25.jar"/>
    1819  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
    1920    <attributes>
     
    2223  </classpathentry>
    2324  <classpathentry kind="lib" path="lib/compile/commons-math3-3.6.1.jar"/>
    24   <classpathentry kind="lib" path="lib/compile/poi-4.0.1.jar"/>
    2525  <classpathentry kind="output" path=".build"/>
    2626</classpath>
  • extensions/net.sf.basedb.reggie/trunk/META-INF/extensions.xml

    r6050 r6077  
    88    </description>
    99    <version>4.28-dev</version>
    10     <min-base-version>3.16.0</min-base-version>
     10    <min-base-version>3.17.0</min-base-version>
    1111    <copyright>BASE development team</copyright>
    1212    <email>basedb-users@lists.sourceforge.net</email>
  • extensions/net.sf.basedb.reggie/trunk/README

    r6052 r6077  
    11== Requirements ==
    22
    3  1. BASE 3.16
     3 1. BASE 3.17
    44 2. Open Grid Scheduler extension 1.2 must be installed
    55 3. Thumbnails extension 1.2 must be installed
  • extensions/net.sf.basedb.reggie/trunk/build.xml

    r5949 r6077  
    2323  <property name="javac.encoding" value="UTF-8" />
    2424  <property name="depend.base-version"
    25     value="3.16.0"
     25    value="3.17.0"
    2626    description="The BASE version that this project depends on."
    2727  />
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/plugins/TMASpecimenImporter.java

    r5806 r6077  
    77import java.util.List;
    88import java.util.Set;
    9 import java.util.regex.Pattern;
    109
    1110import net.sf.basedb.core.BaseException;
    1211import net.sf.basedb.core.DbControl;
    1312import net.sf.basedb.core.File;
    14 import net.sf.basedb.core.IntegerUtil;
    1513import net.sf.basedb.core.InvalidDataException;
    1614import net.sf.basedb.core.Item;
     
    488486  }
    489487
    490   private FlatFileParser getInitializedFlatFileParser(ParameterValues parameters)
    491     throws BaseException
    492   {
    493     FlatFileParser ffp = new FlatFileParser();
    494     ffp.setDataHeaderRegexp(getPattern(parameters, dataHeaderRegexpParameter.getName()));
    495     ffp.setDataSplitterRegexp(getPattern(parameters, dataSplitterRegexpParameter.getName()));
    496     Boolean trimQuotes = (Boolean)parameters.getValue(trimQuotesParameter.getName());
    497     if (trimQuotes != null) ffp.setTrimQuotes(trimQuotes);
    498     ffp.setIgnoreRegexp(getPattern(parameters, ignoreRegexpParameter.getName()));
    499     ffp.setDataFooterRegexp(getPattern(parameters, dataFooterRegexpParameter.getName()));
    500     ffp.setMinDataColumns(IntegerUtil.getInt((Integer)parameters.getValue(minDataColumnsParameter.getName())));
    501     ffp.setMaxDataColumns(IntegerUtil.getInt((Integer)parameters.getValue(maxDataColumnsParameter.getName())));
    502     ffp.setExcelSheet(parameters.getValue(excelSheetParameter.getName()));
    503     return ffp;
    504   }
    505  
    506   private Pattern getPattern(ParameterValues parameters, String name)
    507     throws BaseException
    508   {
    509     String regexp = (String)parameters.getValue(name);
    510     return regexp != null ? Pattern.compile(regexp) : null;
    511   }
    512 
    513488}
Note: See TracChangeset for help on using the changeset viewer.