You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/04/23 02:10:06 UTC
[1/2] git commit: more details
Repository: archiva
Updated Branches:
refs/heads/master 6611fc497 -> 6028e6963
more details
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/79cf366b
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/79cf366b
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/79cf366b
Branch: refs/heads/master
Commit: 79cf366b8340bd99525403d8642146a4c98caf89
Parents: 6611fc4
Author: Olivier Lamy <ol...@apache.org>
Authored: Tue Apr 22 23:02:35 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Tue Apr 22 23:02:35 2014 +1000
----------------------------------------------------------------------
.../archiva/repository/scanner/InvalidScanConsumer.java | 9 +++++++++
.../archiva/repository/scanner/RepositoryScannerTest.java | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/79cf366b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java
index a253179..6632c0f 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java
@@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -49,6 +50,8 @@ public class InvalidScanConsumer
private int processCount = 0;
+ private List<String> paths = new ArrayList<>( );
+
@Override
public void beginScan( ManagedRepository repository, Date whenGathered )
throws ConsumerException
@@ -92,6 +95,7 @@ public class InvalidScanConsumer
throws ConsumerException
{
logger.info( "processFile: {}", path );
+ paths.add( path );
processCount++;
}
@@ -134,4 +138,9 @@ public class InvalidScanConsumer
{
this.id = id;
}
+
+ public List<String> getPaths()
+ {
+ return paths;
+ }
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/79cf366b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java
index dc40787..721d97c 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java
@@ -253,7 +253,7 @@ public class RepositoryScannerTest
assertNotNull( "Stats should not be null.", stats );
assertMinimumHits( "Stats.totalFileCount", 17, stats.getTotalFileCount() );
assertMinimumHits( "Processed Count", 17, consumer.getProcessCount() );
- assertEquals( "Processed Count (of invalid items)", 6, badconsumer.getProcessCount() );
+ assertEquals( "Processed Count (of invalid items):" + badconsumer.getPaths(), 6, badconsumer.getProcessCount() );
}
@Test
[2/2] git commit: [MRM-1832]
RepositoryScannerTest#testDefaultRepositoryScanner fails on Linux with src
release zip
Posted by ol...@apache.org.
[MRM-1832] RepositoryScannerTest#testDefaultRepositoryScanner fails on Linux with src release zip
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/6028e696
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/6028e696
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/6028e696
Branch: refs/heads/master
Commit: 6028e69630b52125594cf2526f76cd772d84653a
Parents: 79cf366
Author: Olivier Lamy <ol...@apache.org>
Authored: Wed Apr 23 10:09:16 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Wed Apr 23 10:09:16 2014 +1000
----------------------------------------------------------------------
pom.xml | 18 ++++++++++++
src/main/assembly/src.xml | 64 ++++++++++++++++++++++++++++--------------
2 files changed, 61 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/6028e696/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 79a950b..6b2c42b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1865,8 +1865,26 @@
<artifactId>maven-assembly-plugin</artifactId>
<inherited>false</inherited>
<configuration>
+ <appendAssemblyId>false</appendAssemblyId>
<finalName>apache-archiva-${project.version}-src</finalName>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/src.xml</descriptor>
+ </descriptors>
</configuration>
+ <executions>
+ <execution>
+ <inherited>false</inherited>
+ <id>source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <tarLongFileFormat>gnu</tarLongFileFormat>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/archiva/blob/6028e696/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
index ff66e9a..8459755 100644
--- a/src/main/assembly/src.xml
+++ b/src/main/assembly/src.xml
@@ -25,34 +25,56 @@
<format>zip</format>
</formats>
<fileSets>
+ <!-- main project directory structure -->
<fileSet>
- <useDefaultExcludes>false</useDefaultExcludes>
<directory>.</directory>
<outputDirectory>/</outputDirectory>
- <includes>
- <include>**/CVS/**</include>
- </includes>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <!-- build output -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
+
+ <!-- NOTE: Most of the following excludes should not be required
+ if the standard release process is followed. This is because the
+ release plugin checks out project sources into a location like
+ target/checkout, then runs the build from there. The result is
+ a source-release archive that comes from a pretty clean directory
+ structure.
+
+ HOWEVER, if the release plugin is configured to run extra goals
+ or generate a project website, it's definitely possible that some
+ of these files will be present. So, it's safer to exclude them.
+ -->
+
+ <!-- IDEs -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?out(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
+
+ <!-- misc -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
+
+ <!-- release-plugin temp files -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
+ </excludes>
</fileSet>
<fileSet>
+ <useDefaultExcludes>false</useDefaultExcludes>
<directory>.</directory>
<outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>**/target/**</exclude>
- <exclude>**/archiva-webapp/src/main/webapp/archiva-applet.jar</exclude>
- <exclude>**/archiva-webapp/src/main/webapp/META-INF/**</exclude>
- <exclude>**/archiva-webapp/src/main/webapp/images/redback/**</exclude>
- <exclude>**/archiva-webapp/src/main/webapp/template/redback/**</exclude>
- <exclude>**/archiva-webapp/src/main/webapp/WEB-INF/classes/**</exclude>
- <exclude>**/archiva-webapp/src/main/webapp/WEB-INF/lib/**</exclude>
- <exclude>**/archiva-webapp/src/main/webapp/WEB-INF/database/**</exclude>
- <exclude>**/archiva-webapp/src/main/webapp/WEB-INF/logs/**</exclude>
- <exclude>**/archiva-webapp/src/main/webapp/redback/**</exclude>
- <exclude>**/archiva-webapp/src/main/webapp/css/redback/**</exclude>
- <exclude>**/archiva-webapp/src/main/webapp/WEB-INF/jsp/redback/**</exclude>
- <exclude>**/archiva-webapp/src/main/webapp/WEB-INF/template/redback/**</exclude>
- <exclude>**/archiva-webapp/src/main/webapp/WEB-INF/logs/**</exclude>
- <exclude>**/archiva-webapp/src/main/webapp/WEB-INF/temp/**</exclude>
- </excludes>
+ <includes>
+ <include>**/CVS/**</include>
+ </includes>
</fileSet>
<fileSet>
<directory>target/maven-shared-archive-resources/META-INF/</directory>