Merge branch 'develop'

matthiaskoenig · Jul 1, 2016 · 890e802 · 890e802
2 parents fe96e6e + 41e0616
commit 890e802
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -71,6 +71,9 @@ git checkout -b develop --track origin/develop
 ```
 
 ## Changelog
+**v0.2.0** [2016/07/01]
+* bug fixes
+
 **v0.1.9** [2016/06/28]
 * updated test models to BiGG v1.2
 * updated test BioModels to release 30

diff --git a/pom.xml b/pom.xml
@@ -10,13 +10,13 @@
 		<osgi.api.version>4.2.0</osgi.api.version>	 
 		<org.osgi.framework.system.packages.extra>javax.xml.namespace</org.osgi.framework.system.packages.extra>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<cytoscape.api.version>3.2.1</cytoscape.api.version>
+		<cytoscape.api.version>3.4.0</cytoscape.api.version>
 	</properties>
 
 	<groupId>org.cysbml</groupId>
 	<artifactId>cy3sbml</artifactId>
 	<packaging>bundle</packaging>
-	<version>0.1.9</version>
+	<version>0.2.0</version>
 	<name>cy3sbml</name>
 	<description>A Cytoscape app for SBML.</description>
 

diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
@@ -3,8 +3,8 @@
 ################################################################################ 
 
 # Set the default levels and targets
-# log4j.rootCategory=INFO, logfile, console
-log4j.rootCategory=INFO, console
+log4j.rootCategory=INFO, logfile, console
+# log4j.rootCategory=INFO, console
 
 log4j.logger.uk.ac.ebi.miriam.lib.MiriamLink=WARN