jenkins [Mon, 15 Feb 2016 09:10:24 +0000 (10:10 +0100)]
Merge branch 'hotfix/3.12.4' into develop
Conflicts:
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategyInjectionTest.java
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategyInjectionTest.xml
jenkins [Fri, 12 Feb 2016 13:44:48 +0000 (14:44 +0100)]
updating poms for branch'hotfix/3.12.4' with non-snapshot versions
Andreas Müller [Fri, 12 Feb 2016 13:41:15 +0000 (14:41 +0100)]
Fix strategy injection test
Andreas Müller [Fri, 12 Feb 2016 13:02:41 +0000 (14:02 +0100)]
Fix test for cache strategy loading
Andreas Müller [Fri, 12 Feb 2016 12:54:38 +0000 (13:54 +0100)]
Fix javassist error for specimen cache strategy loading #5545
Andreas Müller [Fri, 12 Feb 2016 13:02:41 +0000 (14:02 +0100)]
Fix test for cache strategy loading
Andreas Müller [Fri, 12 Feb 2016 12:54:38 +0000 (13:54 +0100)]
Fix javassist error for specimen cache strategy loading #5545
Andreas Müller [Thu, 11 Feb 2016 11:10:43 +0000 (12:10 +0100)]
Latest changes to markup import
jenkins [Thu, 11 Feb 2016 09:52:12 +0000 (10:52 +0100)]
updating poms for 3.12.4 branch with snapshot versions
Andreas Müller [Wed, 10 Feb 2016 15:17:57 +0000 (16:17 +0100)]
Add invasive to MarkupTransformer
Andreas Müller [Wed, 10 Feb 2016 11:09:00 +0000 (12:09 +0100)]
Add new status to Markup-Transformer
Andreas Kohlbecker [Wed, 10 Feb 2016 13:45:50 +0000 (14:45 +0100)]
Merge branch 'hotfix/3.12.3' into develop
Conflicts:
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
jenkins [Wed, 10 Feb 2016 13:39:00 +0000 (14:39 +0100)]
Merge branch 'hotfix/3.12.3'
jenkins [Wed, 10 Feb 2016 13:24:42 +0000 (14:24 +0100)]
updating poms for branch'hotfix/3.12.3' with non-snapshot versions
Andreas Kohlbecker [Wed, 10 Feb 2016 13:12:03 +0000 (14:12 +0100)]
fixing init strategy which was broken after refacoring
Andreas Müller [Tue, 9 Feb 2016 18:48:18 +0000 (19:48 +0100)]
Implement preliminary Specimen cache strategy using facade cache
strategy
Andreas Müller [Tue, 9 Feb 2016 15:16:38 +0000 (16:16 +0100)]
Improve status handling in markup import
Katja Luther [Tue, 9 Feb 2016 15:10:29 +0000 (16:10 +0100)]
adapt test for searching for name without taxon
Katja Luther [Tue, 9 Feb 2016 14:58:04 +0000 (15:58 +0100)]
adapt test for searching for name without taxon
Katja Luther [Tue, 9 Feb 2016 10:43:31 +0000 (11:43 +0100)]
fix #5538
Andreas Müller [Tue, 9 Feb 2016 10:13:51 +0000 (11:13 +0100)]
Allow recognizing forma in ranks
Andreas Müller [Tue, 9 Feb 2016 10:13:14 +0000 (11:13 +0100)]
Latest changes to markup import
Patrick Plitzner [Mon, 8 Feb 2016 13:07:35 +0000 (14:07 +0100)]
Revert last commit (taxon node handling is done in taxeditor)
Patrick Plitzner [Mon, 8 Feb 2016 12:39:03 +0000 (13:39 +0100)]
Fix potential NPE when creating a new taxon for a classfication
Andreas Müller [Fri, 5 Feb 2016 13:03:31 +0000 (14:03 +0100)]
Use correct column length annotation #5535
Andreas Kohlbecker [Fri, 5 Feb 2016 09:54:51 +0000 (10:54 +0100)]
#5532 adding missing item to init strategy
k.luther [Wed, 3 Feb 2016 14:13:22 +0000 (15:13 +0100)]
minor
k.luther [Wed, 3 Feb 2016 14:11:31 +0000 (15:11 +0100)]
check for empty excludeUuid list
Andreas Kohlbecker [Thu, 4 Feb 2016 15:01:55 +0000 (16:01 +0100)]
solving more problems which stem from previous refactoring
Andreas Kohlbecker [Thu, 4 Feb 2016 14:18:21 +0000 (15:18 +0100)]
solving problems which stem from previous refactoring
k.luther [Wed, 3 Feb 2016 14:13:22 +0000 (15:13 +0100)]
minor
cherry pick from develeop
Katja Luther [Tue, 2 Feb 2016 12:53:03 +0000 (13:53 +0100)]
new createNewTaxonNode service method
k.luther [Thu, 4 Feb 2016 08:15:39 +0000 (09:15 +0100)]
minor
Andreas Müller [Wed, 3 Feb 2016 16:29:49 +0000 (17:29 +0100)]
Minor changes to ResultSetPartitioner
Andreas Müller [Wed, 3 Feb 2016 16:14:59 +0000 (17:14 +0100)]
Fix volume range bug in name parser #5518
Andreas Müller [Wed, 3 Feb 2016 14:18:26 +0000 (15:18 +0100)]
Upgrade lucene to 5.4.1 due to bugs in 5.4.0
Andreas Müller [Fri, 29 Jan 2016 11:58:02 +0000 (12:58 +0100)]
Latest fixes for markup import
Patrick Plitzner [Wed, 3 Feb 2016 13:43:27 +0000 (14:43 +0100)]
Fix specimen retrieval by assignment status
jenkins [Wed, 3 Feb 2016 13:39:12 +0000 (14:39 +0100)]
updating poms for 3.12.3 branch with snapshot versions
Katja Luther [Tue, 2 Feb 2016 12:53:03 +0000 (13:53 +0100)]
new createNewTaxonNode service method
Andreas Kohlbecker [Mon, 1 Feb 2016 16:56:49 +0000 (17:56 +0100)]
#5506 excluding NOP logger to help SLF4J binding the desired logger
Andreas Kohlbecker [Fri, 29 Jan 2016 17:51:57 +0000 (18:51 +0100)]
comment regarding c3p0 version linkange to cdm-server
Andreas Müller [Wed, 27 Jan 2016 22:00:54 +0000 (23:00 +0100)]
Minor
Andreas Müller [Fri, 22 Jan 2016 18:03:26 +0000 (19:03 +0100)]
Javadoc
Andreas Müller [Thu, 21 Jan 2016 14:26:30 +0000 (15:26 +0100)]
Fix NPE in HibernateProxyHelper for null objects
Andreas Müller [Thu, 21 Jan 2016 12:42:22 +0000 (13:42 +0100)]
Rename persistence.xml to persistence_test.xml in cdmlib-test
Andreas Müller [Wed, 20 Jan 2016 15:50:29 +0000 (16:50 +0100)]
Minor
Andreas Müller [Wed, 20 Jan 2016 15:34:42 +0000 (16:34 +0100)]
Change xstream from 1.4.8. -> 1.4.7
Andreas Müller [Wed, 20 Jan 2016 15:24:54 +0000 (16:24 +0100)]
Latest updates to libraries #4716
Andreas Kohlbecker [Wed, 20 Jan 2016 15:14:04 +0000 (16:14 +0100)]
removing old unused foreign package
Andreas Kohlbecker [Wed, 20 Jan 2016 15:13:10 +0000 (16:13 +0100)]
documenting reason for having a fereign package
Andreas Müller [Wed, 20 Jan 2016 15:04:51 +0000 (16:04 +0100)]
Update to latest dependencies #4716
Andreas Müller [Wed, 20 Jan 2016 13:52:24 +0000 (14:52 +0100)]
Cleanup CdmTermCacher and CdmCacher
Andreas Kohlbecker [Wed, 20 Jan 2016 14:39:44 +0000 (15:39 +0100)]
cleaning up gitignore a bit
Andreas Kohlbecker [Wed, 20 Jan 2016 13:30:49 +0000 (14:30 +0100)]
switching remoting on in eclipse launcher
Andreas Kohlbecker [Wed, 20 Jan 2016 13:29:59 +0000 (14:29 +0100)]
disabling csrf mode in spring security for remoting endpoints
Andreas Kohlbecker [Wed, 20 Jan 2016 13:29:08 +0000 (14:29 +0100)]
solving probelms with running the jetty-maven plugin:
- plugin downgrade to jdk 1.7 compatible version
- downgrading xstream to jdk 1.7 compatible version
- setting user.home to target folder
Andreas Müller [Wed, 20 Jan 2016 13:13:04 +0000 (14:13 +0100)]
Minor
Andreas Müller [Wed, 20 Jan 2016 08:39:46 +0000 (09:39 +0100)]
Handle AuditEvent hibernate sequence update in CdmUpdater correctly
#4716
Andreas Müller [Tue, 19 Jan 2016 16:23:33 +0000 (17:23 +0100)]
Adapt log4j.properties to hibernate deprecated logging problem
Patrick Plitzner [Wed, 20 Jan 2016 08:45:55 +0000 (09:45 +0100)]
Change logging error to info
Andreas Müller [Tue, 19 Jan 2016 15:27:38 +0000 (16:27 +0100)]
Use more generic postgresql driver
Andreas Müller [Tue, 19 Jan 2016 15:27:38 +0000 (16:27 +0100)]
Use more generic postgresql driver
Andreas Müller [Tue, 19 Jan 2016 15:07:01 +0000 (16:07 +0100)]
Fix failing test in cdmlib-services
Andreas Müller [Tue, 19 Jan 2016 14:52:50 +0000 (15:52 +0100)]
Use correct StringUtils class
Andreas Müller [Tue, 19 Jan 2016 13:36:04 +0000 (14:36 +0100)]
minor
Andreas Müller [Tue, 19 Jan 2016 13:35:23 +0000 (14:35 +0100)]
Latest changes markup import
Andreas Müller [Tue, 19 Jan 2016 12:44:45 +0000 (13:44 +0100)]
Fix NPE in DistributionNodeByAreaLabelComparator
Andreas Kohlbecker [Mon, 18 Jan 2016 15:23:01 +0000 (16:23 +0100)]
#5479 preliminar solution for user defined presenceAbsence terms vocabularies
Andreas Müller [Thu, 14 Jan 2016 15:33:04 +0000 (16:33 +0100)]
Further fix right quotation mark parsing
Andreas Müller [Tue, 12 Jan 2016 14:12:27 +0000 (15:12 +0100)]
Add different apostroph to author name parser
Andreas Müller [Tue, 12 Jan 2016 11:36:57 +0000 (12:36 +0100)]
improve getPresenceTerm and getNamedArea in CdmImportBase
Andreas Müller [Tue, 12 Jan 2016 11:35:42 +0000 (12:35 +0100)]
Add originalRecord to excel import state and cleanup
Andreas Müller [Tue, 12 Jan 2016 11:33:43 +0000 (12:33 +0100)]
Add NomenclaturalStateType 'ined.'
Andreas Müller [Tue, 12 Jan 2016 11:33:04 +0000 (12:33 +0100)]
Add commented base code for guessBasionym function to Homotypical group
- and cleanup
Andreas Müller [Tue, 12 Jan 2016 11:30:47 +0000 (12:30 +0100)]
Cleanup
Andreas Kohlbecker [Thu, 14 Jan 2016 15:16:37 +0000 (16:16 +0100)]
#5477 circumventing bug that broke test and creating nwe test to reproduce the issue
Patrick Plitzner [Wed, 6 Jan 2016 17:26:51 +0000 (18:26 +0100)]
Add assignmentStatus as parameter to occurrence retrieval in service
method
Patrick Plitzner [Wed, 13 Jan 2016 08:48:23 +0000 (09:48 +0100)]
fix gitattributes and add derived file to gitignore
Andreas Kohlbecker [Tue, 12 Jan 2016 14:07:01 +0000 (15:07 +0100)]
lowering jetty-maven-plugin version to 9.1.3.v20140225 for compatibillity with java 1.7
Andreas Kohlbecker [Tue, 12 Jan 2016 14:05:38 +0000 (15:05 +0100)]
Revert "fixing path to spring aspect jar and updating antrun plugin"
This reverts commit
621096729bf02d85279f4520d47fab9ea330edbe.
Andreas Kohlbecker [Tue, 12 Jan 2016 11:14:16 +0000 (12:14 +0100)]
fixing path to spring aspect jar and updating antrun plugin
jenkins [Mon, 11 Jan 2016 12:50:35 +0000 (13:50 +0100)]
Merge branch 'hotfix/3.12.2'
jenkins [Mon, 11 Jan 2016 12:37:41 +0000 (13:37 +0100)]
updating poms for branch'hotfix/3.12.2' with non-snapshot versions
Andreas Kohlbecker [Mon, 11 Jan 2016 12:36:07 +0000 (13:36 +0100)]
turing of debug logging
Andreas Kohlbecker [Mon, 11 Jan 2016 12:27:24 +0000 (13:27 +0100)]
#4962 using LEFT FETCH JOIN for ranks and sec fixed problems and improves performance
jenkins [Mon, 11 Jan 2016 12:20:49 +0000 (13:20 +0100)]
updating poms for 3.12.2 branch with snapshot versions
Andreas Kohlbecker [Mon, 11 Jan 2016 12:18:01 +0000 (13:18 +0100)]
fixing project versions
Andreas Kohlbecker [Mon, 11 Jan 2016 12:07:45 +0000 (13:07 +0100)]
fixing project version
Andreas Kohlbecker [Mon, 11 Jan 2016 10:32:26 +0000 (11:32 +0100)]
setting merge driver to ours in gitattributes for all pom.xml - helps avoiding conflicts in gitflow
Andreas Kohlbecker [Mon, 11 Jan 2016 10:28:29 +0000 (11:28 +0100)]
Merge branch 'hotfix/3.12.1' into develop
Andreas Kohlbecker [Fri, 8 Jan 2016 12:30:51 +0000 (13:30 +0100)]
#4962 fixing LIE by re-adding init strategy for taxonNames
jenkins [Fri, 8 Jan 2016 08:36:51 +0000 (09:36 +0100)]
updating poms for 3.12.1 branch with snapshot versions
Andreas Müller [Wed, 6 Jan 2016 13:21:42 +0000 (14:21 +0100)]
Update to lucene 5.4 and some minor dependency updates
Andreas Müller [Wed, 6 Jan 2016 10:32:01 +0000 (11:32 +0100)]
Clean up CdmImportBase
Andreas Müller [Wed, 6 Jan 2016 10:31:35 +0000 (11:31 +0100)]
Update dependencies to the latest versions (except for lucene) #4716
Andreas Müller [Tue, 5 Jan 2016 11:43:23 +0000 (12:43 +0100)]
minor changes to ExcelImporterBase
Andreas Müller [Tue, 22 Dec 2015 13:59:43 +0000 (14:59 +0100)]
Cleanup DbImportStateBase
Andreas Kohlbecker [Tue, 22 Dec 2015 13:32:44 +0000 (14:32 +0100)]
fixing problems regarding lucene search after merge - one test still failing
Andreas Kohlbecker [Mon, 21 Dec 2015 16:04:44 +0000 (17:04 +0100)]
updating version of new maven module