corrected pom merge
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/.gitignore eu.etaxonomy.taxeditor.cdmlib/pom.xml eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java...
removed reference to cdm-server
Updating develop poms back to pre merge state
Updating develop poms to hotfix version to avoid merge conflicts
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
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
eu.etaxonomy.taxeditor.product.with.jre : removed since the jre bundling is done on jenkins ApplicationUtil : added UTC to beta version string eu.etaxonomy.taxeditor.cdmlib/pom.xml : fixes problem with clean validate - ticket #4733
Updated version in config files to 3.5.1-SNAPSHOT
Updated version in config files to 3.5.0
update taxeditor version from 3.4.1 to 3.5.0
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
ICdmEntitySessionManager, CdmEntitySessionManager, MockCdmEntitySessionManager : removed cdm entity session access methods CdmServiceInterceptorException, CdmServiceRequestExecutor, TermServiceRequestExecutor : New executor classes to be used to execute intercept remote service requests starting with the term service...
updated manifest for deleted test dir removed unnecessary commit root entity methods in session and session manager
merge-update from trunk
increased version number
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
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
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
Updated version in config files to 3.2.2-SNAPSHOT
Updated version in config files to 3.2.1
Updated version in config files to 3.2.1-SNAPSHOT
Updated version in config files to 3.2.0
Updated version in config files to 3.2.0-SNAPSHOT
Updated version in config files to 3.1.4-SNAPSHOT
Updated version in config files to 3.1.3
added ant task,
bumping version to 3.1.3-SNAPSHOT after release
updates for release 3.1.2
removed duplicate identificationkey dependency
Moving trunk from 3.2-SNAPSHOT to 3.1.2-SNAPSHOT to be in sync with the latest cdmlib snapshot
bumping up trunk version to 3.2 SNAPSHOT
setting release version number for release 3.1.0
merge of trunk to the security branch
adding missing dependency and switching to cdmlib 3.0.13 RELEASE
merging in latest changes from trunk, up to r15854 (editor starts without issues)
create TaxEditor 3.0.12-SNAPSHOT version
TaxEditor release 3.0.11
change taxeditor trunk to 3.0.11-SNAPSHOT
taxeditor 3.0.10 Release performed
Bumped trunk to version 3.0.10-SNAPSHOT
Preparing 3.0.9 release version
mvn validate now works from inside cdmlib again. This should cater for much shorter dependency resolution times. Sources get copied over again, as well.
Bumping version to 3.0.9
bumping version number to 3.0.7 for release
Pom changes to enable fully automated tycho build and MANIFEST first development in eclipse aside
Buckminster is dead, long live Tycho. The complete build can now be fully automated with eclipse tycho, Thus we will be able to have continous integration for the editor and automated builds by jenkins and all the glory. Removed all buckminster related files.
automatic
had to rename the packages to make them compliant with buckminster