maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ogusa...@apache.org
Subject svn commit: r718731 - in /maven/mercury/trunk: mercury-md/mercury-md-sat/ mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/ mercury-wagon/ mercury-wagon/src/test/java/org/apache/maven/wagon/mercury/ mercury-wagon/src/test/nexus/
Date Tue, 18 Nov 2008 22:01:29 GMT
Author: ogusakov
Date: Tue Nov 18 14:01:29 2008
New Revision: 718731

URL: http://svn.apache.org/viewvc?rev=718731&view=rev
Log:
preparing for alpha-2 release, fixing http://jira.codehaus.org/browse/MERCURY-25

Removed:
    maven/mercury/trunk/mercury-wagon/src/test/nexus/
Modified:
    maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml
    maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java
    maven/mercury/trunk/mercury-wagon/pom.xml
    maven/mercury/trunk/mercury-wagon/src/test/java/org/apache/maven/wagon/mercury/MercuryWagonTest.java

Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml?rev=718731&r1=718730&r2=718731&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml Tue Nov 18 14:01:29 2008
@@ -1,6 +1,5 @@
 <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>
-  <groupId>org.apache.maven.mercury</groupId>
   <artifactId>mercury-md-sat</artifactId>
   <name>Mercury Dependency Builder</name>
   <description />

Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java?rev=718731&r1=718730&r2=718731&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java
(original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java
Tue Nov 18 14:01:29 2008
@@ -1,7 +1,6 @@
 package org.apache.maven.mercury.metadata;
 
 import java.io.IOException;
-import java.io.OutputStream;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.ArrayList;
@@ -13,7 +12,6 @@
 import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
 import org.apache.maven.mercury.logging.IMercuryLogger;
 import org.apache.maven.mercury.logging.MercuryLoggerManager;
-import org.apache.maven.mercury.metadata.sat.DefaultSatSolver;
 import org.codehaus.plexus.lang.DefaultLanguage;
 import org.codehaus.plexus.lang.Language;
 /**

Modified: maven/mercury/trunk/mercury-wagon/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-wagon/pom.xml?rev=718731&r1=718730&r2=718731&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-wagon/pom.xml (original)
+++ maven/mercury/trunk/mercury-wagon/pom.xml Tue Nov 18 14:01:29 2008
@@ -15,33 +15,11 @@
     <plexus.appbooter.version>1.4</plexus.appbooter.version>
     <plexus.container.version>1.0-alpha-47</plexus.container.version>
     <plexus.utils.version>1.5.1</plexus.utils.version>
-    <nexus.version>1.0.1</nexus.version>
-
-    <nexus-security-enabled>false</nexus-security-enabled>
 
     <distMgmtSnapshotsId>apache.snapshots</distMgmtSnapshotsId>
     <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
     <distMgmtSnapshotsUrl>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</distMgmtSnapshotsUrl>
 
-    <bundle-expanded-dir>target</bundle-expanded-dir>
-    <config-expanded-dir>target/test-nexus-config</config-expanded-dir>
-
-    <nexus-relative-basedir>${bundle-expanded-dir}/nexus-webapp-${nexus.version}</nexus-relative-basedir>
-    <nexus-abs-basedir>${project.build.directory}/nexus-webapp-${nexus.version}</nexus-abs-basedir>
-
-    <config-target-dir>${nexus-abs-basedir}/runtime/apps/nexus/conf</config-target-dir>
-    <work-target-dir>${nexus-abs-basedir}/runtime/work</work-target-dir>
-    <nexus-plexus-config-file>${nexus-abs-basedir}/conf/plexus.xml</nexus-plexus-config-file>
-
-    <nexus-application-protocol>http</nexus-application-protocol>
-    <nexus-application-host>localhost</nexus-application-host>
-    <nexus-application-name>nexus</nexus-application-name>
-    <nexus-application-port>8091</nexus-application-port>
-    <jetty-application-host>0.0.0.0</jetty-application-host>
-
-    <nexus-base-url>${nexus-application-protocol}://${nexus-application-host}:${nexus-application-port}/${nexus-application-name}/</nexus-base-url>
-
-    <nexus-control-port>33002</nexus-control-port>
   </properties>
 
 
@@ -76,30 +54,6 @@
         <filtering>true</filtering>
       </testResource>
 
-      <testResource>
-        <directory>src/test/nexus</directory>
-        <filtering>false</filtering>
-        <excludes>
-            <exclude>work/conf/**</exclude>
-        </excludes>
-        <targetPath>../nexus-webapp-${nexus.version}/runtime</targetPath>
-      </testResource>
-
-      <testResource>
-        <directory>src/test/nexus</directory>
-        <filtering>true</filtering>
-        <includes>
-            <include>work/conf/**</include>
-        </includes>
-        <targetPath>../nexus-webapp-${nexus.version}/runtime</targetPath>
-      </testResource>
-
-      <testResource>
-        <directory>src/test/nexus/conf</directory>
-        <filtering>true</filtering>
-        <targetPath>../nexus-webapp-${nexus.version}/conf</targetPath>
-      </testResource>
-
     </testResources>
 
     <plugins>
@@ -127,25 +81,6 @@
       </plugin>
 
       <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.0</version>
-        <executions>
-          <execution>
-            <id>unpack-bundle</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <configuration>
-              <includeArtifactIds>nexus-webapp</includeArtifactIds>
-              <outputDirectory>${bundle-expanded-dir}</outputDirectory>
-              <excludes>**/conf/plexus.properties</excludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.4</version>
@@ -161,75 +96,16 @@
               <goal>test</goal>
             </goals>
             <configuration>
+            <!-- had to remove all tests till finding appropriate DAV server: http://jira.codehaus.org/browse/MERCURY-25
-->
               <skip>true</skip>
             </configuration>
           </execution>
         </executions>
       </plugin>
 
-<!--
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>1.1</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <finalName>${project.artifactId}-${project.version}-uber</finalName>
-              <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
-              <createDependencyReducedPom>true</createDependencyReducedPom>
-              <artifactSet>
-                <includes>
-
-                  <include>org.apache.maven.mercury:mercury-crypto-api</include>
-                  <include>org.apache.maven.mercury:mercury-crypto-basic</include>
-                  <include>org.apache.maven.mercury:mercury-transport-api</include>
-                  <include>org.apache.maven.mercury:mercury-transport-http</include>
-                  <include>org.apache.maven.mercury:mercury-util</include>
-
-                  <include>org.mortbay.jetty:jetty</include>
-                  <include>org.mortbay.jetty:jetty-client</include>
-                  <include>org.mortbay.jetty:jetty-ssl</include>
-                  <include>org.mortbay.jetty:jetty-util</include>
-                  <include>org.mortbay.jetty:servlet-api</include>
-
-                  <include>org.codehaus.plexus:plexus-lang</include>
-
-                  <include>org.slf4j:slf4j-api</include>
-                  <include>org.slf4j:slf4j-jdk14</include>
-
-                </includes>
-
-                <excludes>
-                  <exclude>org.codehaus.plexus:plexus-component-api</exclude>
-                  <exclude>org.bouncycastle:bcprov-jdk15</exclude>
-                  <exclude>org.bouncycastle:bcpg-jdk15</exclude>
-                  <exclude>bouncycastle:bcprov-jdk15</exclude>
-                  <exclude>bouncycastle:bcpg-jdk15</exclude>
-                </excludes>
-
-              </artifactSet>
-
-              <filters>
-                <filter>
-                  <excludes>
-                    <exclude>/META-INF/BCKEY.DSA</exclude>
-                    <exclude>/META-INF/BCKEY.SF</exclude>
-                  </excludes>
-                </filter>
-              </filters>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
- -->
     </plugins>
   </build>
 
-
   <dependencies>
 
     <dependency>
@@ -266,21 +142,10 @@
       <artifactId>plexus-utils</artifactId>
       <version>${plexus.utils.version}</version>
     </dependency>
-
     <dependency>
-      <groupId>org.sonatype.nexus</groupId>
-      <artifactId>nexus-webapp</artifactId>
-      <version>${nexus.version}</version>
-      <classifier>bundle</classifier>
-      <type>zip</type>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.sonatype.appbooter</groupId>
-      <artifactId>plexus-forked-app-booter</artifactId>
-      <version>${plexus.appbooter.version}</version>
-      <scope>test</scope>
+    	<groupId>org.slf4j</groupId>
+    	<artifactId>slf4j-api</artifactId>
+    	<version>1.5.2</version>
     </dependency>
 
   </dependencies>

Modified: maven/mercury/trunk/mercury-wagon/src/test/java/org/apache/maven/wagon/mercury/MercuryWagonTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-wagon/src/test/java/org/apache/maven/wagon/mercury/MercuryWagonTest.java?rev=718731&r1=718730&r2=718731&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-wagon/src/test/java/org/apache/maven/wagon/mercury/MercuryWagonTest.java
(original)
+++ maven/mercury/trunk/mercury-wagon/src/test/java/org/apache/maven/wagon/mercury/MercuryWagonTest.java
Tue Nov 18 14:01:29 2008
@@ -15,7 +15,6 @@
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.WagonTestCase;
 import org.codehaus.plexus.PlexusContainer;
-import org.sonatype.appbooter.ForkedAppBooter;
 
 /**
  *
@@ -28,11 +27,7 @@
 extends WagonTestCase
 {
 
-  public static final String TEST_NEXUS_ROLE = ForkedAppBooter.ROLE;
-  public static final String TEST_NEXUS_HINT = "NexusForkedAppBooter";
-
   PlexusContainer plexus;
-  ForkedAppBooter nexusForkedAppBooter;
   
   String nexusReleasesTestDir = "./target/nexus-webapp-1.0.0/runtime/work/storage/releases";
   String nexusReleasesTestUrl = "http://127.0.0.1:8091/nexus/content/repositories/releases";
@@ -106,10 +101,6 @@
     plexus = getContainer();
 
     assertNotNull( plexus );
-    
-    nexusForkedAppBooter = (ForkedAppBooter)plexus.lookup( TEST_NEXUS_ROLE, TEST_NEXUS_HINT
 );
-    
-    nexusForkedAppBooter.start();
 
   }
   
@@ -118,7 +109,6 @@
   throws Exception
   {
     super.tearDown();
-    nexusForkedAppBooter.stop();
   }
   
   @Override



Mime
View raw message