revert r412961 - it wasn't working as designed and the test failed in a clean environ...

git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@417698 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java b/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java
index f0cc1248c796965a546135a039ff5cbbf3e36e20..57ee506857b2b83c8e085384dd9f9437192cb6e5 100644 (file)
--- a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java
+++ b/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java
@@ -95,11 +95,6 @@ public class DefaultRepositoryConverter
      */
     private boolean dryrun;
 
-    /**
-     * @plexus.configuration default-value="true"
-     */
-    private boolean mergeWithSourceMetadata;
-
     /**
      * @plexus.requirement
      */
@@ -125,8 +120,8 @@ public class DefaultRepositoryConverter
                     Versioning versioning = new Versioning();
                     versioning.addVersion( artifact.getBaseVersion() );
                     metadata.setVersioning( versioning );
-                    updateMetadata( new ArtifactRepositoryMetadata( artifact ), artifact.getRepository(),
-                                    targetRepository, metadata, transaction );
+                    updateMetadata( new ArtifactRepositoryMetadata( artifact ), targetRepository, metadata,
+                                    transaction );
 
                     metadata = createBaseMetadata( artifact );
                     metadata.setVersion( artifact.getBaseVersion() );
@@ -141,9 +136,10 @@ public class DefaultRepositoryConverter
                         versioning.setSnapshot( snapshot );
                     }
 
+                    // TODO: merge latest/release/snapshot from source instead
                     metadata.setVersioning( versioning );
-                    updateMetadata( new SnapshotArtifactRepositoryMetadata( artifact ), artifact.getRepository(),
-                                    targetRepository, metadata, transaction );
+                    updateMetadata( new SnapshotArtifactRepositoryMetadata( artifact ), targetRepository, metadata,
+                                    transaction );
 
                     if ( !dryrun )
                     {
@@ -163,17 +159,16 @@ public class DefaultRepositoryConverter
         return metadata;
     }
 
-    private void updateMetadata( RepositoryMetadata artifactMetadata, ArtifactRepository sourceRepository,
-                                 ArtifactRepository targetRepository, Metadata newMetadata,
-                                 FileTransaction transaction )
+    private void updateMetadata( RepositoryMetadata artifactMetadata, ArtifactRepository targetRepository,
+                                 Metadata newMetadata, FileTransaction transaction )
         throws RepositoryConversionException
     {
+        File file = new File( targetRepository.getBasedir(),
+                              targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
+
         Metadata metadata;
         boolean changed;
 
-        //merge with target repository metadata
-        File file = new File( targetRepository.getBasedir(),
-                              targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
         if ( file.exists() )
         {
             metadata = readMetadata( file );
@@ -185,19 +180,6 @@ public class DefaultRepositoryConverter
             metadata = newMetadata;
         }
 
-        //merge with source repository metadata
-        if ( mergeWithSourceMetadata )
-        {
-            File srcfile = new File( sourceRepository.getBasedir(),
-                                     sourceRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
-
-            if ( srcfile.exists() )
-            {
-                Metadata sourceMetadata = readMetadata( srcfile );
-                changed = changed || metadata.merge( sourceMetadata );
-            }
-        }
-
         if ( changed )
         {
             StringWriter writer = null;

diff --git a/maven-repository-converter/src/test/expected-files/v4artifact-source-merging-metadata.xml b/maven-repository-converter/src/test/expected-files/v4artifact-source-merging-metadata.xml
deleted file mode 100644 (file)
index f6fb7b1..0000000
--- a/maven-repository-converter/src/test/expected-files/v4artifact-source-merging-metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<metadata>
-  <groupId>test</groupId>
-  <artifactId>correctArtifactMetadata</artifactId>
-  <versioning>
-    <versions>
-      <version>1.0.0</version>
-      <version>2.0</version>
-    </versions>
-  </versioning>
-</metadata>
\ No newline at end of file

diff --git a/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java b/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
index 21b199bc5d688cafbdb5362e6fc967c5a20e9ebb..c60331de5631da1fcd8a0c2abcf38a25690a2002 100644 (file)
--- a/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
+++ b/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
@@ -732,39 +732,6 @@ public class RepositoryConverterTest
         assertFalse( "Check metadata not created", metadataFile.exists() );
     }
 
-    public void testSourceArtifactMetadataMerging()
-        throws Exception
-    {
-        // test metadata in target repository is merged with the metadata in the source repository
-
-        createModernSourceRepository();
-
-        Artifact artifact = createArtifact( "test", "correctArtifactMetadata", "1.0.0" );
-
-        repositoryConverter.convert( artifact, targetRepository, reporter );
-        checkSuccess();
-
-        File artifactFile = new File( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        assertTrue( "Check artifact created", artifactFile.exists() );
-        assertTrue( "Check artifact matches", FileUtils.contentEquals( artifactFile, artifact.getFile() ) );
-
-        artifact = createPomArtifact( artifact );
-        File pomFile = new File( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        File sourcePomFile = new File( sourceRepository.getBasedir(), sourceRepository.pathOf( artifact ) );
-        assertTrue( "Check POM created", pomFile.exists() );
-
-        compareFiles( sourcePomFile, pomFile );
-
-        ArtifactMetadata artifactMetadata = new ArtifactRepositoryMetadata( artifact );
-        File artifactMetadataFile = new File( targetRepository.getBasedir(),
-                                              targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
-        assertTrue( "Check artifact metadata created", artifactMetadataFile.exists() );
-
-        File expectedMetadataFile = getTestFile( "src/test/expected-files/v4artifact-source-merging-metadata.xml" );
-
-        compareFiles( expectedMetadataFile, artifactMetadataFile );
-    }
-
     public void testInvalidSourceSnapshotMetadata()
         throws Exception, MalformedURLException
     {

diff --git a/maven-repository-converter/src/test/source-modern-repository/test/correctArtifactMetadata/1.0.0/correctArtifactMetadata-1.0.0.jar b/maven-repository-converter/src/test/source-modern-repository/test/correctArtifactMetadata/1.0.0/correctArtifactMetadata-1.0.0.jar
deleted file mode 100644 (file)
index 72af4bc..0000000
--- a/maven-repository-converter/src/test/source-modern-repository/test/correctArtifactMetadata/1.0.0/correctArtifactMetadata-1.0.0.jar
+++ /dev/null
@@ -1 +0,0 @@
-incorrectMd5

diff --git a/maven-repository-converter/src/test/source-modern-repository/test/correctArtifactMetadata/1.0.0/correctArtifactMetadata-1.0.0.pom b/maven-repository-converter/src/test/source-modern-repository/test/correctArtifactMetadata/1.0.0/correctArtifactMetadata-1.0.0.pom
deleted file mode 100644 (file)
index a258834..0000000
--- a/maven-repository-converter/src/test/source-modern-repository/test/correctArtifactMetadata/1.0.0/correctArtifactMetadata-1.0.0.pom
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  ~ Copyright 2005-2006 The Apache Software Foundation.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>correctArtifactMetadata</artifactId>
-  <groupId>test</groupId>
-  <version>1.0.0</version>
-</project>

diff --git a/maven-repository-converter/src/test/source-modern-repository/test/correctArtifactMetadata/maven-metadata.xml b/maven-repository-converter/src/test/source-modern-repository/test/correctArtifactMetadata/maven-metadata.xml
deleted file mode 100644 (file)
index bfef089..0000000
--- a/maven-repository-converter/src/test/source-modern-repository/test/correctArtifactMetadata/maven-metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-  ~ Copyright 2005-2006 The Apache Software Foundation.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<metadata>
-  <groupId>test</groupId>
-  <artifactId>correctArtifactMetadata</artifactId>
-  <versioning>
-    <versions>
-      <version>1.0.0</version>
-      <version>2.0</version>
-    </versions>
-  </versioning>
-</metadata>
\ No newline at end of file