Merge branch 'develop' into update/3.178
# Conflicts: # frontend/package-lock.json # frontend/package.json # packages/ru.cg.webbpm.packages.base.resources/.flattened-pom.xml # packages/ru.cg.webbpm.packages.base.resources/META-INF/components/docs/component/grids/NavigateOnGridCellOrRow.html # packages/ru.cg.webbpm.packages.base.resources/META-INF/package-descriptor.xml # packages/ru.cg.webbpm.packages.base.resources/component/buttons/Button.component # packages/ru.cg.webbpm.packages.base.resources/component/buttons/CancelButton.component # packages/ru.cg.webbpm.packages.base.resources/component/buttons/ClearFilterButton.component # packages/ru.cg.webbpm.packages.base.resources/component/buttons/DeleteButton.component # packages/ru.cg.webbpm.packages.base.resources/component/buttons/DownloadButton.component # packages/ru.cg.webbpm.packages.base.resources/component/buttons/ErrorButton.component # packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecProcessButton.component # packages/ru.cg.webbpm.packages.base.resources/component/buttons/ExecuteSqlButton.component # packages/ru.cg.webbpm.packages.base.resources/component/buttons/FilterButton.component # packages/ru.cg.webbpm.packages.base.resources/component/buttons/NavigationButton.component # packages/ru.cg.webbpm.packages.base.resources/component/buttons/SaveButton.component # packages/ru.cg.webbpm.packages.base.resources/component/buttons/SelectButton.component # packages/ru.cg.webbpm.packages.base.resources/component/buttons/SignButton.component # packages/ru.cg.webbpm.packages.base.resources/component/buttons/StartProcessButton.component # packages/ru.cg.webbpm.packages.base.resources/component/buttons/reporting/EntityGraphReportingButton.component # packages/ru.cg.webbpm.packages.base.resources/component/buttons/reporting/FormReportingButton.component # packages/ru.cg.webbpm.packages.base.resources/component/containers/CollapsiblePanel.component # packages/ru.cg.webbpm.packages.base.resources/component/containers/Dialog.component # packages/ru.cg.webbpm.packages.base.resources/component/containers/DropDown.component # packages/ru.cg.webbpm.packages.base.resources/component/containers/FieldSet.component # packages/ru.cg.webbpm.packages.base.resources/component/containers/FilterGroup.component # packages/ru.cg.webbpm.packages.base.resources/component/containers/Form.component # packages/ru.cg.webbpm.packages.base.resources/component/containers/HBox.component # packages/ru.cg.webbpm.packages.base.resources/component/containers/TabContainer.component # packages/ru.cg.webbpm.packages.base.resources/component/containers/TabItem.component # packages/ru.cg.webbpm.packages.base.resources/component/containers/VBox.component # packages/ru.cg.webbpm.packages.base.resources/component/containers/Window.component # packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/EditableGrid.component # packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/AutocompleteGridColumn.component # packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/CheckBoxGridColumn.component # packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ComboBoxGridColumn.component # packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/DateTimePickerGridColumn.component # packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/MoneyFieldGridColumn.component # packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/NumberFieldGridColumn.component # packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/OneToManyGridColumn.component # packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/OneToManyGridColumnV2.component # packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ReadonlyClientGridColumn.component # packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/ReadonlyServerGridColumn.component # packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/StaticComboBoxGridColumn.component # packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TextAreaGridColumn.component # packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TextFieldGridColumn.component # packages/ru.cg.webbpm.packages.base.resources/component/editable-grids/columns/TimePickerGridColumn.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/Address.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/Autocomplete.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/CheckBox.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/ComboBox.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/DateTimePicker.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/EditableOneToMany.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/FilePreview.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/FileUpload.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToMany.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/ManyToManyField.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/MoneyField.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/NumberField.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/OneToMany.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/OneToManyV2.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/RadioButton.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/SignVerification.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/StaticComboBox.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/StaticRadioButton.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/Text.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/TextArea.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/TextField.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/TimePicker.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/TreeField.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/editableonetomany/EditableGrid.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/editableonetomany/Form.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/fileupload/FileUploadField.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterAddress.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterAutocomplete.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterBoolean.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterCheckBox.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterComboBox.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterDateTimePicker.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterNumberField.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterRadioButton.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterStaticComboBox.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterTextArea.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/filters/FilterTextField.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/treefield/LinkField.component # packages/ru.cg.webbpm.packages.base.resources/component/fields/treefield/MultiValueField.component # packages/ru.cg.webbpm.packages.base.resources/component/grids/Grid.component # packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2.component # packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2Column.component # packages/ru.cg.webbpm.packages.base.resources/component/grids/GridV2Group.component # packages/ru.cg.webbpm.packages.base.resources/component/grids/PagingGrid.component # packages/ru.cg.webbpm.packages.base.resources/component/grids/TreeGrid.component # packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ActionController.component # packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/Calendar.component # packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/Chart.component # packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ChartV2.component # packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/EventCalendar.component # packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/GanttChart.component # packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/HyperLink.component # packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/IFrame.component # packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/InnerHtml.component # packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/MenuGroup.component # packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/MenuItem.component # packages/ru.cg.webbpm.packages.base.resources/component/uncategorized/ValidationController.component # packages/ru.cg.webbpm.packages.base.resources/converters/converters.jar # packages/ru.cg.webbpm.packages.base.resources/metadata/java.metadata # packages/ru.cg.webbpm.packages.base.resources/metadata/typescript.metadata.json # packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstance.component # packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstanceDiagram.component # packages/ru.cg.webbpm.packages.base.resources/process-instance/ProcessInstanceList.component # packages/ru.cg.webbpm.packages.base.resources/user-management/Groups.component # packages/ru.cg.webbpm.packages.base.resources/user-management/GroupsCreate.component # packages/ru.cg.webbpm.packages.base.resources/user-management/GroupsEdit.component # packages/ru.cg.webbpm.packages.base.resources/user-management/OrganizationEdit.component # packages/ru.cg.webbpm.packages.base.resources/user-management/Organizations.component # packages/ru.cg.webbpm.packages.base.resources/user-management/Roles.component # packages/ru.cg.webbpm.packages.base.resources/user-management/RolesEdit.component # packages/ru.cg.webbpm.packages.base.resources/user-management/SecurityFeatures.component # packages/ru.cg.webbpm.packages.base.resources/user-management/StaticRouteNavigationButton.component # packages/ru.cg.webbpm.packages.base.resources/user-management/StaticRouteSelectButton.component # packages/ru.cg.webbpm.packages.base.resources/user-management/UserForm.component # packages/ru.cg.webbpm.packages.base.resources/user-management/Users.component # packages/ru.cg.webbpm.packages.base.resources/user-management/UsersCreate.component # packages/ru.cg.webbpm.packages.base.resources/user-management/UsersEdit.component # pom.xml
This commit is contained in:
kochetkov
commit
93fb0e2b83
230 changed files with 19531 additions and 26846 deletions
109
pom.xml
109
pom.xml
|
|
@ -2,8 +2,8 @@
|
|||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>ervu_dashboard</groupId>
|
||||
<artifactId>ervu_dashboard</artifactId>
|
||||
<groupId>ru.micord.ervu</groupId>
|
||||
<artifactId>dashboard</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<modules>
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<enable.version.in.url>false</enable.version.in.url>
|
||||
<joda-time.version>2.9.2</joda-time.version>
|
||||
<webbpm-platform.version>3.177.0</webbpm-platform.version>
|
||||
<webbpm-platform.version>3.177.3</webbpm-platform.version>
|
||||
<wbp.overall-timeout>72000</wbp.overall-timeout>
|
||||
<jasperreports.version>6.15.0</jasperreports.version>
|
||||
</properties>
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
<scope>import</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>backend</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>war</type>
|
||||
|
|
@ -43,21 +43,79 @@
|
|||
<groupId>ru.cg.webbpm.packages.base</groupId>
|
||||
<artifactId>backend</artifactId>
|
||||
<version>3.178.0</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>ru.cg.webbpm.modules.bpmn</groupId>
|
||||
<artifactId>bpmn-workflow-api</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>ru.cg.webbpm.modules.bpmn</groupId>
|
||||
<artifactId>bpmn-workflow-jbpm-api</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>ru.cg.webbpm.modules.bpmn</groupId>
|
||||
<artifactId>bpmn-workflow-jbpm</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>ru.cg.webbpm.modules.bpmn</groupId>
|
||||
<artifactId>bpmn-deploy</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>ru.cg.webbpm.modules.bpmn</groupId>
|
||||
<artifactId>bpmn-beans</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>ru.cg.webbpm.modules.bpmn</groupId>
|
||||
<artifactId>bpmn-variable-condition-adapter</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>ru.cg.webbpm.modules.security</groupId>
|
||||
<artifactId>security-beans</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>ru.cg.webbpm.modules.security</groupId>
|
||||
<artifactId>security-api</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>ru.cg.webbpm.modules.security</groupId>
|
||||
<artifactId>security-esia</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>ru.cg.webbpm.modules.security</groupId>
|
||||
<artifactId>security-db-synchronization-api</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>ru.cg.webbpm.modules.security</groupId>
|
||||
<artifactId>security-db-synchronization-ldap-impl</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.springframework.security.kerberos</groupId>
|
||||
<artifactId>spring-security-kerberos-core</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.springframework.security.kerberos</groupId>
|
||||
<artifactId>spring-security-kerberos-web</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>ru.cg.webbpm.modules.security</groupId>
|
||||
<artifactId>security-adapter</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>backend</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<classifier>classes</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>frontend</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>war</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ervu_dashboard.ervu_dashboard</groupId>
|
||||
<groupId>ru.micord.ervu.dashboard</groupId>
|
||||
<artifactId>resources</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
|
|
@ -81,11 +139,6 @@
|
|||
<artifactId>metrics</artifactId>
|
||||
<version>${webbpm-platform.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ru.cg.webbpm.modules.webkit</groupId>
|
||||
<artifactId>active-users-tracker</artifactId>
|
||||
<version>${webbpm-platform.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ru.cg.webbpm.modules.resources</groupId>
|
||||
<artifactId>resources-api</artifactId>
|
||||
|
|
@ -133,38 +186,6 @@
|
|||
<artifactId>security-api</artifactId>
|
||||
<version>${webbpm-platform.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ru.cg.webbpm.modules.bpmn</groupId>
|
||||
<artifactId>bpmn-workflow-api</artifactId>
|
||||
<version>${webbpm-platform.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ru.cg.webbpm.modules.bpmn</groupId>
|
||||
<artifactId>bpmn-workflow-jbpm-api</artifactId>
|
||||
<version>${webbpm-platform.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ru.cg.webbpm.modules.bpmn</groupId>
|
||||
<artifactId>bpmn-workflow-jbpm</artifactId>
|
||||
<version>${webbpm-platform.version}</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ru.cg.webbpm.modules.bpmn</groupId>
|
||||
<artifactId>bpmn-deploy</artifactId>
|
||||
<version>${webbpm-platform.version}</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ru.cg.webbpm.modules.bpmn</groupId>
|
||||
<artifactId>bpmn-beans</artifactId>
|
||||
<version>${webbpm-platform.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ru.cg.webbpm.modules.bpmn</groupId>
|
||||
<artifactId>bpmn-variable-condition-adapter</artifactId>
|
||||
<version>${webbpm-platform.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ru.cg.webbpm.modules</groupId>
|
||||
<artifactId>webkit-rpc</artifactId>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue