incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r700669 - in /incubator/nmaven/branches/NMAVEN-8-nunit: ./ components/maven-dotnet-assembler/ components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/ components/maven-dotnet-toolchain/
Date Wed, 01 Oct 2008 03:33:58 GMT
Author: brett
Date: Tue Sep 30 20:33:58 2008
New Revision: 700669

URL: http://svn.apache.org/viewvc?rev=700669&view=rev
Log:
switch to using Plexus logging. Remove the component-api references to stop Plexus getting
confused

Modified:
    incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-assembler/pom.xml
    incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetArtifactLocatorImpl.java
    incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-toolchain/pom.xml
    incubator/nmaven/branches/NMAVEN-8-nunit/pom.xml

Modified: incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-assembler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-assembler/pom.xml?rev=700669&r1=700668&r2=700669&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-assembler/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-assembler/pom.xml Tue
Sep 30 20:33:58 2008
@@ -45,10 +45,6 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-component-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
   </dependencies>

Modified: incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetArtifactLocatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetArtifactLocatorImpl.java?rev=700669&r1=700668&r2=700669&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetArtifactLocatorImpl.java
(original)
+++ incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetArtifactLocatorImpl.java
Tue Sep 30 20:33:58 2008
@@ -21,7 +21,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
-import java.util.logging.Logger;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -30,6 +29,8 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
+import org.codehaus.plexus.logging.LogEnabled;
+import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.FileUtils;
 
 /**
@@ -38,12 +39,11 @@
  * inefficient to make repetitively.
  */
 public final class DotnetArtifactLocatorImpl
-    implements DotnetArtifactLocator
+    implements DotnetArtifactLocator, LogEnabled
 {
     private MavenProjectBuilder projectBuilder;
 
-    // TODO: plexus logger?
-    private Logger logger = Logger.getAnonymousLogger();
+    private Logger logger;
 
     public String getAssemblyFileName( Artifact artifact, ArtifactRepository localRepository
)
     {
@@ -59,7 +59,7 @@
                 if ( build.getFinalName().indexOf( "${" ) < 0 )
                 {
                     finalName = build.getFinalName() + "." + artifact.getArtifactHandler().getExtension();
-                    logger.fine( "Using alternate final name for artifact: '" + artifact
+ "' = '" + finalName + "'" );
+                    logger.debug( "Using alternate final name for artifact: '" + artifact
+ "' = '" + finalName + "'" );
                 }
             }
         }
@@ -101,4 +101,9 @@
 
         return artifact.getFile();
     }
+
+    public void enableLogging( Logger logger )
+    {
+        this.logger = logger;
+    }
 }

Modified: incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-toolchain/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-toolchain/pom.xml?rev=700669&r1=700668&r2=700669&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-toolchain/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-toolchain/pom.xml Tue
Sep 30 20:33:58 2008
@@ -51,10 +51,6 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-component-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
     </dependency>
   </dependencies>

Modified: incubator/nmaven/branches/NMAVEN-8-nunit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/pom.xml?rev=700669&r1=700668&r2=700669&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-8-nunit/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-8-nunit/pom.xml Tue Sep 30 20:33:58 2008
@@ -195,6 +195,27 @@
     </pluginManagement>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.0-alpha-3</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <bannedDependencies>
+                  <excludes>
+                    <exclude>org.codehaus.plexus:plexus-component-api</exclude>
+                  </excludes>
+                </bannedDependencies>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.3</version>
       </plugin>
@@ -277,13 +298,8 @@
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-api</artifactId>
-        <version>1.0-alpha-32</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-container-default</artifactId>
-        <version>1.0-alpha-32</version>
+        <version>1.0-alpha-9-stable-1</version>
       </dependency>
     </dependencies>
   </dependencyManagement>



Mime
View raw message