updated bundle versions and bridgedb dependencies

mkutmon · mkutmon · commit 3cb194f120de · 2016-09-20T15:59:16.000+02:00
diff --git a/build-common.xml b/build-common.xml
@@ -5,7 +5,7 @@
 	<property name="ant.build.javac.target" value="1.6"/>
 	<property name="ant.build.javac.source" value="1.6"/>
 	
-	<property name="pathvisio.version" value="3.2.2"/>
+	<property name="pathvisio.version" value="3.2.3"/>
 	<property name="bundle.dest" value=".."/>
 
 	<property name="haltonfailure" value="true"/>
diff --git a/build.xml b/build.xml
@@ -13,7 +13,7 @@
 	<property name="webstart.base.url" value="http://www.pathvisio.org/webstart"/>
 
 	<!-- needed to build zip files correctly -->
-	<property name="pathvisio.version" value="3.2.2"/>
+	<property name="pathvisio.version" value="3.2.3"/>
 	
   	<macrodef name="iterate">
 		<attribute name="target"/>
diff --git a/modules/org.pathvisio.core/META-INF/MANIFEST.MF b/modules/org.pathvisio.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PathVisio core module
 Bundle-SymbolicName: org.pathvisio.core
-Bundle-Version: 3.2.0
+Bundle-Version: 3.2.3
 Bundle-Vendor: PathVisio developers
 Export-Package: org.pathvisio.core,
  org.pathvisio.core.biopax,
@@ -17,9 +17,9 @@ Export-Package: org.pathvisio.core,
 Require-Bundle: derby;bundle-version="10.4.2000000",
  com.springsource.org.jdom;bundle-version="1.1.0",
  org.pathvisio.pdftranscoder;bundle-version="1.7.0",
- org.bridgedb;bundle-version="2.0.0",
- org.bridgedb.bio;bundle-version="2.0.0",
- org.bridgedb.rdb;bundle-version="2.0.0",
+ org.bridgedb;bundle-version="2.2.0",
+ org.bridgedb.bio;bundle-version="2.2.0",
+ org.bridgedb.rdb;bundle-version="2.2.0",
  org.apache.batik.bridge;bundle-version="1.7.0",
  org.apache.batik.css;bundle-version="1.7.0",
  org.apache.batik.dom;bundle-version="1.7.0",
diff --git a/modules/org.pathvisio.data/META-INF/MANIFEST.MF b/modules/org.pathvisio.data/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PathVisio data module
 Bundle-SymbolicName: org.pathvisio.data
-Bundle-Version: 3.2.0
+Bundle-Version: 3.2.3
 Bundle-Vendor: PathVisio developers
 Export-Package: org.pathvisio.data
-Require-Bundle: org.bridgedb;bundle-version="2.0.0",
+Require-Bundle: org.bridgedb;bundle-version="2.2.0",
  org.apache.commons.math;bundle-version="2.0.0"
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0
 Bundle-Copyright: 2006-2014 BiGCaT Bioinformatics
diff --git a/modules/org.pathvisio.desktop/META-INF/MANIFEST.MF b/modules/org.pathvisio.desktop/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PathVisio desktop module
 Bundle-SymbolicName: org.pathvisio.desktop
-Bundle-Version: 3.2.0
+Bundle-Version: 3.2.3
 Bundle-Activator: org.pathvisio.desktop.Activator
 Bundle-Vendor: PathVisio developers
 Export-Package: com.nexes.test,
@@ -25,11 +25,11 @@ Require-Bundle: org.pathvisio.core;bundle-version="3.2.0",
  org.pathvisio.jgoodies.forms;bundle-version="1.2.0",
  com.springsource.org.jdom;bundle-version="1.1.0",
  org.pathvisio.pdftranscoder;bundle-version="1.7.0",
- org.bridgedb;bundle-version="2.0.0",
- org.bridgedb.bio;bundle-version="2.0.0",
- org.bridgedb.rdb;bundle-version="2.0.0",
- org.bridgedb.rdb.construct;bundle-version="2.0.0",
- org.bridgedb.gui;bundle-version="2.0.0",
+ org.bridgedb;bundle-version="2.2.0",
+ org.bridgedb.bio;bundle-version="2.2.0",
+ org.bridgedb.rdb;bundle-version="2.2.0",
+ org.bridgedb.rdb.construct;bundle-version="2.2.0",
+ org.bridgedb.gui;bundle-version="2.2.0",
  org.apache.batik.bridge;bundle-version="1.7.0",
  org.apache.batik.css;bundle-version="1.7.0",
  org.apache.batik.dom;bundle-version="1.7.0",
diff --git a/modules/org.pathvisio.gex/META-INF/MANIFEST.MF b/modules/org.pathvisio.gex/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PathVisio gex module
 Bundle-SymbolicName: org.pathvisio.gex
-Bundle-Version: 3.2.0
+Bundle-Version: 3.2.3
 Bundle-Activator: org.pathvisio.gexplugin.Activator
 Bundle-Vendor: PathVisio developers
 Export-Package: org.pathvisio.gexplugin
@@ -12,11 +12,11 @@ Require-Bundle: org.pathvisio.core;bundle-version="3.2.0",
  org.pathvisio.desktop;bundle-version="3.2.0",
  org.pathvisio.visualization;bundle-version="3.2.0",
  org.pathvisio.jgoodies.forms;bundle-version="1.2.0",
- org.bridgedb;bundle-version="2.0.0",
- org.bridgedb.bio;bundle-version="2.0.0",
- org.bridgedb.rdb;bundle-version="2.0.0",
- org.bridgedb.rdb.construct;bundle-version="2.0.0",
- org.bridgedb.gui;bundle-version="2.0.0"
+ org.bridgedb;bundle-version="2.2.0",
+ org.bridgedb.bio;bundle-version="2.2.0",
+ org.bridgedb.rdb;bundle-version="2.2.0",
+ org.bridgedb.rdb.construct;bundle-version="2.2.0",
+ org.bridgedb.gui;bundle-version="2.2.0"
 Import-Package: org.osgi.framework;version="1.3.0"
 Bundle-Copyright: 2006-2014 BiGCaT Bioinformatics
 Bundle-DocURL: http://www.pathvisio.org
diff --git a/modules/org.pathvisio.gui/META-INF/MANIFEST.MF b/modules/org.pathvisio.gui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PathVisio gui module
 Bundle-SymbolicName: org.pathvisio.gui
-Bundle-Version: 3.2.0
+Bundle-Version: 3.2.3
 Bundle-Vendor: PathVisio developers
 Export-Package: com.jroller.completer,
  com.mammothsoftware.frwk.ddb,
@@ -17,10 +17,10 @@ Export-Package: com.jroller.completer,
 Require-Bundle: org.pathvisio.core;bundle-version="3.2.0",
  com.springsource.org.jdom;bundle-version="1.1.0",
  org.pathvisio.jgoodies.forms;bundle-version="1.2.0",
- org.bridgedb;bundle-version="2.0.0",
- org.bridgedb.bio;bundle-version="2.0.0",
- org.bridgedb.gui;bundle-version="2.0.0",
- org.bridgedb.rdb;bundle-version="2.0.0"
+ org.bridgedb;bundle-version="2.2.0",
+ org.bridgedb.bio;bundle-version="2.2.0",
+ org.bridgedb.gui;bundle-version="2.2.0",
+ org.bridgedb.rdb;bundle-version="2.2.0"
 Import-Package: javax.swing,
  javax.swing.table,
  javax.swing.text,
diff --git a/modules/org.pathvisio.launcher/META-INF/MANIFEST.MF b/modules/org.pathvisio.launcher/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.pathvisio.launcher
 Bundle-SymbolicName: org.pathvisio.launcher
-Bundle-Version: 3.2.0
+Bundle-Version: 3.2.3
 Export-Package: org.pathvisio.launcher
 Import-Package: javax.swing,
  org.osgi.framework;version="1.5.0",
diff --git a/modules/org.pathvisio.launcher/resources/version.props b/modules/org.pathvisio.launcher/resources/version.props
@@ -1,3 +1,3 @@
 
-pathvisio.version = 3.2.2
+pathvisio.version = 3.2.3
 		
diff --git a/modules/org.pathvisio.pluginmanager/META-INF/MANIFEST.MF b/modules/org.pathvisio.pluginmanager/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PathVisio-PluginManager
 Bundle-SymbolicName: org.pathvisio.pluginmanager
-Bundle-Version: 3.2.0
+Bundle-Version: 3.2.3
 Bundle-Activator: org.pathvisio.pluginmanager.Activator
 Bundle-Vendor: PathVisio developers
 Export-Package: org.pathvisio.pluginmanager,
diff --git a/modules/org.pathvisio.statistics/META-INF/MANIFEST.MF b/modules/org.pathvisio.statistics/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PathVisio statistics module
 Bundle-SymbolicName: org.pathvisio.statistics
-Bundle-Version: 3.2.0
+Bundle-Version: 3.2.3
 Bundle-Activator: org.pathvisio.statistics.Activator
 Bundle-Vendor: PathVisio developers
 Export-Package: org.pathvisio.statistics
@@ -11,9 +11,9 @@ Require-Bundle: org.pathvisio.core;bundle-version="3.2.0",
  org.pathvisio.desktop;bundle-version="3.2.0",
  org.pathvisio.gui;bundle-version="3.2.0",
  org.pathvisio.jgoodies.forms;bundle-version="1.2.0",
- org.bridgedb;bundle-version="2.0.0",
- org.bridgedb.gui;bundle-version="2.0.0",
- org.bridgedb.bio;bundle-version="2.0.0"
+ org.bridgedb;bundle-version="2.2.0",
+ org.bridgedb.gui;bundle-version="2.2.0",
+ org.bridgedb.bio;bundle-version="2.2.0"
 Import-Package: org.osgi.framework;version="1.5.0"
 Bundle-Copyright: 2006-2014 BiGCaT Bioinformatics
 Bundle-DocURL: http://www.pathvisio.org
diff --git a/modules/org.pathvisio.visualization/META-INF/MANIFEST.MF b/modules/org.pathvisio.visualization/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PathVisio visualization module
 Bundle-SymbolicName: org.pathvisio.visualization
-Bundle-Version: 3.2.0
+Bundle-Version: 3.2.3
 Bundle-Activator: org.pathvisio.visualization.Activator
 Bundle-Vendor: PathVisio developers
 Export-Package: org.pathvisio.visualization,
@@ -14,10 +14,10 @@ Require-Bundle: org.pathvisio.core;bundle-version="3.2.0",
  org.pathvisio.desktop;bundle-version="3.2.0",
  org.pathvisio.jgoodies.forms;bundle-version="1.2.0",
  com.springsource.org.jdom;bundle-version="1.1.0",
- org.bridgedb;bundle-version="2.0.0",
- org.bridgedb.bio;bundle-version="2.0.0",
- org.bridgedb.gui;bundle-version="2.0.0",
- org.bridgedb.rdb;bundle-version="2.0.0"
+ org.bridgedb;bundle-version="2.2.0",
+ org.bridgedb.bio;bundle-version="2.2.0",
+ org.bridgedb.gui;bundle-version="2.2.0",
+ org.bridgedb.rdb;bundle-version="2.2.0"
 Import-Package: org.osgi.framework;version="1.3.0"
 Bundle-Copyright: 2006-2014 BiGCaT Bioinformatics
 Bundle-DocURL: http://www.pathvisio.org
diff --git a/pathvisio.iss b/pathvisio.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 ; requires ISPP (InnoSetup Pre-Processor) to be installed.
-#define AppVerStr "3.2.2"
+#define AppVerStr "3.2.3"
 
 [Setup]
 AppName=PathVisio

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`
`2`		`-pathvisio.version = 3.2.2`
	`2`	`+pathvisio.version = 3.2.3`
`3`	`3`