Revert "Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT"
This reverts commit 9524fa3910c8335a6cbcb656f9aacaca01a3f5ca.
Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT
Fix merge
Merge branch 'develop' into remoting-4.0
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.cdmlib/build.properties eu.etaxonomy.taxeditor.cdmlib/pom.xml
Fix versions
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.cdmlib/build.properties
Correct versions
Updated version in pom / project files to taxeditor version : 3.10.0-SNAPSHOT and cdmlib version : 3.10.0-SNAPSHOT
Fix incorrect merge
Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT
Revert "Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT"
This reverts commit 7ed2ce1e9eca6a9dd72c740e72efdcd6ef1135c9.
Correct serialised cdm map location
#4932 Remove autowired members, Use serliaised cdm model map
Conflicts: eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF...
Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 3.7.0 and cdmlib version : 3.7.0
Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
Add log4j extras to apply expression filters
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Update cdmlib version to 3.6.3-SNAPSHOT
corrected merge to latest snapshot version updated hibernate config file and test db setup testing framework with jetty and maven
fixed update to snapshot
version updates for 3.6.1
fixing classpath config
Release 3.6.0 merge
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Conflicts: .gitattributes eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java...
Updated version in config files to 3.6.1-SNAPSHOT
Updated version in config files to 3.6.0
eu.etaxonomy.taxeditor.cdmlib/.classpath, eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF, eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF : moved test jars to test project eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF : added packages required by test project to exported package list...
Merge branch 'move-to-luna' into remoting-4.0
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.cdmlib/build.properties eu.etaxonomy.taxeditor.cdmlib/pom.xml eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml...
.classpath, MANIFEST.MF, build.properties, pom.xml : added cdm-server jar to lib dir and project classpath /lib : added ignore for cdm-server jar CacheLoader : reverted update of cached entity field cdmlib-remote-webapp.war : updated to latest version
Updated version in config files to 3.5.2-SNAPSHOT
Updated version in config files to 3.5.1
Updated version in config files to 3.5.1-SNAPSHOT
Updated version in config files to 3.5.0
3.4.1->3.5.0 in MANIFEST
wrong target revision in the last commit
reverting back wrongly committed files
Updated version in config files to 3.4.1-SNAPSHOT
Updated version in config files to 3.4.0
merge from trunk
upgrade poi to 3.10-FINAL and add ooxml functionality
updated manifest for deleted test dir removed unnecessary commit root entity methods in session and session manager
last fix for revision number of classpath
changed classpath to 3.5.0
merge-update from trunk
Updated version in config files to 3.3.8-SNAPSHOT
Updated version in config files to 3.3.7
Updated version in config files to 3.3.7-SNAPSHOT
Updated version in config files to 3.3.6
updating ehcache to 2.6.9
Updated version in config files to 3.3.6-SNAPSHOT
Updated version in config files to 3.3.5
Updated version in config files to 3.3.5-SNAPSHOT
Updated version in config files to 3.3.4
Updated version in config files to 3.3.4-SNAPSHOT
Updated version in config files to 3.3.3
Updated version in config files to 3.3.3-SNAPSHOT
Updated version in config files to 3.3.2
Updated version in config files to 3.3.2-SNAPSHOT
Updated version in config files to 3.3.1
updaed build properties to include source / resource files when packaging with maven
erging from remoting-1.0 branch
Updated version in config files to 3.3.1-SNAPSHOT
Updated version in config files to 3.3.0
Updated version in config files to 3.3.0-SNAPSHOT
Updated version in config files to 3.2.4-SNAPSHOT
Updated version in config files to 3.2.3
Updated version in config files to 3.2.3-SNAPSHOT
Updated version in config files to 3.2.2
added h2mig jar to trunk
adding updated manifest and remaining jars
Updated version in config files to 3.2.2-SNAPSHOT