Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'dev_4_3' into 4_3

  • Loading branch information...
commit bb54cc73d5977f41baea2fbe573d3d5272dc5898 2 parents 451d446 + e8c0e76
Melissa Linkert authored September 14, 2011
2  ant/common.xml
@@ -52,7 +52,7 @@ Type "ant -p" for a list of targets.
52 52
     </if>
53 53
 
54 54
     <!-- set release version from repository URL -->
55  
-    <property name="release.version" value="4.3.2-DEV"/>
  55
+    <property name="release.version" value="4.3.2"/>
56 56
   </target>
57 57
 
58 58
 </project>
2  components/bio-formats/build.properties
@@ -8,7 +8,7 @@
8 8
 
9 9
 component.name           = bio-formats
10 10
 component.jar            = bio-formats.jar
11  
-component.version        = 4.3.2-DEV
  11
+component.version        = 4.3.2
12 12
 component.classpath      = ${artifact.dir}/jai_imageio.jar:\
13 13
                            ${artifact.dir}/loci-common.jar:\
14 14
                            ${artifact.dir}/lwf-stubs.jar:\
2  components/bio-formats/doc/whats-new.txt
@@ -13,7 +13,7 @@
13 13
   - Bruker MRI
14 14
 * Updated Zeiss LSM reader to parse application tags
15 15
 * Various performance improvements, particularly for reading/writing TIFFs
16  
-* Updated OMERO ImageJ plugin to work with OMERO 4.3.x
  16
+* Updated OMERO reader implementation to work with OMERO 4.3.x
17 17
 
18 18
 4.3.1 (2011 July 8):
19 19
 * Several bug fixes, including:
2  components/bio-formats/pom.xml
@@ -8,7 +8,7 @@
8 8
   <parent>
9 9
     <groupId>loci</groupId>
10 10
     <artifactId>bio-formats-base</artifactId>
11  
-    <version>4.3.2-SNAPSHOT</version>
  11
+    <version>4.3.2</version>
12 12
   </parent>
13 13
 
14 14
   <artifactId>bio-formats</artifactId>
2  components/bio-formats/src/loci/formats/FormatTools.java
@@ -160,7 +160,7 @@
160 160
   public static final String DATE = "@date@";
161 161
 
162 162
   /** Version number of this release. */
163  
-  public static final String VERSION = "4.3.2-DEV";
  163
+  public static final String VERSION = "4.3.2";
164 164
 
165 165
   // -- Constants - domains --
166 166
 
2  components/common/build.properties
@@ -8,7 +8,7 @@
8 8
 
9 9
 component.name           = loci-common
10 10
 component.jar            = loci-common.jar
11  
-component.version        = 4.3.2-DEV
  11
+component.version        = 4.3.2
12 12
 component.classpath      = ${lib.dir}/slf4j-api-1.5.10.jar:\
13 13
                            ${lib.dir}/testng-5.11-jdk15.jar
14 14
 component.java-version   = 1.5
2  components/common/pom.xml
@@ -8,7 +8,7 @@
8 8
   <parent>
9 9
     <groupId>loci</groupId>
10 10
     <artifactId>bio-formats-base</artifactId>
11  
-    <version>4.3.2-SNAPSHOT</version>
  11
+    <version>4.3.2</version>
12 12
   </parent>
13 13
 
14 14
   <artifactId>loci-common</artifactId>
2  components/forks/jai/pom.xml
@@ -8,7 +8,7 @@
8 8
   <parent>
9 9
     <groupId>loci</groupId>
10 10
     <artifactId>bio-formats-base</artifactId>
11  
-    <version>4.3.2-SNAPSHOT</version>
  11
+    <version>4.3.2</version>
12 12
   </parent>
13 13
 
14 14
   <artifactId>jai_imageio</artifactId>
2  components/forks/mdbtools/pom.xml
@@ -8,7 +8,7 @@
8 8
   <parent>
9 9
     <groupId>loci</groupId>
10 10
     <artifactId>bio-formats-base</artifactId>
11  
-    <version>4.3.2-SNAPSHOT</version>
  11
+    <version>4.3.2</version>
12 12
   </parent>
13 13
 
14 14
   <artifactId>mdbtools-java</artifactId>
2  components/forks/poi/pom.xml
@@ -8,7 +8,7 @@
8 8
   <parent>
9 9
     <groupId>loci</groupId>
10 10
     <artifactId>bio-formats-base</artifactId>
11  
-    <version>4.3.2-SNAPSHOT</version>
  11
+    <version>4.3.2</version>
12 12
   </parent>
13 13
 
14 14
   <artifactId>poi-loci</artifactId>
2  components/legacy/ome-editor/pom.xml
@@ -8,7 +8,7 @@
8 8
   <parent>
9 9
     <groupId>loci</groupId>
10 10
     <artifactId>bio-formats-base</artifactId>
11  
-    <version>4.3.2-SNAPSHOT</version>
  11
+    <version>4.3.2</version>
12 12
   </parent>
13 13
 
14 14
   <artifactId>ome-editor</artifactId>
2  components/legacy/ome-notes/pom.xml
@@ -8,7 +8,7 @@
8 8
   <parent>
9 9
     <groupId>loci</groupId>
10 10
     <artifactId>bio-formats-base</artifactId>
11  
-    <version>4.3.2-SNAPSHOT</version>
  11
+    <version>4.3.2</version>
12 12
   </parent>
13 13
 
14 14
   <artifactId>ome-notes</artifactId>
2  components/loci-plugins/build.properties
@@ -8,7 +8,7 @@
8 8
 
9 9
 component.name           = loci_plugins
10 10
 component.jar            = loci_plugins.jar
11  
-component.version        = 4.3.2-DEV
  11
+component.version        = 4.3.2
12 12
 component.classpath      = ${artifact.dir}/bio-formats.jar:\
13 13
                            ${artifact.dir}/loci-common.jar:\
14 14
                            ${artifact.dir}/ome-xml.jar:\
2  components/loci-plugins/pom.xml
@@ -8,7 +8,7 @@
8 8
   <parent>
9 9
     <groupId>loci</groupId>
10 10
     <artifactId>bio-formats-base</artifactId>
11  
-    <version>4.3.2-SNAPSHOT</version>
  11
+    <version>4.3.2</version>
12 12
   </parent>
13 13
 
14 14
   <artifactId>loci_plugins</artifactId>
2  components/loci-plugins/src/loci/plugins/Updater.java
@@ -66,7 +66,7 @@
66 66
   public static final String STABLE_BUILD =
67 67
     "http://loci.wisc.edu/software/loci_tools.jar";
68 68
 
69  
-  public static final String STABLE_VERSION = "4.2-DEV";
  69
+  public static final String STABLE_VERSION = "4.3.2";
70 70
 
71 71
   public static final String REGISTRY = "http://upgrade.openmicroscopy.org.uk";
72 72
 
2  components/metakit/build.properties
@@ -8,7 +8,7 @@
8 8
 
9 9
 component.name           = metakit
10 10
 component.jar            = metakit.jar
11  
-component.version        = 4.3.2-DEV
  11
+component.version        = 4.3.2
12 12
 component.classpath      = ${artifact.dir}/loci-common.jar:\
13 13
                            ${lib.dir}/log4j-1.2.15.jar:\
14 14
                            ${lib.dir}/slf4j-api-1.5.10.jar:\
2  components/metakit/pom.xml
@@ -8,7 +8,7 @@
8 8
   <parent>
9 9
     <groupId>loci</groupId>
10 10
     <artifactId>bio-formats-base</artifactId>
11  
-    <version>4.3.2-SNAPSHOT</version>
  11
+    <version>4.3.2</version>
12 12
   </parent>
13 13
 
14 14
   <artifactId>metakit</artifactId>
2  components/ome-io/build.properties
@@ -8,7 +8,7 @@
8 8
 
9 9
 component.name           = ome-io
10 10
 component.jar            = ome-io.jar
11  
-component.version        = 4.3.2-DEV
  11
+component.version        = 4.3.2
12 12
 component.classpath      = ${artifact.dir}/bio-formats.jar:\
13 13
                            ${artifact.dir}/loci-common.jar:\
14 14
                            ${lib.dir}/log4j-1.2.15.jar:\
2  components/ome-io/pom.xml
@@ -8,7 +8,7 @@
8 8
   <parent>
9 9
     <groupId>loci</groupId>
10 10
     <artifactId>bio-formats-base</artifactId>
11  
-    <version>4.3.2-SNAPSHOT</version>
  11
+    <version>4.3.2</version>
12 12
   </parent>
13 13
 
14 14
   <artifactId>ome-io</artifactId>
2  components/ome-plugins/build.properties
@@ -8,7 +8,7 @@
8 8
 
9 9
 component.name           = ome_plugins
10 10
 component.jar            = ome_plugins.jar
11  
-component.version        = 4.3.2-DEV
  11
+component.version        = 4.3.2
12 12
 component.classpath      = ${artifact.dir}/bio-formats.jar:\
13 13
                            ${artifact.dir}/loci-common.jar:\
14 14
                            ${artifact.dir}/loci_plugins.jar:\
2  components/ome-plugins/pom.xml
@@ -8,7 +8,7 @@
8 8
   <parent>
9 9
     <groupId>loci</groupId>
10 10
     <artifactId>bio-formats-base</artifactId>
11  
-    <version>4.3.2-SNAPSHOT</version>
  11
+    <version>4.3.2</version>
12 12
   </parent>
13 13
 
14 14
   <artifactId>ome_plugins</artifactId>
2  components/ome-xml/build.properties
@@ -8,7 +8,7 @@
8 8
 
9 9
 component.name           = ome-xml
10 10
 component.jar            = ome-xml.jar
11  
-component.version        = 4.3.2-DEV
  11
+component.version        = 4.3.2
12 12
 component.classpath      = ${lib.dir}/slf4j-api-1.5.10.jar:\
13 13
                            ${lib.dir}/testng-5.11-jdk15.jar
14 14
 component.java-version   = 1.5
2  components/ome-xml/pom.xml
@@ -8,7 +8,7 @@
8 8
   <parent>
9 9
     <groupId>loci</groupId>
10 10
     <artifactId>bio-formats-base</artifactId>
11  
-    <version>4.3.2-SNAPSHOT</version>
  11
+    <version>4.3.2</version>
12 12
   </parent>
13 13
 
14 14
   <artifactId>ome-xml</artifactId>
2  components/stubs/lwf-stubs/pom.xml
@@ -8,7 +8,7 @@
8 8
   <parent>
9 9
     <groupId>loci</groupId>
10 10
     <artifactId>bio-formats-base</artifactId>
11  
-    <version>4.3.2-SNAPSHOT</version>
  11
+    <version>4.3.2</version>
12 12
   </parent>
13 13
 
14 14
   <artifactId>lwf-stubs</artifactId>
2  components/test-suite/pom.xml
@@ -8,7 +8,7 @@
8 8
   <parent>
9 9
     <groupId>loci</groupId>
10 10
     <artifactId>bio-formats-base</artifactId>
11  
-    <version>4.3.2-SNAPSHOT</version>
  11
+    <version>4.3.2</version>
12 12
   </parent>
13 13
 
14 14
   <artifactId>test-suite</artifactId>
2  pom.xml
@@ -7,7 +7,7 @@
7 7
 
8 8
   <groupId>loci</groupId>
9 9
   <artifactId>bio-formats-base</artifactId>
10  
-  <version>4.3.2-SNAPSHOT</version>
  10
+  <version>4.3.2</version>
11 11
   <packaging>pom</packaging>
12 12
 
13 13
   <name>Bio-Formats projects</name>

0 notes on commit bb54cc7

Please sign in to comment.
Something went wrong with that request. Please try again.