This repository has been archived by the owner on Aug 11, 2020. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into squash-o-matic-output
Conflicts: nexus/nexus-api/pom.xml nexus/nexus-api/src/test/java/org/sonatype/nexus/proxy/item/DummyRepositoryItemUidFactory.java nexus/nexus-app/pom.xml nexus/nexus-configuration/pom.xml nexus/nexus-configuration/src/test/java/org/sonatype/nexus/configuration/application/SimpleApplicationConfiguration.java nexus/nexus-configuration/src/test/java/org/sonatype/nexus/configuration/application/upgrade/DummyApplicationStatusSource.java nexus/nexus-plugin-manager/pom.xml nexus/nexus-proxy/src/test/java/org/sonatype/nexus/configuration/SimpleApplicationConfiguration.java nexus/nexus-proxy/src/test/java/org/sonatype/nexus/configuration/SimpleProxyApplicationConfiguration.java nexus/nexus-proxy/src/test/java/org/sonatype/nexus/configuration/SimpleSecureApplicationConfiguration.java nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/attributes/perf/AttributeStoragePerformanceTestSupport.java nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/attributes/perf/DefaultFSAttributeStoragePerformanceIT.java nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/attributes/perf/HashMapAttributeStoragePerformanceIT.java nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/attributes/perf/JacksonJSONFSAttributeStoragePerformanceIT.java nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/attributes/perf/internal/OrderedRunner.java nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/attributes/perf/internal/TMockRepository.java nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/attributes/perf/internal/TestRepositoryItemUid.java nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/item/DummyRepositoryItemUidFactory.java nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/storage/local/fs/perf/DefaultFSLocalRepositoryStoragePerformance2IT.java nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/storage/local/fs/perf/DefaultFSLocalRepositoryStoragePerformanceIT.java nexus/nexus-utils/pom.xml nexus/pom.xml
- Loading branch information