From 297672ab3831b03282e83bdb1aa588a90bd94b0e Mon Sep 17 00:00:00 2001 From: Jeremy Bryan Date: Thu, 5 Apr 2018 11:35:29 -0400 Subject: [PATCH] Release commit --- assemblies/nexus-base-feature/pom.xml | 2 +- assemblies/nexus-base-template/pom.xml | 2 +- assemblies/nexus-boot-feature/pom.xml | 2 +- assemblies/nexus-core-feature/pom.xml | 2 +- assemblies/nexus-startup-feature/pom.xml | 2 +- assemblies/pom.xml | 6 +- buildsupport/all/pom.xml | 38 +++--- buildsupport/commons/pom.xml | 2 +- buildsupport/db/pom.xml | 2 +- buildsupport/extjs-maven-plugin/pom.xml | 4 +- buildsupport/goodies/pom.xml | 2 +- buildsupport/groovy/pom.xml | 2 +- buildsupport/guice/pom.xml | 2 +- buildsupport/httpclient/pom.xml | 2 +- buildsupport/internal/pom.xml | 4 +- buildsupport/jetty/pom.xml | 2 +- buildsupport/jruby/pom.xml | 2 +- buildsupport/logging/pom.xml | 2 +- buildsupport/maven/pom.xml | 2 +- buildsupport/metrics/pom.xml | 2 +- buildsupport/osgi/pom.xml | 2 +- buildsupport/other/pom.xml | 2 +- buildsupport/pom.xml | 2 +- buildsupport/rest/pom.xml | 2 +- buildsupport/scripts/pom.xml | 4 +- buildsupport/security/pom.xml | 2 +- buildsupport/testing/pom.xml | 2 +- buildsupport/ui/pom.xml | 2 +- components/nexus-analytics-api/pom.xml | 2 +- components/nexus-audit/pom.xml | 2 +- components/nexus-base/pom.xml | 2 +- .../AnonymousConfigurationCreatedEvent.java | 5 + .../AnonymousConfigurationDeletedEvent.java | 5 + .../AnonymousConfigurationEvent.java | 5 + .../AnonymousConfigurationUpdatedEvent.java | 5 + .../anonymous/AnonymousManagerImpl.java | 26 ++-- .../anonymous/AnonymousManagerImplTest.java | 10 +- components/nexus-blobstore-api/pom.xml | 2 +- components/nexus-blobstore-file/pom.xml | 2 +- components/nexus-blobstore/pom.xml | 2 +- components/nexus-bootstrap/pom.xml | 2 +- components/nexus-cache/pom.xml | 2 +- components/nexus-capability/pom.xml | 2 +- components/nexus-commands/pom.xml | 2 +- components/nexus-common/pom.xml | 2 +- components/nexus-core/pom.xml | 2 +- components/nexus-crypto/pom.xml | 2 +- components/nexus-elasticsearch/pom.xml | 2 +- components/nexus-email/pom.xml | 2 +- components/nexus-extdirect/pom.xml | 2 +- components/nexus-extender/pom.xml | 2 +- components/nexus-formfields/pom.xml | 2 +- components/nexus-guice-servlet/pom.xml | 2 +- components/nexus-httpclient/pom.xml | 2 +- components/nexus-jmx/pom.xml | 2 +- components/nexus-main/pom.xml | 2 +- components/nexus-mime/pom.xml | 2 +- components/nexus-orient-console/pom.xml | 2 +- components/nexus-orient/pom.xml | 2 +- components/nexus-oss-edition/pom.xml | 2 +- components/nexus-pax-exam/pom.xml | 2 +- .../exam/internal/DelegatingProbeInvoker.java | 2 +- components/nexus-pax-logging/pom.xml | 2 +- components/nexus-plugin-api/pom.xml | 2 +- components/nexus-quartz/pom.xml | 2 +- components/nexus-rapture/pom.xml | 2 +- .../static/rapture/NX/util/Window.js | 2 +- components/nexus-repository/pom.xml | 2 +- .../internal/RepositoryMemberGraph.groovy | 2 +- .../rest/ComponentUploadExtension.java | 6 +- .../rest/UploadDefinitionExtension.java | 2 +- .../rest/api/UploadDefinitionXO.groovy | 2 +- .../rest/api/UploadFieldDefinitionXO.groovy | 2 +- .../resources/ComponentsResource.java | 2 +- .../resources/UploadDefinitionResource.java | 2 +- .../doc/UploadDefinitionResourceDoc.java | 2 +- .../security/RepositoryPermissionChecker.java | 2 +- .../repository/storage/ComponentDirector.java | 2 +- .../storage/ComponentEntityAdapter.java | 3 + .../ComponentEntityAdapterExtension.java | 9 ++ .../repository/storage/StorageFacet.java | 7 + .../repository/storage/StorageFacetImpl.java | 5 + .../upload/UploadHandlerSupport.java | 2 +- .../repository/upload/UploadResponse.java | 51 +++++-- .../internal/RepositoryMemberGraphTest.groovy | 2 +- .../resources/ComponentsResourceTest.java | 2 +- components/nexus-rest-client/pom.xml | 2 +- components/nexus-rest-jackson2/pom.xml | 2 +- components/nexus-rest/pom.xml | 2 +- components/nexus-scheduling/pom.xml | 2 +- components/nexus-script/pom.xml | 2 +- components/nexus-security/pom.xml | 2 +- .../security/role/RoleNotContainSelf.java | 2 +- .../role/RoleNotContainSelfValidator.java | 2 +- components/nexus-selector/pom.xml | 2 +- components/nexus-servlet/pom.xml | 2 +- components/nexus-siesta/pom.xml | 2 +- components/nexus-ssl/pom.xml | 2 +- components/nexus-supportzip-api/pom.xml | 2 +- components/nexus-swagger/pom.xml | 2 +- components/nexus-task-logging/pom.xml | 2 +- components/nexus-test-common/pom.xml | 2 +- components/nexus-thread/pom.xml | 2 +- components/nexus-transaction/pom.xml | 2 +- components/nexus-upgrade/pom.xml | 2 +- components/nexus-validation/pom.xml | 2 +- components/nexus-webhooks/pom.xml | 2 +- components/nexus-webresources-api/pom.xml | 2 +- components/pom.xml | 6 +- plugins/nexus-audit-plugin/pom.xml | 2 +- plugins/nexus-blobstore-s3/pom.xml | 2 +- plugins/nexus-blobstore-tasks/pom.xml | 2 +- plugins/nexus-coreui-plugin/pom.xml | 2 +- .../nexus/coreui/internal/UploadService.java | 2 +- .../coreui/internal/UploadServiceTest.java | 3 +- plugins/nexus-repository-httpbridge/pom.xml | 2 +- plugins/nexus-repository-maven/pom.xml | 2 +- .../internal/MavenComponentDirector.java | 2 +- plugins/nexus-repository-raw/pom.xml | 2 +- .../repository/raw/RawUploadHandler.java | 10 +- .../raw/internal/RawComponentDirector.java | 2 +- plugins/nexus-restore-maven/pom.xml | 2 +- plugins/nexus-script-plugin/pom.xml | 2 +- plugins/nexus-ssl-plugin/pom.xml | 2 +- plugins/nexus-task-log-cleanup/pom.xml | 2 +- plugins/pom.xml | 50 +++---- pom.xml | 126 +++++++++--------- revision.txt | 2 +- thirdparty-bundles/elasticsearch/pom.xml | 2 +- thirdparty-bundles/pom.xml | 6 +- 130 files changed, 347 insertions(+), 261 deletions(-) diff --git a/assemblies/nexus-base-feature/pom.xml b/assemblies/nexus-base-feature/pom.xml index 265af2bf65..21847f2cdf 100644 --- a/assemblies/nexus-base-feature/pom.xml +++ b/assemblies/nexus-base-feature/pom.xml @@ -19,7 +19,7 @@ org.sonatype.nexus.assemblies nexus-assemblies - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-base-feature diff --git a/assemblies/nexus-base-template/pom.xml b/assemblies/nexus-base-template/pom.xml index 02d956c091..9a338f1c2b 100644 --- a/assemblies/nexus-base-template/pom.xml +++ b/assemblies/nexus-base-template/pom.xml @@ -21,7 +21,7 @@ org.sonatype.nexus.assemblies nexus-assemblies - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-base-template diff --git a/assemblies/nexus-boot-feature/pom.xml b/assemblies/nexus-boot-feature/pom.xml index 17efeecf0a..00fa5d4d88 100644 --- a/assemblies/nexus-boot-feature/pom.xml +++ b/assemblies/nexus-boot-feature/pom.xml @@ -19,7 +19,7 @@ org.sonatype.nexus.assemblies nexus-assemblies - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-boot-feature diff --git a/assemblies/nexus-core-feature/pom.xml b/assemblies/nexus-core-feature/pom.xml index 40530eae5a..f804c6f388 100644 --- a/assemblies/nexus-core-feature/pom.xml +++ b/assemblies/nexus-core-feature/pom.xml @@ -19,7 +19,7 @@ org.sonatype.nexus.assemblies nexus-assemblies - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-core-feature diff --git a/assemblies/nexus-startup-feature/pom.xml b/assemblies/nexus-startup-feature/pom.xml index 9b8b075b1f..54d77c08a8 100644 --- a/assemblies/nexus-startup-feature/pom.xml +++ b/assemblies/nexus-startup-feature/pom.xml @@ -19,7 +19,7 @@ org.sonatype.nexus.assemblies nexus-assemblies - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-startup-feature diff --git a/assemblies/pom.xml b/assemblies/pom.xml index 669598ff36..69da9d82b8 100644 --- a/assemblies/pom.xml +++ b/assemblies/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-parent - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus.assemblies @@ -45,7 +45,7 @@ org.sonatype.nexus nexus-components pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -53,7 +53,7 @@ org.sonatype.nexus.plugins nexus-plugins pom - 3.10.0-SNAPSHOT + 3.10.0-04 import diff --git a/buildsupport/all/pom.xml b/buildsupport/all/pom.xml index 67ae0928fd..245e44e497 100644 --- a/buildsupport/all/pom.xml +++ b/buildsupport/all/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-all @@ -35,7 +35,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-commons pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -43,7 +43,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-db pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -51,7 +51,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-goodies pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -59,7 +59,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-groovy pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -67,7 +67,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-guice pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -75,7 +75,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-httpclient pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -83,7 +83,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-internal pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -91,7 +91,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-jetty pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -99,7 +99,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-jruby pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -107,7 +107,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-logging pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -115,7 +115,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-maven pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -123,7 +123,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-metrics pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -131,7 +131,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-osgi pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -139,7 +139,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-other pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -147,7 +147,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-rest pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -155,7 +155,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-security pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -163,7 +163,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-testing pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -171,7 +171,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-ui pom - 3.10.0-SNAPSHOT + 3.10.0-04 import diff --git a/buildsupport/commons/pom.xml b/buildsupport/commons/pom.xml index 5a59533fea..10738925fa 100644 --- a/buildsupport/commons/pom.xml +++ b/buildsupport/commons/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-commons diff --git a/buildsupport/db/pom.xml b/buildsupport/db/pom.xml index ad840d412e..3101c885e2 100644 --- a/buildsupport/db/pom.xml +++ b/buildsupport/db/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-db diff --git a/buildsupport/extjs-maven-plugin/pom.xml b/buildsupport/extjs-maven-plugin/pom.xml index 65b74ce23a..1ade9e326a 100644 --- a/buildsupport/extjs-maven-plugin/pom.xml +++ b/buildsupport/extjs-maven-plugin/pom.xml @@ -21,7 +21,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 extjs-maven-plugin @@ -37,7 +37,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-all pom - 3.10.0-SNAPSHOT + 3.10.0-04 import diff --git a/buildsupport/goodies/pom.xml b/buildsupport/goodies/pom.xml index 3f5d850bca..41b7f10272 100644 --- a/buildsupport/goodies/pom.xml +++ b/buildsupport/goodies/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-goodies diff --git a/buildsupport/groovy/pom.xml b/buildsupport/groovy/pom.xml index 6a354cc543..4637e8e724 100644 --- a/buildsupport/groovy/pom.xml +++ b/buildsupport/groovy/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-groovy diff --git a/buildsupport/guice/pom.xml b/buildsupport/guice/pom.xml index 345f3dad9c..adc0408c9a 100644 --- a/buildsupport/guice/pom.xml +++ b/buildsupport/guice/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-guice diff --git a/buildsupport/httpclient/pom.xml b/buildsupport/httpclient/pom.xml index 3fee4fb558..4317178653 100644 --- a/buildsupport/httpclient/pom.xml +++ b/buildsupport/httpclient/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-httpclient diff --git a/buildsupport/internal/pom.xml b/buildsupport/internal/pom.xml index 795d780154..93f53f1607 100644 --- a/buildsupport/internal/pom.xml +++ b/buildsupport/internal/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-internal @@ -29,7 +29,7 @@ 1.4.3 - 1.9.0-SNAPSHOT + 1.9.0-01 1.42.0-01 2.8.1-01 diff --git a/buildsupport/jetty/pom.xml b/buildsupport/jetty/pom.xml index f159d69605..dd2a8a3e2e 100644 --- a/buildsupport/jetty/pom.xml +++ b/buildsupport/jetty/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-jetty diff --git a/buildsupport/jruby/pom.xml b/buildsupport/jruby/pom.xml index 4475744599..521273511a 100644 --- a/buildsupport/jruby/pom.xml +++ b/buildsupport/jruby/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-jruby diff --git a/buildsupport/logging/pom.xml b/buildsupport/logging/pom.xml index 49bc228e0a..9391938927 100644 --- a/buildsupport/logging/pom.xml +++ b/buildsupport/logging/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-logging diff --git a/buildsupport/maven/pom.xml b/buildsupport/maven/pom.xml index 3d30dc2590..26da483770 100644 --- a/buildsupport/maven/pom.xml +++ b/buildsupport/maven/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-maven diff --git a/buildsupport/metrics/pom.xml b/buildsupport/metrics/pom.xml index 94b88bf5a6..3ee3ebc888 100644 --- a/buildsupport/metrics/pom.xml +++ b/buildsupport/metrics/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-metrics diff --git a/buildsupport/osgi/pom.xml b/buildsupport/osgi/pom.xml index 051aef4a2c..2eec48f0f2 100644 --- a/buildsupport/osgi/pom.xml +++ b/buildsupport/osgi/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-osgi diff --git a/buildsupport/other/pom.xml b/buildsupport/other/pom.xml index 0c275bc54d..6660f16b46 100644 --- a/buildsupport/other/pom.xml +++ b/buildsupport/other/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-other diff --git a/buildsupport/pom.xml b/buildsupport/pom.xml index 5d3c18599b..98cd8f267d 100644 --- a/buildsupport/pom.xml +++ b/buildsupport/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-parent - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus.buildsupport diff --git a/buildsupport/rest/pom.xml b/buildsupport/rest/pom.xml index 80fc3ee1e5..42add67dfd 100644 --- a/buildsupport/rest/pom.xml +++ b/buildsupport/rest/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-rest diff --git a/buildsupport/scripts/pom.xml b/buildsupport/scripts/pom.xml index 6efbf50e7c..945a3bd43e 100644 --- a/buildsupport/scripts/pom.xml +++ b/buildsupport/scripts/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-scripts @@ -36,7 +36,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-all pom - 3.10.0-SNAPSHOT + 3.10.0-04 import diff --git a/buildsupport/security/pom.xml b/buildsupport/security/pom.xml index 7e33d3456b..c6bced9274 100644 --- a/buildsupport/security/pom.xml +++ b/buildsupport/security/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-security diff --git a/buildsupport/testing/pom.xml b/buildsupport/testing/pom.xml index f32bcb8032..755372c3df 100644 --- a/buildsupport/testing/pom.xml +++ b/buildsupport/testing/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-testing diff --git a/buildsupport/ui/pom.xml b/buildsupport/ui/pom.xml index 9ab436d50b..94c7484231 100644 --- a/buildsupport/ui/pom.xml +++ b/buildsupport/ui/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-buildsupport-ui diff --git a/components/nexus-analytics-api/pom.xml b/components/nexus-analytics-api/pom.xml index f82d4dc2f8..f4c6e8e316 100644 --- a/components/nexus-analytics-api/pom.xml +++ b/components/nexus-analytics-api/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-analytics-api diff --git a/components/nexus-audit/pom.xml b/components/nexus-audit/pom.xml index 60c9842829..b066e43780 100644 --- a/components/nexus-audit/pom.xml +++ b/components/nexus-audit/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-audit diff --git a/components/nexus-base/pom.xml b/components/nexus-base/pom.xml index 624524a250..12c41c52ed 100644 --- a/components/nexus-base/pom.xml +++ b/components/nexus-base/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-base diff --git a/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousConfigurationCreatedEvent.java b/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousConfigurationCreatedEvent.java index c2d8619fec..1fb8b89da1 100644 --- a/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousConfigurationCreatedEvent.java +++ b/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousConfigurationCreatedEvent.java @@ -28,4 +28,9 @@ public class AnonymousConfigurationCreatedEvent public AnonymousConfigurationCreatedEvent(final EntityMetadata metadata) { super(metadata); } + + @Override + public AnonymousConfiguration getAnonymousConfiguration() { + return getEntity(); + } } diff --git a/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousConfigurationDeletedEvent.java b/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousConfigurationDeletedEvent.java index 2699f02a1f..a6d0f4b0ac 100644 --- a/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousConfigurationDeletedEvent.java +++ b/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousConfigurationDeletedEvent.java @@ -28,4 +28,9 @@ public class AnonymousConfigurationDeletedEvent public AnonymousConfigurationDeletedEvent(final EntityMetadata metadata) { super(metadata); } + + @Override + public AnonymousConfiguration getAnonymousConfiguration() { + return getEntity(); + } } diff --git a/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousConfigurationEvent.java b/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousConfigurationEvent.java index 91f2e25807..a97109e353 100644 --- a/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousConfigurationEvent.java +++ b/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousConfigurationEvent.java @@ -24,4 +24,9 @@ public interface AnonymousConfigurationEvent boolean isLocal(); String getRemoteNodeId(); + + /** + * @since 3.10 + */ + AnonymousConfiguration getAnonymousConfiguration(); } diff --git a/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousConfigurationUpdatedEvent.java b/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousConfigurationUpdatedEvent.java index e098596935..2446b1eb8e 100644 --- a/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousConfigurationUpdatedEvent.java +++ b/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousConfigurationUpdatedEvent.java @@ -28,4 +28,9 @@ public class AnonymousConfigurationUpdatedEvent public AnonymousConfigurationUpdatedEvent(final EntityMetadata metadata) { super(metadata); } + + @Override + public AnonymousConfiguration getAnonymousConfiguration() { + return getEntity(); + } } diff --git a/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousManagerImpl.java b/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousManagerImpl.java index 5c543ebcea..42aade1b76 100644 --- a/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousManagerImpl.java +++ b/components/nexus-base/src/main/java/org/sonatype/nexus/internal/security/anonymous/AnonymousManagerImpl.java @@ -20,6 +20,8 @@ import org.sonatype.goodies.common.ComponentSupport; import org.sonatype.goodies.common.Mutex; import org.sonatype.nexus.common.event.EventAware; +import org.sonatype.nexus.common.event.EventConsumer; +import org.sonatype.nexus.common.event.EventHelper; import org.sonatype.nexus.common.event.EventManager; import org.sonatype.nexus.jmx.reflect.ManagedAttribute; import org.sonatype.nexus.jmx.reflect.ManagedObject; @@ -121,11 +123,13 @@ public void setConfiguration(final AnonymousConfiguration configuration) { checkNotNull(configuration); AnonymousConfiguration model = configuration.copy(); - // TODO: Validate configuration before saving? Or leave to ext.direct? Should we try and verify the user exists? log.info("Saving configuration: {}", model); + synchronized (lock) { - store.save(model); + if (!EventHelper.isReplicating()) { + store.save(model); + } this.configuration = model; } @@ -167,14 +171,20 @@ public Subject buildSubject() { * @since 3.2 */ @Subscribe - public void onStoreChanged(AnonymousConfigurationEvent event) { + public void onStoreChanged(final AnonymousConfigurationEvent event) { + handleReplication(event, e -> setConfiguration(e.getAnonymousConfiguration())); + } + + private void handleReplication(final AnonymousConfigurationEvent event, + final EventConsumer consumer) + { if (!event.isLocal()) { - log.debug("Reloading configuration after change by node {}", event.getRemoteNodeId()); - AnonymousConfiguration model; - synchronized (lock) { - configuration = model = loadConfiguration(); + try { + consumer.accept(event); + } + catch (Exception e) { + log.error("Failed to replicate: {}", event, e); } - eventManager.post(new AnonymousConfigurationChangedEvent(model)); } } } diff --git a/components/nexus-base/src/test/java/org/sonatype/nexus/internal/security/anonymous/AnonymousManagerImplTest.java b/components/nexus-base/src/test/java/org/sonatype/nexus/internal/security/anonymous/AnonymousManagerImplTest.java index c61458abaf..ed3736670c 100644 --- a/components/nexus-base/src/test/java/org/sonatype/nexus/internal/security/anonymous/AnonymousManagerImplTest.java +++ b/components/nexus-base/src/test/java/org/sonatype/nexus/internal/security/anonymous/AnonymousManagerImplTest.java @@ -15,6 +15,7 @@ import javax.inject.Provider; import org.sonatype.goodies.testsupport.TestSupport; +import org.sonatype.nexus.common.event.EventHelper; import org.sonatype.nexus.common.event.EventManager; import org.sonatype.nexus.security.anonymous.AnonymousConfiguration; import org.sonatype.nexus.security.anonymous.AnonymousConfigurationChangedEvent; @@ -28,7 +29,6 @@ import static org.hamcrest.Matchers.is; import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; @@ -66,6 +66,7 @@ public class AnonymousManagerImplTest public void setUp() { when(defaults.get()).thenReturn(defaultConfig); when(storeConfig.copy()).thenReturn(storeConfigCopy); + when(storeConfigCopy.copy()).thenReturn(storeConfigCopy); when(defaultConfig.copy()).thenReturn(defaultConfigCopy); manager = new AnonymousManagerImpl(eventManager, store, defaults); } @@ -106,11 +107,12 @@ public void testHandleConfigurationEvent_FromLocalNode() { @Test public void testHandleConfigurationEvent_FromRemoteNode() { when(configurationEvent.isLocal()).thenReturn(false); - when(store.load()).thenReturn(defaultConfig, storeConfig); + when(configurationEvent.getAnonymousConfiguration()).thenReturn(storeConfig); assertThat(manager.getConfiguration(), is(defaultConfigCopy)); - manager.onStoreChanged(configurationEvent); + EventHelper.asReplicating(() -> manager.onStoreChanged(configurationEvent)); assertThat(manager.getConfiguration(), is(storeConfigCopy)); - verify(store, times(2)).load(); + verify(store).load(); + verify(store, never()).save(storeConfigCopy); verify(eventManager).post(any(AnonymousConfigurationChangedEvent.class)); } } diff --git a/components/nexus-blobstore-api/pom.xml b/components/nexus-blobstore-api/pom.xml index 871116def3..1287d5830e 100644 --- a/components/nexus-blobstore-api/pom.xml +++ b/components/nexus-blobstore-api/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-blobstore-api diff --git a/components/nexus-blobstore-file/pom.xml b/components/nexus-blobstore-file/pom.xml index 3352b4a2a5..025c1b5fa6 100644 --- a/components/nexus-blobstore-file/pom.xml +++ b/components/nexus-blobstore-file/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-blobstore-file diff --git a/components/nexus-blobstore/pom.xml b/components/nexus-blobstore/pom.xml index 06d14ab1af..61588ba38a 100644 --- a/components/nexus-blobstore/pom.xml +++ b/components/nexus-blobstore/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-blobstore diff --git a/components/nexus-bootstrap/pom.xml b/components/nexus-bootstrap/pom.xml index e3976b8ab8..b5b81558b0 100644 --- a/components/nexus-bootstrap/pom.xml +++ b/components/nexus-bootstrap/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-bootstrap diff --git a/components/nexus-cache/pom.xml b/components/nexus-cache/pom.xml index 4cd7ba4e14..b27839eb49 100644 --- a/components/nexus-cache/pom.xml +++ b/components/nexus-cache/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-cache diff --git a/components/nexus-capability/pom.xml b/components/nexus-capability/pom.xml index 49438e5583..0458a46cfd 100644 --- a/components/nexus-capability/pom.xml +++ b/components/nexus-capability/pom.xml @@ -21,7 +21,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-capability diff --git a/components/nexus-commands/pom.xml b/components/nexus-commands/pom.xml index c3465d3835..b727ea5fb8 100644 --- a/components/nexus-commands/pom.xml +++ b/components/nexus-commands/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-commands diff --git a/components/nexus-common/pom.xml b/components/nexus-common/pom.xml index e1224b61f7..fd50296432 100644 --- a/components/nexus-common/pom.xml +++ b/components/nexus-common/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-common diff --git a/components/nexus-core/pom.xml b/components/nexus-core/pom.xml index c8cd8e5e48..a793cfc67a 100644 --- a/components/nexus-core/pom.xml +++ b/components/nexus-core/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-core diff --git a/components/nexus-crypto/pom.xml b/components/nexus-crypto/pom.xml index bf55c0ab92..42088993da 100644 --- a/components/nexus-crypto/pom.xml +++ b/components/nexus-crypto/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-crypto diff --git a/components/nexus-elasticsearch/pom.xml b/components/nexus-elasticsearch/pom.xml index 3c8a6ebf3d..9743aa7925 100644 --- a/components/nexus-elasticsearch/pom.xml +++ b/components/nexus-elasticsearch/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-elasticsearch diff --git a/components/nexus-email/pom.xml b/components/nexus-email/pom.xml index 57248f794e..99188c48a5 100644 --- a/components/nexus-email/pom.xml +++ b/components/nexus-email/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-email diff --git a/components/nexus-extdirect/pom.xml b/components/nexus-extdirect/pom.xml index b68db72770..5ac253f60f 100644 --- a/components/nexus-extdirect/pom.xml +++ b/components/nexus-extdirect/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-extdirect diff --git a/components/nexus-extender/pom.xml b/components/nexus-extender/pom.xml index be6eb0b338..f6d6b28b0d 100644 --- a/components/nexus-extender/pom.xml +++ b/components/nexus-extender/pom.xml @@ -19,7 +19,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-extender diff --git a/components/nexus-formfields/pom.xml b/components/nexus-formfields/pom.xml index 3a99e23903..46c8c3e816 100644 --- a/components/nexus-formfields/pom.xml +++ b/components/nexus-formfields/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-formfields diff --git a/components/nexus-guice-servlet/pom.xml b/components/nexus-guice-servlet/pom.xml index 08d6105795..1bb785394c 100644 --- a/components/nexus-guice-servlet/pom.xml +++ b/components/nexus-guice-servlet/pom.xml @@ -19,7 +19,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-guice-servlet diff --git a/components/nexus-httpclient/pom.xml b/components/nexus-httpclient/pom.xml index 429adc2183..3659674eae 100644 --- a/components/nexus-httpclient/pom.xml +++ b/components/nexus-httpclient/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-httpclient diff --git a/components/nexus-jmx/pom.xml b/components/nexus-jmx/pom.xml index f7e9b77b27..d6260fde32 100644 --- a/components/nexus-jmx/pom.xml +++ b/components/nexus-jmx/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-jmx diff --git a/components/nexus-main/pom.xml b/components/nexus-main/pom.xml index abb657d7f8..3f4b4df441 100644 --- a/components/nexus-main/pom.xml +++ b/components/nexus-main/pom.xml @@ -21,7 +21,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-main diff --git a/components/nexus-mime/pom.xml b/components/nexus-mime/pom.xml index 5aad84f4f0..0686e43691 100644 --- a/components/nexus-mime/pom.xml +++ b/components/nexus-mime/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-mime diff --git a/components/nexus-orient-console/pom.xml b/components/nexus-orient-console/pom.xml index 924fe106a6..918292b1fc 100644 --- a/components/nexus-orient-console/pom.xml +++ b/components/nexus-orient-console/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-orient-console diff --git a/components/nexus-orient/pom.xml b/components/nexus-orient/pom.xml index e9de7d3143..5a2258c088 100644 --- a/components/nexus-orient/pom.xml +++ b/components/nexus-orient/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-orient diff --git a/components/nexus-oss-edition/pom.xml b/components/nexus-oss-edition/pom.xml index 554b7b810d..63fa1ed1f4 100644 --- a/components/nexus-oss-edition/pom.xml +++ b/components/nexus-oss-edition/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-oss-edition diff --git a/components/nexus-pax-exam/pom.xml b/components/nexus-pax-exam/pom.xml index 02ee668db2..d9083a27a1 100644 --- a/components/nexus-pax-exam/pom.xml +++ b/components/nexus-pax-exam/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-pax-exam diff --git a/components/nexus-pax-exam/src/main/java/org/sonatype/nexus/pax/exam/internal/DelegatingProbeInvoker.java b/components/nexus-pax-exam/src/main/java/org/sonatype/nexus/pax/exam/internal/DelegatingProbeInvoker.java index 130d5529fb..25797c1632 100644 --- a/components/nexus-pax-exam/src/main/java/org/sonatype/nexus/pax/exam/internal/DelegatingProbeInvoker.java +++ b/components/nexus-pax-exam/src/main/java/org/sonatype/nexus/pax/exam/internal/DelegatingProbeInvoker.java @@ -19,7 +19,7 @@ /** * Delegates to the supplied {@link ProbeInvoker}. * - * @since 3.next + * @since 3.10 */ public class DelegatingProbeInvoker implements ProbeInvoker diff --git a/components/nexus-pax-logging/pom.xml b/components/nexus-pax-logging/pom.xml index e731383ac7..5b0661ac49 100644 --- a/components/nexus-pax-logging/pom.xml +++ b/components/nexus-pax-logging/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-pax-logging diff --git a/components/nexus-plugin-api/pom.xml b/components/nexus-plugin-api/pom.xml index 75eba3160f..f05cbff455 100644 --- a/components/nexus-plugin-api/pom.xml +++ b/components/nexus-plugin-api/pom.xml @@ -19,7 +19,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-plugin-api diff --git a/components/nexus-quartz/pom.xml b/components/nexus-quartz/pom.xml index 88ed3df954..43bbf32b4e 100644 --- a/components/nexus-quartz/pom.xml +++ b/components/nexus-quartz/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-quartz diff --git a/components/nexus-rapture/pom.xml b/components/nexus-rapture/pom.xml index 3a4744c651..4920574c2c 100644 --- a/components/nexus-rapture/pom.xml +++ b/components/nexus-rapture/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-rapture diff --git a/components/nexus-rapture/src/main/resources/static/rapture/NX/util/Window.js b/components/nexus-rapture/src/main/resources/static/rapture/NX/util/Window.js index 1280af4f5a..61eff76c68 100644 --- a/components/nexus-rapture/src/main/resources/static/rapture/NX/util/Window.js +++ b/components/nexus-rapture/src/main/resources/static/rapture/NX/util/Window.js @@ -15,7 +15,7 @@ /** * Window related utils. * - * @since 3.next + * @since 3.10 */ Ext.define('NX.util.Window', { singleton: true, diff --git a/components/nexus-repository/pom.xml b/components/nexus-repository/pom.xml index f03d29bd61..b113fff481 100644 --- a/components/nexus-repository/pom.xml +++ b/components/nexus-repository/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-repository diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/manager/internal/RepositoryMemberGraph.groovy b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/manager/internal/RepositoryMemberGraph.groovy index f79150d8d9..6697e05e21 100644 --- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/manager/internal/RepositoryMemberGraph.groovy +++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/manager/internal/RepositoryMemberGraph.groovy @@ -30,7 +30,7 @@ import static com.google.common.base.Preconditions.checkNotNull /** * Graph the relationships of Group Repositories. - * @since 3.next + * @since 3.10 */ @Named class RepositoryMemberGraph diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/ComponentUploadExtension.java b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/ComponentUploadExtension.java index d32205de5a..f77fb218f6 100644 --- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/ComponentUploadExtension.java +++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/ComponentUploadExtension.java @@ -12,6 +12,8 @@ */ package org.sonatype.nexus.repository.rest; +import java.util.Collection; + import org.sonatype.nexus.common.entity.EntityId; import org.sonatype.nexus.repository.Repository; import org.sonatype.nexus.repository.rest.internal.resources.ComponentsResource; @@ -21,7 +23,7 @@ /** * Extension point interface used within {@link ComponentsResource#uploadComponent} * - * @since 3.next + * @since 3.10 */ public interface ComponentUploadExtension { @@ -29,7 +31,7 @@ public interface ComponentUploadExtension * Apply data in the {@link ComponentUpload} to the provided {@link EntityId} within * the provided {@link Repository} */ - void apply(Repository repository, ComponentUpload componentUpload, EntityId entityId); + void apply(Repository repository, ComponentUpload componentUpload, Collection entityIds); /** * Validate elements within {@link ComponentsResource#uploadComponent} diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/UploadDefinitionExtension.java b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/UploadDefinitionExtension.java index b82ffcfc98..2023bbee8e 100644 --- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/UploadDefinitionExtension.java +++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/UploadDefinitionExtension.java @@ -18,7 +18,7 @@ /** * Extension point interface which provides a mechanism for contributing an {@link UploadFieldDefinition} * - * @since 3.next + * @since 3.10 */ public interface UploadDefinitionExtension { diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/api/UploadDefinitionXO.groovy b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/api/UploadDefinitionXO.groovy index c28024775d..c061642e37 100644 --- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/api/UploadDefinitionXO.groovy +++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/api/UploadDefinitionXO.groovy @@ -21,7 +21,7 @@ import org.sonatype.nexus.repository.upload.UploadDefinition /** * Upload definition transfer object for rest api * - * @since 3.next + * @since 3.10 */ @CompileStatic @Builder diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/api/UploadFieldDefinitionXO.groovy b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/api/UploadFieldDefinitionXO.groovy index 5c65f3f339..15c0202b8e 100644 --- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/api/UploadFieldDefinitionXO.groovy +++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/api/UploadFieldDefinitionXO.groovy @@ -21,7 +21,7 @@ import org.sonatype.nexus.repository.upload.UploadFieldDefinition /** * Upload field definition transfer object for rest api * - * @since 3.next + * @since 3.10 */ @CompileStatic @Builder diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/internal/resources/ComponentsResource.java b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/internal/resources/ComponentsResource.java index f2a89f55f0..58207d62c1 100644 --- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/internal/resources/ComponentsResource.java +++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/internal/resources/ComponentsResource.java @@ -255,7 +255,7 @@ public void uploadComponent(@QueryParam("repository") final String repositoryId, UploadResponse uploadResponse = uploadManager.handle(repository, componentUpload); for (ComponentUploadExtension componentUploadExtension : componentUploadExtensions) { - componentUploadExtension.apply(repository, componentUpload, uploadResponse.getComponentId()); + componentUploadExtension.apply(repository, componentUpload, uploadResponse.getComponentIds()); } } catch (IllegalOperationException e) { throw new WebApplicationMessageException(Status.BAD_REQUEST, e.getMessage()); diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/internal/resources/UploadDefinitionResource.java b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/internal/resources/UploadDefinitionResource.java index dda4946f16..b384ad4547 100644 --- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/internal/resources/UploadDefinitionResource.java +++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/internal/resources/UploadDefinitionResource.java @@ -40,7 +40,7 @@ import static org.sonatype.nexus.rest.APIConstants.BETA_API_PREFIX; /** - * @since 3.next + * @since 3.10 */ @Named @Singleton diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/internal/resources/doc/UploadDefinitionResourceDoc.java b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/internal/resources/doc/UploadDefinitionResourceDoc.java index 54a9e14896..c7ec7a05bf 100644 --- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/internal/resources/doc/UploadDefinitionResourceDoc.java +++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/rest/internal/resources/doc/UploadDefinitionResourceDoc.java @@ -24,7 +24,7 @@ /** * Swagger documentation for {@link UploadDefinitionResource} * - * @since 3.next + * @since 3.10 */ @Api(value = "formats") public interface UploadDefinitionResourceDoc diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/security/RepositoryPermissionChecker.java b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/security/RepositoryPermissionChecker.java index ad0d25e2dc..e3ddc6b405 100644 --- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/security/RepositoryPermissionChecker.java +++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/security/RepositoryPermissionChecker.java @@ -30,7 +30,7 @@ /** * Repository permission checker. * - * @since 3.next + * @since 3.10 */ @Named @Singleton diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/ComponentDirector.java b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/ComponentDirector.java index c221d287ac..f6b02b86b3 100644 --- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/ComponentDirector.java +++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/ComponentDirector.java @@ -20,7 +20,7 @@ /** * Component management director. * - * @since 3.next + * @since 3.10 */ public interface ComponentDirector { diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/ComponentEntityAdapter.java b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/ComponentEntityAdapter.java index b52f807e34..a87a2606e8 100644 --- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/ComponentEntityAdapter.java +++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/ComponentEntityAdapter.java @@ -247,6 +247,9 @@ public EntityEvent newEvent(final ODocument document, final EventKind eventKind) String repositoryName = ((ODocument) document.field(P_BUCKET)).field(P_REPOSITORY_NAME); + // prefetch any lazy/linked fields that the extensions want to capture + componentEntityAdapterExtensions.forEach(d -> d.prefetchFields(document)); + switch (eventKind) { case CREATE: return new ComponentCreatedEvent(metadata, repositoryName); diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/ComponentEntityAdapterExtension.java b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/ComponentEntityAdapterExtension.java index 03cca34362..e7f6d96061 100644 --- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/ComponentEntityAdapterExtension.java +++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/ComponentEntityAdapterExtension.java @@ -12,6 +12,8 @@ */ package org.sonatype.nexus.repository.storage; +import org.sonatype.nexus.orient.entity.EntityAdapter.EventKind; + import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx; import com.orientechnologies.orient.core.metadata.schema.OClass; import com.orientechnologies.orient.core.record.impl.ODocument; @@ -38,4 +40,11 @@ public interface ComponentEntityAdapterExtension * @see ComponentEntityAdapter#writeFields(ODocument, Component) */ void writeFields(ODocument document, Component component); + + /** + * Override this to capture lazy/linked content for component events. + * + * @see ComponentEntityAdapter#newEvent(ODocument, EventKind) + */ + default void prefetchFields(ODocument document) {/* no-op */} } diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/StorageFacet.java b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/StorageFacet.java index e5bdb5c443..7f4fed57c6 100644 --- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/StorageFacet.java +++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/StorageFacet.java @@ -14,6 +14,7 @@ import java.io.InputStream; +import org.sonatype.nexus.blobstore.api.BlobStore; import org.sonatype.nexus.common.hash.HashAlgorithm; import org.sonatype.nexus.repository.Facet; import org.sonatype.nexus.repository.view.Payload; @@ -58,4 +59,10 @@ public interface StorageFacet */ TempBlob createTempBlob(Payload payload, Iterable hashAlgorithms); + /** + * Returns the {@link BlobStore} associated with the repository. + * + * @since 3.10 + */ + BlobStore blobStore(); } diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/StorageFacetImpl.java b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/StorageFacetImpl.java index 903166c961..77338228b8 100644 --- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/StorageFacetImpl.java +++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/storage/StorageFacetImpl.java @@ -279,4 +279,9 @@ private StorageTx openStorageTx(final ODatabaseDocumentTx db) { componentFactory) ); } + + @Override + public BlobStore blobStore() { + return blobStoreManager.get(config.blobStoreName); + } } diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/upload/UploadHandlerSupport.java b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/upload/UploadHandlerSupport.java index bc9ae24cf1..44d8b6aec8 100644 --- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/upload/UploadHandlerSupport.java +++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/upload/UploadHandlerSupport.java @@ -28,7 +28,7 @@ * enables {@link UploadFieldDefinition} contributions to the format * specific {@link UploadDefinition} * - * @since 3.next + * @since 3.10 */ public abstract class UploadHandlerSupport extends ComponentSupport diff --git a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/upload/UploadResponse.java b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/upload/UploadResponse.java index e164182b03..796999afb9 100644 --- a/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/upload/UploadResponse.java +++ b/components/nexus-repository/src/main/java/org/sonatype/nexus/repository/upload/UploadResponse.java @@ -12,52 +12,83 @@ */ package org.sonatype.nexus.repository.upload; +import java.util.Collection; +import java.util.Collections; import java.util.List; +import java.util.Objects; +import java.util.Optional; +import java.util.stream.Collectors; + +import javax.annotation.Nullable; import org.sonatype.nexus.common.entity.EntityId; import org.sonatype.nexus.repository.storage.Asset; import org.sonatype.nexus.repository.view.Content; +import com.google.common.collect.ImmutableList; + import static com.google.common.base.Preconditions.checkNotNull; -import static java.util.Collections.*; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; /** * The resultant asset paths and associated component id with a component upload * - * @since 3.next + * @since 3.10 */ public final class UploadResponse { private final List assetPaths; - private final EntityId componentId; + private final List componentIds; public UploadResponse(final Asset asset) { checkNotNull(asset); this.assetPaths = singletonList(asset.name()); - this.componentId = asset.componentId(); + this.componentIds = Optional.of(asset) + .map(Asset::componentId) + .map(Collections::singletonList) + .orElse(emptyList()); } public UploadResponse(final EntityId entityId, final List assetPaths) { - this.componentId = checkNotNull(entityId); + this.componentIds = ImmutableList.of(checkNotNull(entityId)); this.assetPaths = checkNotNull(assetPaths); } public UploadResponse(final Content content, final List assetPaths) { - this.componentId = extractComponentId(checkNotNull(content)); + this.componentIds = extractComponentIds(ImmutableList.of(checkNotNull(content))); + this.assetPaths = checkNotNull(assetPaths); + } + + public UploadResponse(final Collection contents, final List assetPaths) { + this.componentIds = extractComponentIds(checkNotNull(contents)); this.assetPaths = checkNotNull(assetPaths); } + @Nullable public EntityId getComponentId() { - return componentId; + return componentIds.stream().findFirst().orElse(null); + } + + public List getComponentIds() { + return componentIds; } public List getAssetPaths() { return assetPaths; } - private EntityId extractComponentId(final Content content) { - Asset asset = content.getAttributes().get(Asset.class); - return asset.componentId(); + private static List extractComponentIds(final Collection contents) { + return contents.stream() + .map(UploadResponse::extractComponentId) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + } + + @Nullable + private static EntityId extractComponentId(final Content content) { + Optional asset = Optional.ofNullable(content.getAttributes().get(Asset.class)); + return asset.map(Asset::componentId).orElse(null); } } diff --git a/components/nexus-repository/src/test/java/org/sonatype/nexus/repository/manager/internal/RepositoryMemberGraphTest.groovy b/components/nexus-repository/src/test/java/org/sonatype/nexus/repository/manager/internal/RepositoryMemberGraphTest.groovy index d22213b72b..09a92a7ef6 100644 --- a/components/nexus-repository/src/test/java/org/sonatype/nexus/repository/manager/internal/RepositoryMemberGraphTest.groovy +++ b/components/nexus-repository/src/test/java/org/sonatype/nexus/repository/manager/internal/RepositoryMemberGraphTest.groovy @@ -27,7 +27,7 @@ import com.google.common.graph.MutableGraph import spock.lang.Specification /** - * @since 3.next + * @since 3.10 */ class RepositoryMemberGraphTest extends Specification diff --git a/components/nexus-repository/src/test/java/org/sonatype/nexus/repository/rest/internal/resources/ComponentsResourceTest.java b/components/nexus-repository/src/test/java/org/sonatype/nexus/repository/rest/internal/resources/ComponentsResourceTest.java index 613280a459..5d2cb65d89 100644 --- a/components/nexus-repository/src/test/java/org/sonatype/nexus/repository/rest/internal/resources/ComponentsResourceTest.java +++ b/components/nexus-repository/src/test/java/org/sonatype/nexus/repository/rest/internal/resources/ComponentsResourceTest.java @@ -298,7 +298,7 @@ public void uploadComponent() throws Exception { verify(componentUploadExtension, times(1)).validate(any()); verify(uploadManager).handle(eq(mavenReleases), componentUploadCaptor.capture()); verify(componentUploadExtension, times(1)).apply(mavenReleases, - componentUploadCaptor.getValue(), uploadResponse.getComponentId()); + componentUploadCaptor.getValue(), uploadResponse.getComponentIds()); assertThat(componentUploadCaptor.getValue().getFields().size(), is(3)); assertThat(componentUploadCaptor.getValue().getAssetUploads().size(), is(1)); diff --git a/components/nexus-rest-client/pom.xml b/components/nexus-rest-client/pom.xml index 46819547a8..d40eccf577 100644 --- a/components/nexus-rest-client/pom.xml +++ b/components/nexus-rest-client/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-rest-client diff --git a/components/nexus-rest-jackson2/pom.xml b/components/nexus-rest-jackson2/pom.xml index b28efceaa0..d85eb254c6 100644 --- a/components/nexus-rest-jackson2/pom.xml +++ b/components/nexus-rest-jackson2/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-rest-jackson2 diff --git a/components/nexus-rest/pom.xml b/components/nexus-rest/pom.xml index 6ce6132971..574f0f9172 100644 --- a/components/nexus-rest/pom.xml +++ b/components/nexus-rest/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-rest diff --git a/components/nexus-scheduling/pom.xml b/components/nexus-scheduling/pom.xml index 658d0e4227..1b4b9c1398 100644 --- a/components/nexus-scheduling/pom.xml +++ b/components/nexus-scheduling/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-scheduling diff --git a/components/nexus-script/pom.xml b/components/nexus-script/pom.xml index 9fd3871806..aa7908aef2 100644 --- a/components/nexus-script/pom.xml +++ b/components/nexus-script/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-script diff --git a/components/nexus-security/pom.xml b/components/nexus-security/pom.xml index a2c6d16f54..ec8d9c3eab 100644 --- a/components/nexus-security/pom.xml +++ b/components/nexus-security/pom.xml @@ -21,7 +21,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-security diff --git a/components/nexus-security/src/main/java/org/sonatype/nexus/security/role/RoleNotContainSelf.java b/components/nexus-security/src/main/java/org/sonatype/nexus/security/role/RoleNotContainSelf.java index fc087e4706..dce33b4a12 100644 --- a/components/nexus-security/src/main/java/org/sonatype/nexus/security/role/RoleNotContainSelf.java +++ b/components/nexus-security/src/main/java/org/sonatype/nexus/security/role/RoleNotContainSelf.java @@ -25,7 +25,7 @@ /** * Validate role does not contain itself anywhere in the child hierarchy. * - * @since 3.next + * @since 3.10 */ @Target({TYPE, ANNOTATION_TYPE}) @Retention(RUNTIME) diff --git a/components/nexus-security/src/main/java/org/sonatype/nexus/security/role/RoleNotContainSelfValidator.java b/components/nexus-security/src/main/java/org/sonatype/nexus/security/role/RoleNotContainSelfValidator.java index 67a6780c97..03459cbf94 100644 --- a/components/nexus-security/src/main/java/org/sonatype/nexus/security/role/RoleNotContainSelfValidator.java +++ b/components/nexus-security/src/main/java/org/sonatype/nexus/security/role/RoleNotContainSelfValidator.java @@ -34,7 +34,7 @@ /** * {@link RoleNotContainSelf} validator. * - * @since 3.next + * @since 3.10 */ @Named public class RoleNotContainSelfValidator diff --git a/components/nexus-selector/pom.xml b/components/nexus-selector/pom.xml index f62ed0bc7e..54c3da02bd 100644 --- a/components/nexus-selector/pom.xml +++ b/components/nexus-selector/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-selector diff --git a/components/nexus-servlet/pom.xml b/components/nexus-servlet/pom.xml index d8ac9f652f..876f288608 100644 --- a/components/nexus-servlet/pom.xml +++ b/components/nexus-servlet/pom.xml @@ -19,7 +19,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-servlet diff --git a/components/nexus-siesta/pom.xml b/components/nexus-siesta/pom.xml index 2a2d740b17..399249403a 100644 --- a/components/nexus-siesta/pom.xml +++ b/components/nexus-siesta/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-siesta diff --git a/components/nexus-ssl/pom.xml b/components/nexus-ssl/pom.xml index 67c5e8ddb5..082d0b4180 100644 --- a/components/nexus-ssl/pom.xml +++ b/components/nexus-ssl/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-ssl diff --git a/components/nexus-supportzip-api/pom.xml b/components/nexus-supportzip-api/pom.xml index fabd6ab18d..82c9e56a14 100644 --- a/components/nexus-supportzip-api/pom.xml +++ b/components/nexus-supportzip-api/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-supportzip-api diff --git a/components/nexus-swagger/pom.xml b/components/nexus-swagger/pom.xml index 61e73a9ce4..7caf318d9c 100644 --- a/components/nexus-swagger/pom.xml +++ b/components/nexus-swagger/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-swagger diff --git a/components/nexus-task-logging/pom.xml b/components/nexus-task-logging/pom.xml index c4821ba40f..c99f68b291 100644 --- a/components/nexus-task-logging/pom.xml +++ b/components/nexus-task-logging/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-task-logging diff --git a/components/nexus-test-common/pom.xml b/components/nexus-test-common/pom.xml index 84cfb6bfdd..331cf864ec 100644 --- a/components/nexus-test-common/pom.xml +++ b/components/nexus-test-common/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-test-common diff --git a/components/nexus-thread/pom.xml b/components/nexus-thread/pom.xml index b883d76958..d5437b4136 100644 --- a/components/nexus-thread/pom.xml +++ b/components/nexus-thread/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-thread diff --git a/components/nexus-transaction/pom.xml b/components/nexus-transaction/pom.xml index 2d2b2050bb..d9a5e79b90 100644 --- a/components/nexus-transaction/pom.xml +++ b/components/nexus-transaction/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-transaction diff --git a/components/nexus-upgrade/pom.xml b/components/nexus-upgrade/pom.xml index cb3f97b2d1..a8b1573188 100644 --- a/components/nexus-upgrade/pom.xml +++ b/components/nexus-upgrade/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-upgrade diff --git a/components/nexus-validation/pom.xml b/components/nexus-validation/pom.xml index 3229a1fccf..4a2b788226 100644 --- a/components/nexus-validation/pom.xml +++ b/components/nexus-validation/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-validation diff --git a/components/nexus-webhooks/pom.xml b/components/nexus-webhooks/pom.xml index 60991209f9..60a677c9e7 100644 --- a/components/nexus-webhooks/pom.xml +++ b/components/nexus-webhooks/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-webhooks diff --git a/components/nexus-webresources-api/pom.xml b/components/nexus-webresources-api/pom.xml index 7ac48d4b88..a054d3d7b3 100644 --- a/components/nexus-webresources-api/pom.xml +++ b/components/nexus-webresources-api/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-components - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-webresources-api diff --git a/components/pom.xml b/components/pom.xml index 38cb820153..29636cf595 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-parent - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-components @@ -91,7 +91,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-all pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -99,7 +99,7 @@ org.sonatype.nexus.bundles nexus-thirdparty-bundles pom - 3.10.0-SNAPSHOT + 3.10.0-04 import diff --git a/plugins/nexus-audit-plugin/pom.xml b/plugins/nexus-audit-plugin/pom.xml index 0e4cd7117f..27874d825b 100644 --- a/plugins/nexus-audit-plugin/pom.xml +++ b/plugins/nexus-audit-plugin/pom.xml @@ -21,7 +21,7 @@ org.sonatype.nexus.plugins nexus-plugins - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-audit-plugin diff --git a/plugins/nexus-blobstore-s3/pom.xml b/plugins/nexus-blobstore-s3/pom.xml index 3b729ae970..34716bf547 100644 --- a/plugins/nexus-blobstore-s3/pom.xml +++ b/plugins/nexus-blobstore-s3/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.plugins nexus-plugins - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-blobstore-s3 diff --git a/plugins/nexus-blobstore-tasks/pom.xml b/plugins/nexus-blobstore-tasks/pom.xml index f77891abc1..9b67537bc6 100644 --- a/plugins/nexus-blobstore-tasks/pom.xml +++ b/plugins/nexus-blobstore-tasks/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.plugins nexus-plugins - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-blobstore-tasks diff --git a/plugins/nexus-coreui-plugin/pom.xml b/plugins/nexus-coreui-plugin/pom.xml index 57309b0c1d..03635ffcaa 100644 --- a/plugins/nexus-coreui-plugin/pom.xml +++ b/plugins/nexus-coreui-plugin/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.plugins nexus-plugins - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-coreui-plugin diff --git a/plugins/nexus-coreui-plugin/src/main/java/org/sonatype/nexus/coreui/internal/UploadService.java b/plugins/nexus-coreui-plugin/src/main/java/org/sonatype/nexus/coreui/internal/UploadService.java index 4df3f0ae7d..a2ef2b9cc0 100644 --- a/plugins/nexus-coreui-plugin/src/main/java/org/sonatype/nexus/coreui/internal/UploadService.java +++ b/plugins/nexus-coreui-plugin/src/main/java/org/sonatype/nexus/coreui/internal/UploadService.java @@ -101,7 +101,7 @@ public String upload(final Map params, final Map org.sonatype.nexus.plugins nexus-plugins - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-repository-httpbridge diff --git a/plugins/nexus-repository-maven/pom.xml b/plugins/nexus-repository-maven/pom.xml index 90c0e49563..1e8794c09f 100644 --- a/plugins/nexus-repository-maven/pom.xml +++ b/plugins/nexus-repository-maven/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.plugins nexus-plugins - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-repository-maven diff --git a/plugins/nexus-repository-maven/src/main/java/org/sonatype/nexus/repository/maven/internal/MavenComponentDirector.java b/plugins/nexus-repository-maven/src/main/java/org/sonatype/nexus/repository/maven/internal/MavenComponentDirector.java index 1a5fde8bcd..43361e4b16 100644 --- a/plugins/nexus-repository-maven/src/main/java/org/sonatype/nexus/repository/maven/internal/MavenComponentDirector.java +++ b/plugins/nexus-repository-maven/src/main/java/org/sonatype/nexus/repository/maven/internal/MavenComponentDirector.java @@ -31,7 +31,7 @@ import static org.sonatype.nexus.repository.maven.internal.MavenFacetUtils.isSnapshot; /** - * @since 3.next + * @since 3.10 */ @Named("maven2") @Singleton diff --git a/plugins/nexus-repository-raw/pom.xml b/plugins/nexus-repository-raw/pom.xml index 45cce0d88b..92c8890d08 100644 --- a/plugins/nexus-repository-raw/pom.xml +++ b/plugins/nexus-repository-raw/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.plugins nexus-plugins - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-repository-raw diff --git a/plugins/nexus-repository-raw/src/main/java/org/sonatype/nexus/repository/raw/RawUploadHandler.java b/plugins/nexus-repository-raw/src/main/java/org/sonatype/nexus/repository/raw/RawUploadHandler.java index 017b9832d5..975e11c1ce 100644 --- a/plugins/nexus-repository-raw/src/main/java/org/sonatype/nexus/repository/raw/RawUploadHandler.java +++ b/plugins/nexus-repository-raw/src/main/java/org/sonatype/nexus/repository/raw/RawUploadHandler.java @@ -84,7 +84,7 @@ public UploadResponse handle(final Repository repository, final ComponentUpload .throwing(IOException.class).call(() -> { //Data holders for populating the UploadResponse - Content responseContent = null; + List responseContents = Lists.newArrayList(); List assetPaths = Lists.newArrayList(); for (AssetUpload asset : upload.getAssetUploads()) { @@ -94,15 +94,11 @@ public UploadResponse handle(final Repository repository, final ComponentUpload Content content = facet.put(path, asset.getPayload()); - //We only need to set this one time, it provides the component id which - //is the same for all assets upload for a component - if (responseContent == null) { - responseContent = content; - } + responseContents.add(content); assetPaths.add(path); } - return new UploadResponse(responseContent, assetPaths); + return new UploadResponse(responseContents, assetPaths); }); } diff --git a/plugins/nexus-repository-raw/src/main/java/org/sonatype/nexus/repository/raw/internal/RawComponentDirector.java b/plugins/nexus-repository-raw/src/main/java/org/sonatype/nexus/repository/raw/internal/RawComponentDirector.java index c140a3c2a2..15f06cc750 100644 --- a/plugins/nexus-repository-raw/src/main/java/org/sonatype/nexus/repository/raw/internal/RawComponentDirector.java +++ b/plugins/nexus-repository-raw/src/main/java/org/sonatype/nexus/repository/raw/internal/RawComponentDirector.java @@ -20,7 +20,7 @@ import org.sonatype.nexus.repository.storage.ComponentDirector; /** - * @since 3.next + * @since 3.10 */ @Named("raw") @Singleton diff --git a/plugins/nexus-restore-maven/pom.xml b/plugins/nexus-restore-maven/pom.xml index b9aa1ace66..669c67f86d 100644 --- a/plugins/nexus-restore-maven/pom.xml +++ b/plugins/nexus-restore-maven/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.plugins nexus-plugins - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-restore-maven diff --git a/plugins/nexus-script-plugin/pom.xml b/plugins/nexus-script-plugin/pom.xml index 997a7fef2f..a3ec3af361 100644 --- a/plugins/nexus-script-plugin/pom.xml +++ b/plugins/nexus-script-plugin/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.plugins nexus-plugins - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-script-plugin diff --git a/plugins/nexus-ssl-plugin/pom.xml b/plugins/nexus-ssl-plugin/pom.xml index 4aac4787cc..2a2f1a727f 100644 --- a/plugins/nexus-ssl-plugin/pom.xml +++ b/plugins/nexus-ssl-plugin/pom.xml @@ -21,7 +21,7 @@ org.sonatype.nexus.plugins nexus-plugins - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-ssl-plugin diff --git a/plugins/nexus-task-log-cleanup/pom.xml b/plugins/nexus-task-log-cleanup/pom.xml index 9be4cb8c8a..68a49426be 100644 --- a/plugins/nexus-task-log-cleanup/pom.xml +++ b/plugins/nexus-task-log-cleanup/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.plugins nexus-plugins - 3.10.0-SNAPSHOT + 3.10.0-04 nexus-task-log-cleanup diff --git a/plugins/pom.xml b/plugins/pom.xml index 0d67755964..c625d7527b 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-parent - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus.plugins @@ -51,7 +51,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-all pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -62,13 +62,13 @@ org.sonatype.nexus.plugins nexus-audit-plugin - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus.plugins nexus-audit-plugin - 3.10.0-SNAPSHOT + 3.10.0-04 features xml @@ -78,13 +78,13 @@ org.sonatype.nexus.plugins nexus-blobstore-tasks - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus.plugins nexus-blobstore-tasks - 3.10.0-SNAPSHOT + 3.10.0-04 features xml @@ -94,13 +94,13 @@ org.sonatype.nexus.plugins nexus-coreui-plugin - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus.plugins nexus-coreui-plugin - 3.10.0-SNAPSHOT + 3.10.0-04 features xml @@ -109,7 +109,7 @@ org.sonatype.nexus.plugins nexus-coreui-plugin sources - 3.10.0-SNAPSHOT + 3.10.0-04 @@ -117,13 +117,13 @@ org.sonatype.nexus.plugins nexus-repository-httpbridge - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus.plugins nexus-repository-httpbridge - 3.10.0-SNAPSHOT + 3.10.0-04 features xml @@ -133,13 +133,13 @@ org.sonatype.nexus.plugins nexus-repository-maven - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus.plugins nexus-repository-maven - 3.10.0-SNAPSHOT + 3.10.0-04 features xml @@ -147,13 +147,13 @@ org.sonatype.nexus.plugins nexus-restore-maven - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus.plugins nexus-restore-maven - 3.10.0-SNAPSHOT + 3.10.0-04 features xml @@ -163,13 +163,13 @@ org.sonatype.nexus.plugins nexus-repository-raw - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus.plugins nexus-repository-raw - 3.10.0-SNAPSHOT + 3.10.0-04 features xml @@ -179,13 +179,13 @@ org.sonatype.nexus.plugins nexus-ssl-plugin - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus.plugins nexus-ssl-plugin - 3.10.0-SNAPSHOT + 3.10.0-04 features xml @@ -195,13 +195,13 @@ org.sonatype.nexus.plugins nexus-script-plugin - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus.plugins nexus-script-plugin - 3.10.0-SNAPSHOT + 3.10.0-04 features xml @@ -211,13 +211,13 @@ org.sonatype.nexus.plugins nexus-task-log-cleanup - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus.plugins nexus-task-log-cleanup - 3.10.0-SNAPSHOT + 3.10.0-04 features xml @@ -227,13 +227,13 @@ org.sonatype.nexus.plugins nexus-blobstore-s3 - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus.plugins nexus-blobstore-s3 - 3.10.0-SNAPSHOT + 3.10.0-04 features xml diff --git a/pom.xml b/pom.xml index 083bc898b5..3b93534bba 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ ${project.groupId}:${project.artifactId} pom - 3.10.0-SNAPSHOT + 3.10.0-04 2008 http://nexus.sonatype.org/ @@ -88,7 +88,7 @@ Define nexus versions. The 'nexus.version' property always refers to the version of the current project. These values must always be constants; 'nexus.version' will get update automatically by set-version. --> - 3.10.0-SNAPSHOT + 3.10.0-04 2.14.8-01 @@ -142,169 +142,169 @@ org.sonatype.nexus nexus-analytics-api - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-audit - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-base - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-blobstore - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-blobstore-api - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-blobstore-file - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-bootstrap - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-capability - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-commands - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-common - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-core - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-crypto - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-orient - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-orient-console - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-cache - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-elasticsearch - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-email - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-extdirect - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-extender - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-httpclient - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-jmx - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-scheduling - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-formfields - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-guice-servlet - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-main - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-mime - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-oss-edition - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-oss-edition - 3.10.0-SNAPSHOT + 3.10.0-04 features xml @@ -312,44 +312,44 @@ org.sonatype.nexus nexus-pax-logging - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-plugin-api - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-quartz - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-rapture - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-rapture - 3.10.0-SNAPSHOT + 3.10.0-04 sources org.sonatype.nexus nexus-repository - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-repository - 3.10.0-SNAPSHOT + 3.10.0-04 tests test @@ -357,109 +357,109 @@ org.sonatype.nexus nexus-rest - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-rest-client - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-rest-jackson2 - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-script - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-security - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-selector - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-servlet - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-siesta - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-ssl - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-supportzip-api - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-swagger - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-task-logging - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-thread - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-transaction - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-upgrade - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-validation - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-webhooks - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-webresources-api - 3.10.0-SNAPSHOT + 3.10.0-04 @@ -467,13 +467,13 @@ org.sonatype.nexus nexus-pax-exam - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus nexus-test-common - 3.10.0-SNAPSHOT + 3.10.0-04 @@ -481,7 +481,7 @@ org.sonatype.nexus.assemblies nexus-startup-feature - 3.10.0-SNAPSHOT + 3.10.0-04 features xml @@ -489,7 +489,7 @@ org.sonatype.nexus.assemblies nexus-boot-feature - 3.10.0-SNAPSHOT + 3.10.0-04 features xml @@ -497,7 +497,7 @@ org.sonatype.nexus.assemblies nexus-base-feature - 3.10.0-SNAPSHOT + 3.10.0-04 features xml @@ -505,7 +505,7 @@ org.sonatype.nexus.assemblies nexus-core-feature - 3.10.0-SNAPSHOT + 3.10.0-04 features xml @@ -513,7 +513,7 @@ org.sonatype.nexus.assemblies nexus-base-template - 3.10.0-SNAPSHOT + 3.10.0-04 zip @@ -793,7 +793,7 @@ org.sonatype.nexus.buildsupport extjs-maven-plugin - 3.10.0-SNAPSHOT + 3.10.0-04 diff --git a/revision.txt b/revision.txt index 5b844c89e8..135bf012be 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -b=master,r=1f33574441ffda08270e6b5fdcba03bbef0ebffb,t=2018-03-25-1111-1994 \ No newline at end of file +b=release-3.10.0-04,r=f7b56bf088e8e313a210acbccc8b0739f446b962,t=2018-04-05-1124-03436 \ No newline at end of file diff --git a/thirdparty-bundles/elasticsearch/pom.xml b/thirdparty-bundles/elasticsearch/pom.xml index 23a7934dd5..c3a8b39d40 100644 --- a/thirdparty-bundles/elasticsearch/pom.xml +++ b/thirdparty-bundles/elasticsearch/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus.bundles nexus-thirdparty-bundles - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus.bundles.elasticsearch diff --git a/thirdparty-bundles/pom.xml b/thirdparty-bundles/pom.xml index 7cb50b3946..693062a272 100644 --- a/thirdparty-bundles/pom.xml +++ b/thirdparty-bundles/pom.xml @@ -20,7 +20,7 @@ org.sonatype.nexus nexus-parent - 3.10.0-SNAPSHOT + 3.10.0-04 org.sonatype.nexus.bundles @@ -41,7 +41,7 @@ org.sonatype.nexus.buildsupport nexus-buildsupport-all pom - 3.10.0-SNAPSHOT + 3.10.0-04 import @@ -50,7 +50,7 @@ org.sonatype.nexus.bundles org.sonatype.nexus.bundles.elasticsearch - 3.10.0-SNAPSHOT + 3.10.0-04