Skip to content
This repository has been archived by the owner on Aug 11, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/master' into squash-o-matic-output
Browse files Browse the repository at this point in the history 
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
@cstamas
cstamas committed Dec 5, 2012
2 parents cbba95a + 06909c4 commit a830402
Show file tree
Hide file tree
Showing 2,529 changed files with 6,305 additions and 17,083 deletions.
2 changes: 1 addition & 1 deletion header-eplv1.txt → header.txt
View file
@@ -1,5 +1,5 @@
Sonatype Nexus (TM) Open Source Version
Copyright (c) 2007-${year} Sonatype, Inc.
Copyright (c) 2007-2012 Sonatype, Inc.
All rights reserved. Includes the third-party code listed at http://links.sonatype.com/products/nexus/oss/attributions.

This program and the accompanying materials are made available under the terms of the Eclipse Public License Version 1.0,
Expand Down
1 change: 0 additions & 1 deletion nexus-maven-plugins/nexus-maven-plugin/.gitignore
View file

This file was deleted.

0 comments on commit a830402

Please sign in to comment.