EDIT

Updated version in pom / project files to taxeditor version : 5.42.0 and cdmlib version : 5.42.0

Updated version in pom / project files to taxeditor version : 5.42.0-SNAPSHOT and cdmlib version : 5.42.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.41.0-SNAPSHOT and cdmlib version : 5.41.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.40.0-SNAPSHOT and cdmlib version : 5.40.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.39.0-SNAPSHOT and cdmlib version : 5.39.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.38.0-SNAPSHOT and cdmlib version : 5.38.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.37.0-SNAPSHOT and cdmlib version : 5.37.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.36.0-SNAPSHOT and cdmlib version : 5.36.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.35.0-SNAPSHOT and cdmlib version : 5.35.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.34.0-SNAPSHOT and cdmlib version : 5.34.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.33.0-SNAPSHOT and cdmlib version : 5.33.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.32.0-SNAPSHOT and cdmlib version : 5.32.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.31.0-SNAPSHOT and cdmlib version : 5.31.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.30.0-SNAPSHOT and cdmlib version : 5.30.0-SNAPSHOT

ref #9359 updating junit and joda-time to latest version in taxeditor (cont.)

Updated version in pom / project files to taxeditor version : 5.29.0-SNAPSHOT and cdmlib version : 5.29.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.28.0-SNAPSHOT and cdmlib version : 5.28.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.27.0-SNAPSHOT and cdmlib version : 5.27.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.26.0-SNAPSHOT and cdmlib version : 5.26.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.25.0-SNAPSHOT and cdmlib version : 5.25.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.24.0-SNAPSHOT and cdmlib version : 5.24.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.23.0-SNAPSHOT and cdmlib version : 5.23.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.22.0-SNAPSHOT and cdmlib version : 5.22.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.21.0-SNAPSHOT and cdmlib version : 5.21.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.20.0-SNAPSHOT and cdmlib version : 5.20.0-SNAPSHOT

missed to commit adapted manifest

Updated version in pom / project files to taxeditor version : 5.13.1 and cdmlib version : 5.13.0

Updated version in pom / project files to taxeditor version : 5.19.0-SNAPSHOT and cdmlib version : 5.19.0-SNAPSHOT

ref #9204 update junit to 4.13.1 in TaxEditor

ref #9190: rename webapp to local

ref #9190: rename webapp to local

cleanup

create new branch webapp

ref #9204 handle commons-dbcp and commons-pool in taxeditor.cdmlib and taxeditor.test

ref #9204 fix hamcrest-core-1.3 handling

ref #9204 add junit and hamcrest also to taxeditor.test so it can be removed from taxeditor.cdmlib in future

ref #9204 add commons-dbcp and commons-pool to taxeditor-test

ref #9204 revert dbunit in taxeditor.test to 2.4.9

ref #9204 remove dbunit from taxeditor.cdmlib and upgrade to 2.7.0 in taxeditor.test

ref #9204 reattache c3p0 to taxeditor main and revert unitils version to 3.4.2

ref #9204 add c3p0 to tests

ref #9204 upgrade and remove further libraries in taxeditor (including commons-lang und unitils)

Updated version in pom / project files to taxeditor version : 5.18.0-SNAPSHOT and cdmlib version : 5.18.0-SNAPSHOT

remove springframework.context 3.2.2 from taxeditor.test

ref #5752 add h2-1.4.200 to taxeditor.test

Updated version in pom / project files to taxeditor version : 5.17.0-SNAPSHOT and cdmlib version : 5.17.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.16.0-SNAPSHOT and cdmlib version : 5.16.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.15.0-SNAPSHOT and cdmlib version : 5.15.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.14.0-SNAPSHOT and cdmlib version : 5.14.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.13.0-SNAPSHOT and cdmlib version : 5.13.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.12.0-SNAPSHOT and cdmlib version : 5.12.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.11.0-SNAPSHOT and cdmlib version : 5.11.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.10.0-SNAPSHOT and cdmlib version : 5.10.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.9.0-SNAPSHOT and cdmlib version : 5.9.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.8.0-SNAPSHOT and cdmlib version : 5.8.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.7.0-SNAPSHOT and cdmlib version : 5.7.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.6.0-SNAPSHOT and cdmlib version : 5.6.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.5.0-SNAPSHOT and cdmlib version : 5.5.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.4.0-SNAPSHOT and cdmlib version : 5.4.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.3.0-SNAPSHOT and cdmlib version : 5.3.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 5.2.0-SNAPSHOT and cdmlib version : 5.2.0-SNAPSHOT

Fix version number for develop build

Updated version in pom / project files to taxeditor version : 5.1.0 and cdmlib version : 5.1.0

Updated version in pom / project files to taxeditor version : 4.16.0-SNAPSHOT and cdmlib version : 4.16.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 4.15.0-SNAPSHOT and cdmlib version : 4.15.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 4.14.0-SNAPSHOT and cdmlib version : 4.14.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 4.13.0-SNAPSHOT and cdmlib version : 4.13.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 4.12.0-SNAPSHOT and cdmlib version : 4.12.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 4.11.0-SNAPSHOT and cdmlib version : 4.11.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 4.10.0-SNAPSHOT and cdmlib version : 4.10.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 4.9.0-SNAPSHOT and cdmlib version : 4.9.0-SNAPSHOT

Updated version in pom / project files to taxeditor version : 4.8.0-SNAPSHOT and cdmlib version : 4.8.0-SNAPSHOT

ref #6539 Move to Eclipse 4 compatibility layer

• adapt rcp.target and feature.platform
• updated repositories in pom.xml
• fixed some incompatibility compile errors

ref #6539 Fix build problems

• set Bundle-RequiredExecutionEnvironment back to Java 1.8
• Remove indigo osgi dependency from target platform

ref #6539 remove Bundle-RequiredExecutionEnvironment

Increase RequiredExecutionEnvironment to JavaSE-1.8 for test, releated to 45cabe7d

Updated version in pom / project files to taxeditor version : 4.7.0-SNAPSHOT and cdmlib version : 4.7.0-SNAPSHOT

fixing bundle and tycho plugin config

manually set version numbers

ref #6124 fixing Bundle-Version

#5751 Try to fix dependency copy in taxeditor.wepapp (IX)

#5751 Try to fix dependency copy in taxeditor.wepapp (VIII)

bumping eu.etaxonomy.taxeditor.test to version 4.0.0-SNAPSHOT

Update taxeditor-test manifest version to 3.13

#4073 Add new project for lanuching embedded jetty server using cdmlib webapp

#4073 Add jetty server dependencies

#4073 Add stop start possibility for server

#4073 Add functionality to control managed server in login dialog

#4073 Add start / stop methods for managed server...

Update eclipse compile / runtime to JavaSE-1.7

Conflicts:
eu.etaxonomy.taxeditor.application/.classpath

Fix versions

Update test versions

Update test version numbers

Correct osgi version

#4073 Initial implementation of local cdm-server

Use new find method with update

corrected merge to latest snapshot version
updated hibernate config file and test db
setup testing framework with jetty and maven

reset swtbot dependencies and set all swtbot tests to ignore for the moment

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...

updated version numbers

fixed problems with merge

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...

MANIFEST.MF, feature.xml : removed dependency on specific versions
rcp.target : added vm arguments

corrected target definition