Merge remote-tracking branch 'origin/unstable' into testing
authorMathieu Baudier <mbaudier@argeo.org>
Sun, 27 Feb 2022 08:15:32 +0000 (09:15 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Sun, 27 Feb 2022 08:15:32 +0000 (09:15 +0100)
commitd64292c93f4a3532576e98f651344d89e883e2aa
treedd7481130c92ecfbd3c7b43c070c579aaf3a70c3
parent55461ec5f0be676c440d89c7e6910bb29fb62be3
parent4a86368ca99d452ececdbc575953e0940526918a
Merge remote-tracking branch 'origin/unstable' into testing

Conflicts:
cms/org.argeo.cms.integration/pom.xml
cms/org.argeo.ext.equinox.jetty/pom.xml
cms/pom.xml
cnf/build.bnd
dep/org.argeo.slc.dep.e4.rap/pom.xml
dep/org.argeo.slc.dep.minimal/pom.xml
dep/pom.xml
ide/features/pom.xml
ide/plugins/pom.xml
ide/pom.xml
legacy/argeo-commons/pom.xml
legacy/dep/org.argeo.slc.dep.backend/pom.xml
legacy/dep/org.argeo.slc.dep.spring/pom.xml
legacy/dep/pom.xml
legacy/lib/pom.xml
legacy/org.argeo.legacy.fake.java8/pom.xml
legacy/org.argeo.slc.agent.jcr/pom.xml
legacy/org.argeo.slc.agent/pom.xml
legacy/org.argeo.slc.client.rap/pom.xml
legacy/org.argeo.slc.client.ui.dist/pom.xml
legacy/org.argeo.slc.client.ui/pom.xml
legacy/org.argeo.slc.demo.ant/pom.xml
legacy/org.argeo.slc.demo.basic/pom.xml
legacy/org.argeo.slc.demo.minimal/pom.xml
legacy/org.argeo.slc.launcher/pom.xml
legacy/org.argeo.slc.server.repo/pom.xml
legacy/org.argeo.slc.spring/pom.xml
legacy/org.argeo.slc.support/pom.xml
legacy/pom.xml
org.argeo.slc.api/pom.xml
org.argeo.slc.factory/pom.xml
org.argeo.slc.jcr/pom.xml
org.argeo.slc.repo/pom.xml
org.argeo.slc.runtime/pom.xml
pom.xml
.gitmodules
.project
branch.mk
cnf/argeo.bnd
cnf/build.bnd
cnf/maven.bnd
cnf/testing.bnd
sdk/output-argeo-tp-rap.target
sdk/output-argeo-tp-rcp.target