EDIT

fix possibility to connect with mgd server

Update cdmlib version from 3.13.0-SNAPSHOT to 4.0.0-SNAPSHOT

remote webapp pom fixed for windows

setting maven test scope for cdmlib-test again

adding jackson dependencies again to default scope

serving swagger api doc in production mode (default) from static files:

• default spring profile with StaticSwaggerApiDoc controller
• swagger spring profiles with generically generated documentaiton only for integration test environments
• creating the resulting war file after running the integration tests...

excluding database drivers from cdmlib-remote-webapp.war

removing c3p0 jar from cdmlib-remote-webapp.war

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

lowering jetty-maven-plugin version to 9.1.3.v20140225 for compatibillity with java 1.7

resolving conflicts after merge of ticket_4716 into develop

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.13.0-SNAPSHOT development

reverting failed attempt to fix maven resources filtering for windows

Revert remote-webapp changes partly to test what the error is

Change remote-webapp pom to work under windows

#5397 replacing swagger-springmvc by springfox-swagger2

#4716 fixing setup of cdmlib-remote-webapp

• swagger disabled due to https://github.com/springfox/springfox/issues/1055
  • eu.etaxonomy.cdm.remote.config.CdmSpringMVCConfig.CdmSwaggerConfig.java renamed to CdmSwaggerConfig.java.disabled
  • @EnableSwagger commented in eu.etaxonomy.cdm.remote.config.CdmSpringMVCConfig...

#4716 upgrading maven jetty plugin to latest, requires java 1.8

Remove spring version from remote-webapp pom #4716

Upgrade jaxb version and to new glassfish implementation and more spring
cleanup #4716

removing obsoltete version definition in submodule pom.xml

Add os dependent file separator

Revert back early commit since it breaks jetty tests

fix the pom of remote-webapp for windows

Updating develop poms back to pre merge state

Updating develop poms to hotfix version to avoid merge conflicts

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.12.0-SNAPSHOT development

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.11.0-SNAPSHOT development

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.10.0-SNAPSHOT development

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.9.0-SNAPSHOT development

Revert "updating poms for 3.9.0-SNAPSHOT development"

This reverts commit 1a052a9893afe93249cf81603f410a4e454c305a.

updating poms for 3.9.0-SNAPSHOT development

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.8.0-SNAPSHOT development

Revert back to earlier version

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.8.0-SNAPSHOT development

Remove unnecessary version property in sub-modules

Revert back to version 3.7.0-SNAPSHOT

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.8.0-SNAPSHOT development

Revert versions back to current

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 3.14-SNAPSHOT development

updating poms for 3.13-SNAPSHOT development

updating poms for 3.12-SNAPSHOT development

updating poms for 3.11-SNAPSHOT development

updating poms for 3.10-SNAPSHOT development

updating poms for 3.9-SNAPSHOT development

updating poms for 3.8-SNAPSHOT development

Update all version to next snapshot and remove duplicate version settings

3.6.2 has just been released, setting version to 3.6.3-SNAPSHOT

bumping project version to 3.6.2-SNAPSHOT, 3.6.1 has already been released

[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release cdmlib-parent-3.6.0

adding c3p0 as test dependency - contibution to #4955

excluding all jdbc drivers from the webapp - contribution to #4955

removed vaadin dependency

[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release cdmlib-parent-3.5.1

solving problem in #4803 (Upgrade dbunit and easymock)

[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release cdmlib-parent-3.5.0

decoupling version of cdm-vaadin, to solve problems in the maven release:prepare phase

update cdmlib poms from 3.4.1-SNAPSHOT to 3.5.0-SNAPSHOT

first fully working swagger doc on the cdm remote api. Model scan ist still disabled to allow faster application startup. Remote api organized in multiple swagger groups. Adding support for swagger goups to the swagger-ui. Cuostomization of the swagger-ui: branding and adding a menu to link to the swagger groups.

activating the swagger rest service documentation by reverting the revertion of the premature committed experimental branch (swagger) svn: r21387, git: be528c1edf

pom.xml : added maven dependency goal to unpack the corresponding cdm-vaadin war into a directory in the target dir and added this directory as a resource when building the cdmlib-remote-webapp war
pom.xml, applicationContext.xml, cdmlib-remote-servlet.xml, web.xml, SpringMVCConfig.java : removed references to Vaadin...

[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release cdmlib-parent-3.4.0

adding missing log4j.properties to artifact (fixes excessive loggin on DEBUG level)

• changed version number

• merge update from trunk

[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release cdmlib-parent-3.3.5

[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release cdmlib-parent-3.3.4

[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release cdmlib-parent-3.3.3

[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release cdmlib-parent-3.3.2

[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release cdmlib-parent-3.3.1

changing ports in config to avoid conflics

automatically testing of cdmlib-remote-webapp during the maven lifecycle - #4094: automatically test cdmlib-remote-webapp

merged trunk into branch