Changeset 5896 for branches/cleanup


Ignore:
Timestamp:
02/09/10 19:02:12 (10 years ago)
Author:
melissa
Message:

Upgraded many of the dependency JARs, and removed a few that are no longer needed. JAR version information is now listed in the root build.xml. See #464.

Location:
branches/cleanup
Files:
7 added
12 deleted
35 edited

Legend:

Unmodified
Added
Removed
  • branches/cleanup/build.properties

    r5848 r5896  
    1414merged-docs.classpath = ${lib.dir}/AppleJavaExtensions.jar:\ 
    1515                        ${lib.dir}/Ice-3.2.1.jar:\ 
    16                         ${lib.dir}/checkstyle-all-4.2.jar:\ 
    17                         ${lib.dir}/forms-1.0.4.jar:\ 
    18                         ${lib.dir}/looks-1.2.2.jar:\ 
     16                        ${lib.dir}/checkstyle-all-5.0.jar:\ 
     17                        ${lib.dir}/forms-1.3.0.jar:\ 
     18                        ${lib.dir}/looks-2.3.1.jar:\ 
    1919                        ${lib.dir}/ij.jar:\ 
    2020                        ${lib.dir}/ome-java.jar:\ 
    2121                        ${lib.dir}/ome-java-deprecated.jar:\ 
    22                         ${lib.dir}/omero-client-4.0.3.jar:\ 
    23                         ${lib.dir}/omero-common-4.0.3.jar:\ 
     22                        ${lib.dir}/omero-client-4.1.1.jar:\ 
     23                        ${lib.dir}/omero-common-4.1.1.jar:\ 
    2424                        ${lib.dir}/testng-5.11-jdk15.jar:\ 
    2525                        ${lib.dir}/visad-lite.jar 
     
    5151loci-tools.dir       = loci-tools 
    5252loci-tools.libraries = bio-formats.jar \ 
    53                        bufr-1.1.00.jar \ 
    5453                       clibwrapper_jiio.jar \ 
    55                        forms-1.0.4.jar \ 
    56                        grib-5.1.03.jar \ 
     54                       forms-1.3.0.jar \ 
    5755                       jai_imageio.jar \ 
    5856                       loci-common.jar \ 
     
    7674                      ome-java.jar \ 
    7775                      ome_plugins.jar \ 
    78                       omero-client-4.0.3.jar \ 
    79                       omero-common-4.0.3.jar \ 
     76                      omero-client-4.1.1.jar \ 
     77                      omero-common-4.1.1.jar \ 
    8078                      xmlrpc-1.2-b1.jar 
  • branches/cleanup/build.xml

    r5817 r5896  
    246246 
    247247Ant-Contrib 
    248     JAR file:  ant-contrib-1.0b1.jar 
     248    JAR file:  ant-contrib-1.0b3.jar 
    249249    URL:       http://ant-contrib.sourceforge.net/ 
    250250    Notes:     used by tools target to iterate over JAR files ("for" task) 
    251251    License:   Apache 
     252    Version:   1.0b3 
    252253 
    253254Checkstyle 
    254     JAR file:  checkstyle-all-4.2.jar 
     255    JAR file:  checkstyle-all-5.0.jar 
    255256    URL:       http://checkstyle.sourceforge.net/ 
    256257    Notes:     used by style Ant target to check source code style conventions 
    257258    License:   LGPL 
     259    Version:   5.0 
    258260 
    259261Apache Jakarta Commons HttpClient 
     
    262264    Notes:     required for OME-Java to communicate with OME servers 
    263265    License:   Apache 
     266    Version:   2.0-rc2 
    264267 
    265268Apache Jakarta Commons Logging 
     
    268271    Notes:     used by OME-Java 
    269272    License:   Apache 
     273    Version:   1.0.3 
    270274 
    271275FindBugs Ant task 
     
    274278    Notes:     used by findbugs Ant target to check for program bugs 
    275279    License:   LGPL 
     280    Version:   1.3.9 
    276281 
    277282JGoodies Forms 
    278     JAR file:  forms-1.0.4.jar 
     283    JAR file:  forms-1.3.0.jar 
    279284    URL:       http://www.jgoodies.com/freeware/forms/index.html 
    280285    Notes:     used for layout by VisBio, Data Browser and OME Notes 
    281286    License:   BSD 
     287    Version:   1.3.0 
    282288 
    283289Ice 
     
    286292    Notes:     used by Bio-Formats Ice framework 
    287293    License:   GPL 
     294    Version:   3.3.1 
    288295 
    289296ImageJ 
     
    293300               included with VisBio to achieve ImageJ interconnectivity 
    294301    License:   Public domain 
     302    Version:   1.43o 
    295303 
    296304JAI ImageIO wrapper 
     
    300308               JP2) and lossless JPEG decompression (DICOM) 
    301309    License:   BSD 
     310    Version:   1.2 (2010 February 9); 
    302311 
    303312JUnit 
     
    306315    Notes:     unit testing framework used for a few VisBio unit tests 
    307316    License:   Common Public License 
     317    Version:   3.8.2 
    308318 
    309319L-M Fit 
     
    315325 
    316326JGoodies Looks 
    317     JAR file:  looks-1.2.2.jar 
     327    JAR file:  looks-2.3.1.jar 
    318328    URL:       http://www.jgoodies.com/freeware/looks/index.html 
    319329    Notes:     used for a nicer Look & Feel by VisBio and OME Metadata Editor 
    320330    License:   BSD 
     331    Version:   2.3.1 
    321332 
    322333NetCDF 
     
    325336    Notes:     used by Bio-Formats via reflection for HDF support (Imaris 5.5) 
    326337    License:   LGPL 
    327  
    328 BUFR Java Decoder 
    329     JAR file:  bufr-1.1.00.jar 
    330     URL:       http://www.unidata.ucar.edu/software/netcdf-java/ 
    331     Notes:     used by NetCDF library 
    332     License:   LGPL 
    333  
    334 GRIB Java Decoder 
    335     JAR file:  grib-5.1.03.jar 
    336     URL:       http://www.unidata.ucar.edu/software/netcdf-java/ 
    337     Notes:     used by NetCDF library 
    338     License:   LGPL 
     338    Version:   4.0 
    339339 
    340340Simple Logging Facade for Java 
    341     JAR file:  slf4j-jdk14.jar 
     341    JAR file:  slf4j-api-1.5.10.jar, slf4j-log4j12-1.5.10.jar 
    342342    URL:       http://www.slf4j.org/ 
    343343    Notes:     used by NetCDF library 
    344344    License:   BSD 
     345    Version:   1.5.10 
    345346 
    346347OME-Java 
     
    357358 
    358359OMERO Client 
    359     JAR file:  omero-client-4.0.3.jar 
     360    JAR file:  omero-client-4.1.1.jar 
    360361    URL:       http://trac.openmicroscopy.org.uk/omero/wiki/MilestoneDownloads 
    361362    Notes:     used by OME I/O to connect to OMERO servers 
    362363    License:   GPL 
     364    Version:   4.1.1 
    363365 
    364366OMERO Common 
    365     JAR file:  omero-common-4.0.3.jar 
     367    JAR file:  omero-common-4.1.1.jar 
    366368    URL:       http://trac.openmicroscopy.org.uk/omero/wiki/MilestoneDownloads 
    367369    Notes:     used by OME I/O to connect to OMERO servers 
    368370    License:   GPL 
     371    Version:   4.1.1 
    369372 
    370373Skin Look and Feel 
     
    373376    Notes:     not used (may be used in the future for flexible skinning) 
    374377    License:   Custom (BSD-like) 
     378    Version:   6.7 
    375379 
    376380TestNG 
     
    379383    Notes:     testing framework used for LOCI software automated test suite 
    380384    License:   Apache 
     385    Version:   5.7 
    381386 
    382387Apache Velocity 
    383     JAR file:  velocity-dep-1.5.jar 
     388    JAR file:  velocity-1.6.3-dep.jar 
    384389    URL:       http://velocity.apache.org/ 
    385390    Notes:     used to autogenerate the loci.formats.meta and loci.formats.ome 
    386391               Bio-Formats packages 
    387392    License:   Apache 
     393    Version:   1.6.3 
    388394 
    389395VisAD 
     
    399405    Notes:     used by OME-Java library to communicate with OME servers 
    400406    License:   Apache 
     407    Version:   1.2-b1 
    401408--> 
    402409 
     
    514521      <link href="http://www.ssec.wisc.edu/visad-docs/javadoc/"/> 
    515522      <!--<link href="http://www.jdocs.com/formlayout/1.0.4/api/"/>--> 
    516       <!--<link href="http://www.jdocs.com/looks/1.2.2/api/"/>--> 
     523      <!--<link href="http://www.jdocs.com/looks/2.3.1/api/"/>--> 
    517524    </javadoc> 
    518525  </target> 
  • branches/cleanup/components/autogen/build.properties

    r5551 r5896  
    1212component.classpath      = ${artifact.dir}/loci-common.jar:\ 
    1313                           ${artifact.dir}/bio-formats.jar:\ 
    14                            ${lib.dir}/velocity-dep-1.5.jar 
     14                           ${lib.dir}/velocity-1.6.3-dep.jar 
    1515component.java-version   = 1.5 
    1616component.deprecation    = true 
  • branches/cleanup/components/bio-formats/build.properties

    r5848 r5896  
    1212component.classpath      = ${artifact.dir}/loci-common.jar:\ 
    1313                           ${artifact.dir}/ome-xml.jar:\ 
    14                            ${lib.dir}/forms-1.0.4.jar:\ 
     14                           ${lib.dir}/forms-1.3.0.jar:\ 
    1515                           ${lib.dir}/slf4j-api-1.5.10.jar:\ 
    1616                           ${lib.dir}/slf4j-log4j12-1.5.10.jar:\ 
  • branches/cleanup/components/bio-formats/src/loci/formats/NetcdfTools.java

    r5852 r5896  
    5252    "NetCDF is required to read NetCDF/HDF variants.  Please obtain " + 
    5353    "the necessary JAR files from http://loci.wisc.edu/ome/formats.html.\n" + 
    54     "Required JAR files are netcdf-4.0.jar, bufr-1.1.00.jar, grib-5.1.03.jar " + 
    55     ", and slf4j-jdk14.jar."; 
     54    "Required JAR files are netcdf-4.0.jar and slf4j-jdk14.jar."; 
    5655 
    5756  private static final Logger LOGGER = 
  • branches/cleanup/components/checkstyle/build.properties

    r5551 r5896  
    1010component.jar            = loci-checks.jar 
    1111component.version        = 1.0.0 
    12 component.classpath      = ${lib.dir}/checkstyle-all-4.2.jar 
     12component.classpath      = ${lib.dir}/checkstyle-all-5.0.jar 
    1313component.java-version   = 1.4 
    1414component.deprecation    = true 
  • branches/cleanup/components/forks/jai/src/jj2000/j2k/codestream/reader/HeaderDecoder.java

    r4503 r5896  
    352352     * */ 
    353353    public final int getNumComps() { 
     354      /* debug */ System.out.println("*** FORK ***"); 
    354355        return nComp; 
    355356    } 
  • branches/cleanup/components/legacy/ome-editor/build.properties

    r5551 r5896  
    1313                           ${artifact.dir}/ome-xml.jar:\ 
    1414                           ${artifact.dir}/bio-formats.jar:\ 
    15                            ${lib.dir}/forms-1.0.4.jar:\ 
     15                           ${lib.dir}/forms-1.3.0.jar:\ 
    1616                           ${lib.dir}/ome-java-deprecated.jar 
    1717component.java-version   = 1.4 
  • branches/cleanup/components/legacy/ome-notes/build.properties

    r5551 r5896  
    1212component.classpath      = ${artifact.dir}/loci-common.jar:\ 
    1313                           ${artifact.dir}/bio-formats.jar:\ 
    14                            ${lib.dir}/forms-1.0.4.jar 
     14                           ${lib.dir}/forms-1.3.0.jar 
    1515component.java-version   = 1.4 
    1616component.deprecation    = true 
  • branches/cleanup/components/loci-plugins/build.properties

    r5666 r5896  
    1212component.classpath      = ${artifact.dir}/loci-common.jar:\ 
    1313                           ${artifact.dir}/bio-formats.jar:\ 
    14                            ${lib.dir}/forms-1.0.4.jar:\ 
     14                           ${lib.dir}/forms-1.3.0.jar:\ 
    1515                           ${lib.dir}/ij.jar 
    1616component.java-version   = 1.5 
  • branches/cleanup/components/loci-plugins/src/loci/plugins/config/libraries.txt

    r5246 r5896  
    177177        and analysis of multidimensional image data. 
    178178 
    179 [BUFR Java Decoder] 
    180 type = Java library 
    181 class = ucar.bufr.BufrDump 
    182 url = http://www.unidata.ucar.edu/software/decoders/ 
    183 license = LGPL 
    184 notes = Used by the NetCDF Java library. 
    185  
    186179[JAI Image I/O Tools - Java wrapper] 
    187180type = Java library 
     
    197190license = LGPL 
    198191notes = Java wrapper for ImageMagick API. 
    199  
    200 [GRIB Java Decoder] 
    201 type = Java library 
    202 class = ucar.grib.GribChecker 
    203 url = http://www.unidata.ucar.edu/software/decoders/ 
    204 license = LGPL 
    205 notes = Used by the NetCDF Java library. 
    206192 
    207193[JAI Image I/O Tools - Java codecs] 
  • branches/cleanup/components/loci-plugins/src/loci/plugins/util/LibraryChecker.java

    r5133 r5896  
    9797      case FORMS: 
    9898        checkLibrary("com.jgoodies.forms.layout.FormLayout", 
    99           "forms-1.0.4.jar", missing); 
     99          "forms-1.3.0.jar", missing); 
    100100        break; 
    101101    } 
  • branches/cleanup/components/loci-plugins/src/loci/plugins/util/RecordedImageProcessor.java

    r5138 r5896  
    459459  } 
    460460 
     461  public double getBackgroundValue() { 
     462    record("getBackgroundValue", null, (Class) null); 
     463    return proc.getBackgroundValue(); 
     464  } 
     465 
    461466  public int getBestIndex(Color c) { 
    462467    record("getBestIndex", c, Color.class); 
  • branches/cleanup/components/ome-io/build.properties

    r5848 r5896  
    1212component.classpath      = ${artifact.dir}/loci-common.jar:\ 
    1313                           ${artifact.dir}/bio-formats.jar:\ 
    14                            ${lib.dir}/omero-client-4.0.3.jar:\ 
    15                            ${lib.dir}/omero-common-4.0.3.jar:\ 
     14                           ${lib.dir}/omero-client-4.1.1.jar:\ 
     15                           ${lib.dir}/omero-common-4.1.1.jar:\ 
    1616                           ${lib.dir}/slf4j-api-1.5.10.jar:\ 
    1717                           ${lib.dir}/slf4j-log4j12-1.5.10.jar:\ 
  • branches/cleanup/components/visbio/build.properties

    r5551 r5896  
    1616                           ${artifact.dir}/poi-loci.jar:\ 
    1717                           ${lib.dir}/AppleJavaExtensions.jar:\ 
    18                            ${lib.dir}/forms-1.0.4.jar:\ 
     18                           ${lib.dir}/forms-1.3.0.jar:\ 
    1919                           ${lib.dir}/ij.jar:\ 
    20                            ${lib.dir}/looks-1.2.2.jar:\ 
     20                           ${lib.dir}/looks-2.3.1.jar:\ 
    2121                           ${lib.dir}/visad-lite.jar 
    2222component.java-version   = 1.4 
     
    4141                              ome-java-deprecated.jar \ 
    4242                              ome-notes.jar \ 
    43                               omero-client-3.0-Beta3.jar \ 
    44                               omero-common-3.0-Beta3.jar \ 
    45                               omero-importer-3.0-Beta3.jar \ 
    46                               omero-model-psql-3.0-Beta3.jar \ 
     43                              omero-client-4.1.1.jar \ 
     44                              omero-common-4.1.1.jar \ 
    4745                              xmlrpc-1.2-b1.jar 
    4846visbio.dist-resources       = bsd-forms.txt \ 
  • branches/cleanup/components/visbio/dist/macosx/VisBio.app/Contents/Info.plist

    r1304 r5896  
    3434                        <string>$JAVAROOT/commons-httpclient-2.0-rc2.jar</string> 
    3535                        <string>$JAVAROOT/commons-logging.jar</string> 
    36                         <string>$JAVAROOT/forms-1.0.4.jar</string> 
     36                        <string>$JAVAROOT/forms-1.3.0.jar</string> 
    3737                        <string>$JAVAROOT/ij.jar</string> 
    3838                        <string>$JAVAROOT/loci-ome-xml.jar</string> 
    39                         <string>$JAVAROOT/looks-1.2.2.jar</string> 
     39                        <string>$JAVAROOT/looks-2.3.1.jar</string> 
    4040                        <string>$JAVAROOT/ome-java.jar</string> 
    4141                        <string>$JAVAROOT/visad-lite.jar</string> 
  • branches/cleanup/components/visbio/src/loci/visbio/ExitManager.java

    r5093 r5896  
    2828import java.awt.event.WindowListener; 
    2929 
    30 import com.jgoodies.plaf.LookUtils; 
     30import com.jgoodies.looks.LookUtils; 
    3131 
    3232/** 
  • branches/cleanup/components/visbio/src/loci/visbio/SystemControls.java

    r5191 r5896  
    4848import com.jgoodies.forms.layout.CellConstraints; 
    4949import com.jgoodies.forms.layout.FormLayout; 
    50 import com.jgoodies.plaf.LookUtils; 
     50import com.jgoodies.looks.LookUtils; 
    5151 
    5252/** 
  • branches/cleanup/components/visbio/src/loci/visbio/SystemManager.java

    r5093 r5896  
    4242import visad.util.Util; 
    4343 
    44 import com.jgoodies.plaf.LookUtils; 
     44import com.jgoodies.looks.LookUtils; 
    4545 
    4646/** 
  • branches/cleanup/components/visbio/src/loci/visbio/VisBioFrame.java

    r5848 r5896  
    6161import visad.util.Util; 
    6262 
    63 import com.jgoodies.plaf.LookUtils; 
     63import com.jgoodies.looks.LookUtils; 
    6464 
    6565/** 
  • branches/cleanup/components/visbio/src/loci/visbio/help/HelpManager.java

    r5093 r5896  
    5151import com.jgoodies.forms.layout.CellConstraints; 
    5252import com.jgoodies.forms.layout.FormLayout; 
    53 import com.jgoodies.plaf.LookUtils; 
     53import com.jgoodies.looks.LookUtils; 
    5454 
    5555/** 
  • branches/cleanup/components/visbio/src/loci/visbio/help/matlab.html

    r4910 r5896  
    3131    C:\Program Files\VisBio\commons-httpclient-2.0-rc2.jar<br> 
    3232    C:\Program Files\VisBio\commons-logging.jar<br> 
    33     C:\Program Files\VisBio\forms-1.0.4.jar<br> 
     33    C:\Program Files\VisBio\forms-1.3.0.jar<br> 
    3434    C:\Program Files\VisBio\ij.jar<br> 
    3535    C:\Program Files\VisBio\jai_imageio.jar<br> 
    3636    C:\Program Files\VisBio\loci-common.jar<br> 
    37     C:\Program Files\VisBio\looks-1.2.2.jar<br> 
     37    C:\Program Files\VisBio\looks-2.3.1.jar<br> 
    3838    C:\Program Files\VisBio\mdbtools-java.jar<br> 
    3939    C:\Program Files\VisBio\netcdf-4.0.jar<br> 
     
    4343    C:\Program Files\VisBio\ome-notes.jar<br> 
    4444    C:\Program Files\VisBio\ome-xml.jar<br> 
    45     C:\Program Files\VisBio\omero-client-3.0-Beta3.jar<br> 
    46     C:\Program Files\VisBio\omero-common-3.0-Beta3.jar<br> 
    47     C:\Program Files\VisBio\omero-importer-3.0-Beta3.jar<br> 
    48     C:\Program Files\VisBio\omero-model-psql-3.0-Beta3.jar<br> 
     45    C:\Program Files\VisBio\omero-client-4.1.1.jar<br> 
     46    C:\Program Files\VisBio\omero-common-4.1.1.jar<br> 
    4947    C:\Program Files\VisBio\poi-loci.jar<br> 
    5048    C:\Program Files\VisBio\visad-lite.jar<br> 
  • branches/cleanup/components/visbio/src/loci/visbio/overlays/SpreadsheetLauncher.java

    r5093 r5896  
    2727import java.io.IOException; 
    2828 
    29 import com.jgoodies.plaf.LookUtils; 
     29import com.jgoodies.looks.LookUtils; 
    3030 
    3131/** 
  • branches/cleanup/components/visbio/src/loci/visbio/state/OptionManager.java

    r5093 r5896  
    4343import org.w3c.dom.Element; 
    4444 
    45 import com.jgoodies.plaf.LookUtils; 
     45import com.jgoodies.looks.LookUtils; 
    4646 
    4747/** 
  • branches/cleanup/components/visbio/src/loci/visbio/util/FontChooserPane.java

    r5093 r5896  
    4141import com.jgoodies.forms.layout.CellConstraints; 
    4242import com.jgoodies.forms.layout.FormLayout; 
    43 import com.jgoodies.plaf.LookUtils; 
     43import com.jgoodies.looks.LookUtils; 
    4444 
    4545/** 
  • branches/cleanup/components/visbio/src/loci/visbio/util/LAFUtil.java

    r5093 r5896  
    3030import javax.swing.UIManager; 
    3131 
    32 import com.jgoodies.plaf.FontSizeHints; 
    33 import com.jgoodies.plaf.LookUtils; 
    34 import com.jgoodies.plaf.Options; 
     32import com.jgoodies.looks.LookUtils; 
     33import com.jgoodies.looks.Options; 
    3534 
    3635/** 
     
    6160 
    6261    UIManager.put(Options.USE_SYSTEM_FONTS_APP_KEY, Boolean.TRUE); 
    63     Options.setGlobalFontSizeHints(FontSizeHints.MIXED); 
    6462    Options.setDefaultIconSize(new Dimension(18, 18)); 
    6563 
  • branches/cleanup/components/visbio/src/loci/visbio/util/SwingUtil.java

    r5093 r5896  
    6060import loci.formats.gui.GUITools; 
    6161 
    62 import com.jgoodies.plaf.LookUtils; 
     62import com.jgoodies.looks.LookUtils; 
    6363 
    6464/** 
  • branches/cleanup/components/visbio/src/loci/visbio/view/DisplayManager.java

    r5093 r5896  
    4444import org.w3c.dom.Element; 
    4545 
    46 import com.jgoodies.plaf.LookUtils; 
     46import com.jgoodies.looks.LookUtils; 
    4747 
    4848/** 
  • branches/cleanup/components/visbio/src/loci/visbio/view/DisplayWindow.java

    r5093 r5896  
    6565import visad.VisADException; 
    6666 
    67 import com.jgoodies.plaf.LookUtils; 
     67import com.jgoodies.looks.LookUtils; 
    6868 
    6969/** 
  • branches/cleanup/global.xml

    r5551 r5896  
    4848  <!-- Ant-Contrib Tasks: http://ant-contrib.sourceforge.net/ --> 
    4949  <taskdef resource="net/sf/antcontrib/antcontrib.properties" 
    50     classpath="${lib.dir}/ant-contrib-1.0b1.jar"/> 
     50    classpath="${lib.dir}/ant-contrib-1.0b3.jar"/> 
    5151  <!-- HACK - some environments do not install the antcontrib tasks properly 
    5252    from antcontrib.properties above; also load them from antlib.xml --> 
    5353  <taskdef resource="net/sf/antcontrib/antlib.xml" 
    54     classpath="${lib.dir}/ant-contrib-1.0b1.jar"/> 
     54    classpath="${lib.dir}/ant-contrib-1.0b3.jar"/> 
    5555 
    5656  <!-- Checkstyle: http://checkstyle.sourceforge.net/ --> 
     
    6060    to fail. --> 
    6161  <taskdef resource="checkstyletask.properties" 
    62     classpath="${lib.dir}/checkstyle-all-4.2.jar:${lib.dir}/loci-checks.jar"/> 
     62    classpath="${lib.dir}/checkstyle-all-5.0.jar:${lib.dir}/loci-checks.jar"/> 
    6363 
    6464  <!-- FindBugs: http://findbugs.sourceforge.net/ --> 
  • branches/cleanup/jar/.classpath

    r5845 r5896  
    22<classpath> 
    33        <classpathentry kind="src" path=""/> 
    4         <classpathentry exported="true" kind="lib" path="ant-contrib-1.0b1.jar"/> 
     4        <classpathentry exported="true" kind="lib" path="ant-contrib-1.0b3.jar"/> 
    55        <classpathentry exported="true" kind="lib" path="AppleJavaExtensions.jar"/> 
    6         <classpathentry exported="true" kind="lib" path="bufr-1.1.00.jar"/> 
    7         <classpathentry exported="true" kind="lib" path="checkstyle-all-4.2.jar"/> 
     6        <classpathentry exported="true" kind="lib" path="checkstyle-all-5.0.jar"/> 
    87        <classpathentry exported="true" kind="lib" path="clibwrapper_jiio.jar"/> 
    98        <classpathentry exported="true" kind="lib" path="commons-httpclient-2.0-rc2.jar"/> 
    109        <classpathentry exported="true" kind="lib" path="commons-logging.jar"/> 
    1110        <classpathentry exported="true" kind="lib" path="findbugs-ant.jar"/> 
    12         <classpathentry exported="true" kind="lib" path="forms-1.0.4.jar"/> 
    13         <classpathentry exported="true" kind="lib" path="grib-5.1.03.jar"/> 
     11        <classpathentry exported="true" kind="lib" path="forms-1.3.0.jar"/> 
    1412        <classpathentry exported="true" kind="lib" path="Ice-3.3.1.jar"/> 
    1513        <classpathentry exported="true" kind="lib" path="ij.jar"/> 
     
    1816        <classpathentry exported="true" kind="lib" path="loci-checks.jar"/> 
    1917        <classpathentry exported="true" kind="lib" path="log4j-1.2.15.jar"/> 
    20         <classpathentry exported="true" kind="lib" path="looks-1.2.2.jar"/> 
     18        <classpathentry exported="true" kind="lib" path="looks-2.3.1.jar"/> 
    2119        <classpathentry exported="true" kind="lib" path="netcdf-4.0.jar"/> 
    2220        <classpathentry exported="true" kind="lib" path="ome-java-deprecated.jar"/> 
    2321        <classpathentry exported="true" kind="lib" path="ome-java.jar"/> 
    24         <classpathentry exported="true" kind="lib" path="omero-client-4.0.3.jar"/> 
    25         <classpathentry exported="true" kind="lib" path="omero-common-4.0.3.jar"/> 
     22        <classpathentry exported="true" kind="lib" path="omero-client-4.1.1.jar"/> 
     23        <classpathentry exported="true" kind="lib" path="omero-common-4.1.1.jar"/> 
    2624        <classpathentry exported="true" kind="lib" path="skinlf.jar"/> 
    2725        <classpathentry exported="true" kind="lib" path="slf4j-api-1.5.10.jar"/> 
    2826        <classpathentry exported="true" kind="lib" path="slf4j-log4j12-1.5.10.jar"/> 
    2927        <classpathentry exported="true" kind="lib" path="testng-5.11-jdk15.jar"/> 
    30         <classpathentry exported="true" kind="lib" path="velocity-dep-1.5.jar"/> 
     28        <classpathentry exported="true" kind="lib" path="velocity-1.6.3-dep.jar"/> 
    3129        <classpathentry exported="true" kind="lib" path="visad-lite.jar"/> 
    3230        <classpathentry exported="true" kind="lib" path="xmlrpc-1.2-b1.jar"/> 
  • branches/cleanup/scan-deps.pl

    r5837 r5896  
    323323  NAME    => "ant-contrib", 
    324324  TITLE   => "Ant-Contrib", 
    325   JAR     => "ant-contrib-1.0b1.jar", 
     325  JAR     => "ant-contrib-1.0b3.jar", 
    326326  PACKAGE => "net.sf.antcontrib", 
    327327  LICENSE => "Apache", 
     
    335335  NAME    => "checkstyle", 
    336336  TITLE   => "Checkstyle", 
    337   JAR     => "checkstyle-all-4.2.jar", 
     337  JAR     => "checkstyle-all-5.0.jar", 
    338338  PACKAGE => "com.puppycrawl.tools.checkstyle", 
    339339  LICENSE => "LGPL", 
     
    383383  NAME    => "forms", 
    384384  TITLE   => "JGoodies Forms", 
    385   JAR     => "forms-1.0.4.jar", 
     385  JAR     => "forms-1.3.0.jar", 
    386386  PACKAGE => "com.jgoodies.forms", 
    387387  LICENSE => "BSD", 
     
    458458  NAME    => "looks", 
    459459  TITLE   => "JGoodies Looks", 
    460   JAR     => "looks-1.2.2.jar", 
     460  JAR     => "looks-2.3.1.jar", 
    461461  PACKAGE => "com.jgoodies.plaf", 
    462462  LICENSE => "BSD", 
     
    476476  NOTES   => <<ZZ, 
    477477used by Bio-Formats via reflection for HDF support (Imaris 5.5) 
    478 ZZ 
    479 ); 
    480  
    481 my %netcdfBufr = ( 
    482   NAME    => "netcdf-bufr", 
    483   TITLE   => "BUFR Java Decoder", 
    484   JAR     => "bufr-1.1.00.jar", 
    485   PACKAGE => "ucar.bufr", 
    486   LICENSE => "LGPL", 
    487   URL     => "http://www.unidata.ucar.edu/software/netcdf-java/", 
    488   NOTES   => <<ZZ, 
    489 used by NetCDF library 
    490 ZZ 
    491 ); 
    492  
    493 my %netcdfGrib = ( 
    494   NAME    => "netcdf-grib", 
    495   TITLE   => "GRIB Java Decoder", 
    496   JAR     => "grib-5.1.03.jar", 
    497   PACKAGE => "ucar.grib", 
    498   LICENSE => "LGPL", 
    499   URL     => "http://www.unidata.ucar.edu/software/netcdf-java/", 
    500   NOTES   => <<ZZ, 
    501 used by NetCDF library 
    502478ZZ 
    503479); 
     
    532508  NAME    => "omero-client", 
    533509  TITLE   => "OMERO Client", 
    534   JAR     => "omero-client-4.0.3.jar", 
     510  JAR     => "omero-client-4.1.1.jar", 
    535511  PACKAGE => "ome.system", 
    536512  LICENSE => "GPL", 
     
    544520  NAME    => "omero-common", 
    545521  TITLE   => "OMERO Common", 
    546   JAR     => "omero-common-4.0.3.jar", 
     522  JAR     => "omero-common-4.1.1.jar", 
    547523  PACKAGE => "ome.api", 
    548524  LICENSE => "GPL", 
     
    552528ZZ 
    553529); 
    554  
    555 #my %omeroImporter = ( 
    556 #  NAME    => "omero-importer", 
    557 #  TITLE   => "OMERO Importer", 
    558 #  JAR     => "omero-importer-3.0-Beta3.jar", 
    559 #  PACKAGE => "ome.formats", 
    560 #  LICENSE => "GPL", 
    561 #  URL     => "http://trac.openmicroscopy.org.uk/omero/wiki/MilestoneDownloads", 
    562 #  NOTES   => <<ZZ, 
    563 #used by OME I/O to connect to OMERO servers 
    564 #ZZ 
    565 #); 
    566  
    567 #my %omeroModelPSQL = ( 
    568 #  NAME    => "omero-model-psql", 
    569 #  TITLE   => "OMERO Model PostgreSQL", 
    570 #  JAR     => "omero-model-psql-3.0-Beta3.jar", 
    571 #  PACKAGE => "ome.model", 
    572 #  LICENSE => "GPL", 
    573 #  URL     => "http://trac.openmicroscopy.org.uk/omero/wiki/MilestoneDownloads", 
    574 #  NOTES   => <<ZZ, 
    575 #used by OME I/O to connect to OMERO servers 
    576 #ZZ 
    577 #); 
    578530 
    579531my %skinlf = ( 
     
    616568  NAME    => "velocity", 
    617569  TITLE   => "Apache Velocity", 
    618   JAR     => "velocity-dep-1.5.jar", 
     570  JAR     => "velocity-1.6.3-dep.jar", 
    619571  PACKAGE => "org.apache.velocity", 
    620572  LICENSE => "Apache", 
     
    704656  \%looks, 
    705657  \%netcdf, 
    706   \%netcdfBufr, 
    707   \%netcdfGrib, 
    708658  \%slf4j, 
    709659  \%omeJava, 
     
    711661  \%omeroClient, 
    712662  \%omeroCommon, 
    713 #  \%omeroImporter, 
    714 #  \%omeroModelPSQL, 
    715663  \%skinlf, 
    716664  \%testng, 
Note: See TracChangeset for help on using the changeset viewer.