This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git
from 9098c013f2 NIFI-12300 Add OAuth2 Support to RestLookupService (#8462) add a20c5d9dff NIFI-13073 Changed Flow Version from int to String No new revisions were added by this update. Summary of changes: .../nifi/flow/VersionedExternalFlowMetadata.java | 6 +-- .../apache/nifi/flow/VersionedFlowCoordinates.java | 6 +-- .../nifi/registry/flow/FlowRegistryClient.java | 14 +++--- .../apache/nifi/registry/flow/RegisterAction.java | 15 +++---- .../nifi/registry/flow/RegisteredFlowSnapshot.java | 7 ++- .../flow/RegisteredFlowSnapshotMetadata.java | 6 +-- .../flow/NifiRegistryFlowRegistryClient.java | 39 +++++++++++----- .../nifi/registry/flow/NifiRegistryUtil.java | 4 +- .../web/api/dto/VersionControlInformationDTO.java | 6 +-- .../StandardVersionedComponentSynchronizer.java | 2 +- .../apache/nifi/groups/StandardProcessGroup.java | 10 ++--- .../flow/FlowAnalyzingRegistryClientNode.java | 9 ++-- .../flow/StandardFlowRegistryClientNode.java | 13 +++--- .../flow/StandardVersionControlInformation.java | 10 ++--- .../flow/FlowAnalyzingRegistryClientNodeTest.java | 20 ++++++--- .../nifi/registry/flow/FlowRegistryClientNode.java | 7 +-- .../registry/flow/GhostFlowRegistryClient.java | 9 ++-- .../registry/flow/VersionControlInformation.java | 2 +- .../flow/mapping/NiFiRegistryFlowMapperTest.java | 2 +- .../org/apache/nifi/web/NiFiServiceFacade.java | 5 ++- .../apache/nifi/web/StandardNiFiServiceFacade.java | 21 ++++----- .../org/apache/nifi/web/api/VersionsResource.java | 2 +- .../nifi/web/dao/impl/StandardFlowRegistryDAO.java | 3 +- .../apache/nifi/web/api/TestVersionsResource.java | 2 +- .../app/pages/flow-designer/state/flow/index.ts | 17 +------ .../change-version-dialog.spec.ts | 6 +-- .../change-version-dialog/change-version-dialog.ts | 12 ++++- .../import-from-registry.component.ts | 28 ++++++++++-- .../local-changes-dialog.spec.ts | 2 +- .../_save-version-dialog.component-theme.scss | 5 --- .../save-version-dialog.component.html | 10 ++--- .../save-version-dialog.component.scss | 9 ---- .../nifi/src/app/service/nifi-common.service.ts | 13 ++++++ .../src/main/nifi/src/app/state/shared/index.ts | 2 +- .../partials/canvas/save-flow-version-dialog.jsp | 1 - .../nifi-web-ui/src/main/webapp/css/dialog.css | 11 ----- .../main/webapp/js/nf/canvas/nf-flow-version.js | 36 +++++++-------- .../nifi-web-ui/src/main/webapp/js/nf/nf-common.js | 18 ++++++++ .../nifi/registry/VersionedFlowConverter.java | 2 +- .../diff/ConciseEvolvingDifferenceDescriptor.java | 2 +- .../flow/diff/StaticDifferenceDescriptor.java | 2 +- .../nifi/registry/flow/InMemoryFlowRegistry.java | 14 +++--- .../apache/nifi/stateless/core/RegistryUtil.java | 2 +- .../nifi/stateless/core/TestRegistryUtil.java | 4 +- .../registry/FileSystemFlowRegistryClient.java | 34 ++++++++------ .../apache/nifi/tests/system/NiFiClientUtil.java | 6 +-- .../tests/system/registry/RegistryClientIT.java | 35 +++++++-------- .../tests/system/stateless/StatelessBasicsIT.java | 4 +- .../cli/impl/command/nifi/pg/PGChangeVersion.java | 20 ++++++--- .../toolkit/cli/impl/command/nifi/pg/PGImport.java | 2 +- .../VersionedFlowSnapshotMetadataSetResult.java | 52 +++++++++++++--------- 51 files changed, 320 insertions(+), 249 deletions(-) copy minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/FunnelSchema.java => nifi-api/src/main/java/org/apache/nifi/registry/flow/RegisterAction.java (75%)