Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main #86

Closed
wants to merge 10 commits into from
Closed

Main #86

wants to merge 10 commits into from

Conversation

jacekborowiec
Copy link
Collaborator

No description provided.

Oleais and others added 10 commits October 28, 2021 15:47
# Conflicts:
#	bom-project-lite/commons-bom/pom.xml
#	bom-project-lite/fh-boot-bom/pom.xml
#	bom-project-lite/fh-boot-client-bom/pom.xml
#	bom-project-lite/fh-compile-bom/pom.xml
#	bom-project-lite/fh-springboot-bom/pom.xml
#	bom-project-lite/pom.xml
#	example/pom.xml
#	fhCoreLite/basicControls/pom.xml
#	fhCoreLite/cache-standalone/pom.xml
#	fhCoreLite/chartsControls/pom.xml
#	fhCoreLite/coreApplication/pom.xml
#	fhCoreLite/coreLite/pom.xml
#	fhCoreLite/defaultApplication/pom.xml
#	fhCoreLite/fhAspects/pom.xml
#	fhCoreLite/fhCommons/pom.xml
#	fhCoreLite/fhJpa-jee/pom.xml
#	fhCoreLite/fhJpa-standalone/pom.xml
#	fhCoreLite/fhLogback/pom.xml
#	fhCoreLite/fhPersistenceLite/pom.xml
#	fhCoreLite/fhTomcat-config/pom.xml
#	fhCoreLite/integrationCoreLite/pom.xml
#	fhCoreLite/permissionProvider-jdbc/pom.xml
#	fhCoreLite/permissionProvider-rest/pom.xml
#	fhCoreLite/permissionProvider-standalone/pom.xml
#	fhCoreLite/pom.xml
#	fhCoreLite/pubsub-standalone/pom.xml
#	fhCoreLite/reportsLite/pom.xml
#	fhCoreLite/securityDataProvider-ad/pom.xml
#	fhCoreLite/securityDataProvider-cached/pom.xml
#	fhCoreLite/securityDataProvider-jdbc/pom.xml
#	fhCoreLite/securityDataProvider-ldap/pom.xml
#	fhCoreLite/securityDataProvider-remote/pom.xml
#	fhCoreLite/securityDataProvider-rest/pom.xml
#	fhCoreLite/securityDataProvider/pom.xml
#	packages/applications/default-application/package.json
#	packages/components/basic-controls/package.json
#	packages/components/charts-controls/package.json
#	packages/components/core-lite/package.json
#	pom.xml
# Conflicts:
#	bom-project-lite/commons-bom/pom.xml
#	bom-project-lite/fh-boot-bom/pom.xml
#	bom-project-lite/fh-boot-client-bom/pom.xml
#	bom-project-lite/fh-compile-bom/pom.xml
#	bom-project-lite/fh-springboot-bom/pom.xml
#	bom-project-lite/pom.xml
#	example/pom.xml
#	fh-compiler/pom.xml
#	fhCoreLite/basicControls/pom.xml
#	fhCoreLite/cache-standalone/pom.xml
#	fhCoreLite/chartsControls/pom.xml
#	fhCoreLite/coreApplication/pom.xml
#	fhCoreLite/coreLite/pom.xml
#	fhCoreLite/defaultApplication/pom.xml
#	fhCoreLite/fhAspects/pom.xml
#	fhCoreLite/fhCommons/pom.xml
#	fhCoreLite/fhJpa-jee/pom.xml
#	fhCoreLite/fhJpa-standalone/pom.xml
#	fhCoreLite/fhLogback/pom.xml
#	fhCoreLite/fhPersistenceLite/pom.xml
#	fhCoreLite/fhTomcat-config/pom.xml
#	fhCoreLite/integrationCoreLite/pom.xml
#	fhCoreLite/permissionProvider-jdbc/pom.xml
#	fhCoreLite/permissionProvider-rest/pom.xml
#	fhCoreLite/permissionProvider-standalone/pom.xml
#	fhCoreLite/pom.xml
#	fhCoreLite/pubsub-standalone/pom.xml
#	fhCoreLite/reportsLite/pom.xml
#	fhCoreLite/securityDataProvider-ad/pom.xml
#	fhCoreLite/securityDataProvider-cached/pom.xml
#	fhCoreLite/securityDataProvider-jdbc/pom.xml
#	fhCoreLite/securityDataProvider-ldap/pom.xml
#	fhCoreLite/securityDataProvider-remote/pom.xml
#	fhCoreLite/securityDataProvider-rest/pom.xml
#	fhCoreLite/securityDataProvider/pom.xml
#	fhdp/bom/fhdp-bom-standalone/pom.xml
#	fhdp/bom/fhdp-bom/pom.xml
#	fhdp/bom/fhdp-camunda-bom/pom.xml
#	fhdp/bom/fhdp-cxf-bom/pom.xml
#	fhdp/bom/pom.xml
#	fhdp/fhdp-commons/fhdp-camunda/pom.xml
#	fhdp/fhdp-commons/fhdp-commons-ad/pom.xml
#	fhdp/fhdp-commons/fhdp-commons-base/pom.xml
#	fhdp/fhdp-commons/fhdp-commons-ds-service/pom.xml
#	fhdp/fhdp-commons/fhdp-commons-els/pom.xml
#	fhdp/fhdp-commons/fhdp-commons-fh-adm/pom.xml
#	fhdp/fhdp-commons/fhdp-commons-fh-lite/pom.xml
#	fhdp/fhdp-commons/fhdp-commons-fh/pom.xml
#	fhdp/fhdp-commons/fhdp-commons-jaxb/pom.xml
#	fhdp/fhdp-commons/fhdp-commons-model/pom.xml
#	fhdp/fhdp-commons/fhdp-commons-mongo/pom.xml
#	fhdp/fhdp-commons/fhdp-commons-poi/pom.xml
#	fhdp/fhdp-commons/fhdp-commons-rest/pom.xml
#	fhdp/fhdp-commons/fhdp-commons-services/pom.xml
#	fhdp/fhdp-commons/fhdp-commons-transport/pom.xml
#	fhdp/fhdp-commons/fhdp-commons-utils/pom.xml
#	fhdp/fhdp-commons/fhdp-commons-validation/pom.xml
#	fhdp/fhdp-commons/fhdp-commons-ws/pom.xml
#	fhdp/fhdp-commons/pom.xml
#	fhdp/fhdp-components/pom.xml
#	fhdp/pom.xml
#	packages/applications/default-application/package.json
#	packages/components/basic-controls/package.json
#	packages/components/charts-controls/package.json
#	packages/components/core-lite/package.json
#	packages/components/fhdp-charts/package.json
#	packages/components/fhdp-controls/package.json
#	packages/components/fhdp-extenders/package.json
#	packages/components/fhdp-fh-starter/package.json
#	pom.xml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants