Permalink
Browse files

Merge pull request #661 from sonatype/squash-o-matic-output

Squash-o-matic output
  • Loading branch information...
2 parents 1b147dd + 0bcec30 commit d28ef3648959350ef4c98ba2f1181bc265bc2ea0 @cstamas cstamas committed Jan 4, 2013
Showing 1,726 changed files with 940 additions and 2,534 deletions.
View
@@ -1,110 +0,0 @@
-<!--
-
- Sonatype Nexus (TM) Open Source Version
- 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,
- which accompanies this distribution and is available at http://www.eclipse.org/legal/epl-v10.html.
-
- Sonatype Nexus (TM) Professional Version is available from Sonatype, Inc. "Sonatype" and "Sonatype Nexus" are trademarks
- of Sonatype, Inc. Apache Maven is a trademark of the Apache Software Foundation. M2eclipse is a trademark of the
- Eclipse Foundation. All other trademarks are the property of their respective owners.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus</artifactId>
- <version>2.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>nexus-api</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus-utils</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus-compat</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-bean</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-plexus</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.sisu.inject</groupId>
- <artifactId>guice-multibindings</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.sisu.inject</groupId>
- <artifactId>guice-assistedinject</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-annotations</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-task-scheduler</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.configuration</groupId>
- <artifactId>base-configuration</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-locks</artifactId>
- </dependency>
-
- <dependency>
- <groupId>eu.medsea.mimeutil</groupId>
- <artifactId>mime-util</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.plugin</groupId>
- <artifactId>plugin-host-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.sisu.goodies</groupId>
- <artifactId>goodies-eventbus</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus-test-common</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
@@ -1,26 +0,0 @@
-/*
- * Sonatype Nexus (TM) Open Source Version
- * 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,
- * which accompanies this distribution and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Sonatype Nexus (TM) Professional Version is available from Sonatype, Inc. "Sonatype" and "Sonatype Nexus" are trademarks
- * of Sonatype, Inc. Apache Maven is a trademark of the Apache Software Foundation. M2eclipse is a trademark of the
- * Eclipse Foundation. All other trademarks are the property of their respective owners.
- */
-package org.sonatype.nexus.proxy.item;
-
-import org.sonatype.nexus.proxy.NoSuchRepositoryException;
-
-public class DummyRepositoryItemUidFactory
- extends AbstractRepositoryItemUidFactory
-{
- public DefaultRepositoryItemUid createUid( String uidStr )
- throws IllegalArgumentException, NoSuchRepositoryException
- {
- throw new UnsupportedOperationException(
- "This dummy factory does not supports this method (it needs repo registry et al)" );
- }
-}
View
@@ -1,150 +0,0 @@
-<!--
-
- Sonatype Nexus (TM) Open Source Version
- 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,
- which accompanies this distribution and is available at http://www.eclipse.org/legal/epl-v10.html.
-
- Sonatype Nexus (TM) Professional Version is available from Sonatype, Inc. "Sonatype" and "Sonatype Nexus" are trademarks
- of Sonatype, Inc. Apache Maven is a trademark of the Apache Software Foundation. M2eclipse is a trademark of the
- Eclipse Foundation. All other trademarks are the property of their respective owners.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus</artifactId>
- <version>2.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>nexus-app</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-plexus</artifactId>
- </dependency>
- <dependency>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus-plugin-manager</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus-oss-edition</artifactId>
- </dependency>
- <dependency>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus-proxy</artifactId>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </dependency>
- <dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-task-scheduler</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.security.realms</groupId>
- <artifactId>security-xml-realm</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-mailer</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.sisu.pr</groupId>
- <artifactId>sisu-problem-reporter</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.swizzle</groupId>
- <artifactId>swizzle-jira</artifactId>
- <version>1.4</version>
- <exclusions>
- <exclusion>
- <groupId>xmlrpc</groupId>
- <artifactId>xmlrpc-client</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>xmlrpc-client</artifactId>
- <version>3.1.3</version>
- <exclusions>
- <exclusion>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Testing -->
- <dependency>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus-test-common</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.sonatype.plexus</groupId>
- <artifactId>plexus-jetty-testsuite</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.sonatype.sisu.pr</groupId>
- <artifactId>sisu-pr-testutil</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus-proxy</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
@@ -1,11 +0,0 @@
-<security-configuration>
- <version>2.0.3</version>
- <enabled>true</enabled>
- <anonymousAccessEnabled>true</anonymousAccessEnabled>
- <anonymousUsername>anonymous</anonymousUsername>
- <anonymousPassword>anonymous</anonymousPassword>
- <realms>
- <realm>default</realm>
- </realms>
-
-</security-configuration>
@@ -24,6 +24,7 @@
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.conn.params.ConnRoutePNames;
+import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
import org.apache.http.params.CoreProtocolPNames;
import org.sonatype.nexus.client.core.Condition;
import org.sonatype.nexus.client.core.spi.SubsystemFactory;
@@ -26,9 +26,17 @@
<artifactId>nexus-configuration-model</artifactId>
<dependencies>
+
+ <!-- Model needs this -->
<dependency>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus-api</artifactId>
+ <groupId>org.sonatype.configuration</groupId>
+ <artifactId>base-configuration</artifactId>
+ </dependency>
+
+ <!-- Modello classes needs this -->
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
Oops, something went wrong.

0 comments on commit d28ef36

Please sign in to comment.