[maven2 build - SUCCESS] Wed Apr 6 02:07:00 EDT 2005
Distribution: http://www.codehaus.org/~maven/m2/m2-20050406.020700.tar.gz Log: http://www.codehaus.org/~maven/m2-build-logs/m2-build-log-20050406.020700.txt
cvs commit: maven-components/maven-plugins/maven-assembly-plugin deploy.sh build.sh
brett 2005/04/05 23:52:05 Modified:maven-plugins/maven-assembly-plugin build.sh Added: maven-plugins/maven-assembly-plugin deploy.sh Log: Revision ChangesPath 1.2 +1 -2 maven-components/maven-plugins/maven-assembly-plugin/build.sh Index: build.sh === RCS file: /home/cvs/maven-components/maven-plugins/maven-assembly-plugin/build.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.sh 6 Apr 2005 06:20:07 - 1.1 +++ build.sh 6 Apr 2005 06:52:04 - 1.2 @@ -10,8 +10,7 @@ cp pom.xml pom.xml.backup cat pom.xml.backup | sed 's#packagingmaven-plugin/packaging##' pom.xml -m2 clean:clean plugin:descriptor package -cp target/maven-assembly-plugin-1.0-SNAPSHOT.jar $REPO/org/apache/maven/plugins/maven-assembly-plugin/1.0-SNAPSHOT +m2 clean:clean plugin:descriptor install mv pom.xml.backup pom.xml cp pom.xml $REPO/org/apache/maven/plugins/maven-assembly-plugin/1.0-SNAPSHOT/maven-assembly-plugin-1.0-SNAPSHOT.pom 1.1 maven-components/maven-plugins/maven-assembly-plugin/deploy.sh Index: deploy.sh === #!/bin/sh # # WORKAROUND FOR http://jira.codehaus.org/browse/MNG-214 # REPO=$HOME/repository-new cp pom.xml pom.xml.backup cat pom.xml.backup | sed 's#packagingmaven-plugin/packaging##' pom.xml #m2 clean:clean plugin:descriptor deploy version=`cat $REPO/org/apache/maven/plugins/maven-assembly-plugin/1.0-SNAPSHOT/maven-assembly-plugin-1.0-SNAPSHOT.version.txt` cat pom.xml.backup | sed s#version1.0-SNAPSHOT/version#version$version/version# pom.xml scp pom.xml [EMAIL PROTECTED]:/home/projects/maven/repository-staging/to-ibiblio/maven2/org/apache/maven/plugins/maven-assembly-plugin/1.0-SNAPSHOT/maven-assembly-plugin-$version.pom mv pom.xml.backup pom.xml
cvs commit: maven-components/maven-plugins/maven-assembly-plugin deploy.sh
brett 2005/04/05 23:54:30 Modified:maven-plugins/maven-assembly-plugin deploy.sh Log: repairs on scripts Revision ChangesPath 1.2 +1 -1 maven-components/maven-plugins/maven-assembly-plugin/deploy.sh Index: deploy.sh === RCS file: /home/cvs/maven-components/maven-plugins/maven-assembly-plugin/deploy.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- deploy.sh 6 Apr 2005 06:52:04 - 1.1 +++ deploy.sh 6 Apr 2005 06:54:30 - 1.2 @@ -9,7 +9,7 @@ cp pom.xml pom.xml.backup cat pom.xml.backup | sed 's#packagingmaven-plugin/packaging##' pom.xml -#m2 clean:clean plugin:descriptor deploy +m2 clean:clean plugin:descriptor deploy version=`cat $REPO/org/apache/maven/plugins/maven-assembly-plugin/1.0-SNAPSHOT/maven-assembly-plugin-1.0-SNAPSHOT.version.txt` cat pom.xml.backup | sed s#version1.0-SNAPSHOT/version#version$version/version# pom.xml
[maven2 build - SUCCESS] Wed Apr 6 03:07:00 EDT 2005
Distribution: http://www.codehaus.org/~maven/m2/m2-20050406.030700.tar.gz Log: http://www.codehaus.org/~maven/m2-build-logs/m2-build-log-20050406.030700.txt
cvs commit: maven-components/maven-core README.txt
brett 2005/04/06 00:36:18 Modified:maven-core README.txt Log: note about JAVA_HOME Revision ChangesPath 1.5 +3 -1 maven-components/maven-core/README.txt Index: README.txt === RCS file: /home/cvs/maven-components/maven-core/README.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- README.txt6 Apr 2005 07:06:04 - 1.4 +++ README.txt6 Apr 2005 07:36:18 - 1.5 @@ -15,7 +15,9 @@ or set PATH=c:\program files\maven-2.0-SNAPSHOT\bin;%PATH% -4) Run m2 to verify that it is correctly installed. It should output a short build message, but do nothing +4) Make sure JAVA_HOME is set to the location of your JDK + +5) Run m2 to verify that it is correctly installed. It should output a short build message, but do nothing For more information, please see http://maven.apache.org/maven2/
cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/artifact MavenMetadataSource.java
brett 2005/04/06 00:38:14
Modified:maven-core/src/main/java/org/apache/maven/artifact
MavenMetadataSource.java
Log:
get the base version, not the resolved version
Revision ChangesPath
1.26 +2 -2
maven-components/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java
Index: MavenMetadataSource.java
===
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- MavenMetadataSource.java 29 Mar 2005 16:41:13 - 1.25
+++ MavenMetadataSource.java 6 Apr 2005 07:38:14 - 1.26
@@ -87,7 +87,7 @@
{
Artifact metadataArtifact = artifactFactory.createArtifact(
artifact.getGroupId(),
artifact.getArtifactId(),
-
artifact.getVersion(), artifact.getScope(),
+
artifact.getBaseVersion(), artifact.getScope(),
pom, null );
try
cvs commit: maven-components/maven-mboot2 pom.xml
brett 2005/04/06 00:38:42 Modified:maven-mboot2 pom.xml Log: xpp3 plugin was renamed Revision ChangesPath 1.11 +1 -1 maven-components/maven-mboot2/pom.xml Index: pom.xml === RCS file: /home/cvs/maven-components/maven-mboot2/pom.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- pom.xml 5 Apr 2005 16:30:54 - 1.10 +++ pom.xml 6 Apr 2005 07:38:42 - 1.11 @@ -13,7 +13,7 @@ dependencies dependency groupIdorg.codehaus.modello/groupId - artifactIdmodello-xpp3-plugin/artifactId + artifactIdmodello-plugin-xpp3/artifactId version1.0-alpha-1/version scoperuntime/scope /dependency
cvs commit: maven-components/maven-script/maven-script-marmalade pom.xml
jdcasey 2005/04/06 08:53:32 Modified:maven-script/maven-script-marmalade pom.xml Log: changed the marmalade dependency to reference the latest slipstream 1.0-alpha-2 release of marmalade that excludes xpp3, using plexus-utils instead. Revision ChangesPath 1.10 +1 -1 maven-components/maven-script/maven-script-marmalade/pom.xml Index: pom.xml === RCS file: /home/cvs/maven-components/maven-script/maven-script-marmalade/pom.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pom.xml 6 Apr 2005 05:07:50 - 1.9 +++ pom.xml 6 Apr 2005 15:53:32 - 1.10 @@ -19,7 +19,7 @@ dependency groupIdmarmalade/groupId artifactIdmarmalade-core/artifactId - version1.0-alpha2/version + version1.0-alpha-2/version /dependency dependency groupIdplexus/groupId
cvs commit: maven-components/maven-meeper/src/site/apt repository-synchronization-refactor-20050406.apt
jdcasey 2005/04/06 21:30:37 Added: maven-meeper/src/site/apt repository-synchronization-refactor-20050406.apt Log: Adding summary of changes for repo sync refactor. Revision ChangesPath 1.1 maven-components/maven-meeper/src/site/apt/repository-synchronization-refactor-20050406.apt Index: repository-synchronization-refactor-20050406.apt === --- Maven Repository Synchronization Refactor: Summary of Changes --- John Casey --- 2005-April-06 --- Summary of Changes for the Maven Repository Synchronization Process *Abstract In order to support the impending release of maven2 from a production-ready repository on ibiblio.org, several things had to be changed. Most importantly, we had to somehow find a way to synchronize the maven1 repository and feeds with maven2's repository, and find a way to integrate this conversion process with the synchronization already taking place on beaver.codehaus.org. What follows is a description of the changes I made to the original maven1 synchronization process in order to accommodate maven2's release. *Conversion First, we needed a reliable tool to convert a maven1 repository into a maven2 repository. There are several tasks involved in this process: [[1]] Parsing artifact paths for artifact information. [[2]] Moving artifacts from source repo to target repo, reformatting the relative artifact paths along the way (to conform with the new repo layout for m2). [[3]] Translating m1 POMs into m2 POMs, and creating skeletal POMs where they were missing, using the artifact information parsed in [1] above. [[4]] Repairing and/or moving MD5 checksums for each artifact from source to target repository. [[5]] Preserving a good log of errors encountered during the conversion process, for later auditing. Since I had limited time with which to implement a solution, and didn't have much familiarity with pre-existing repository conversion tools made by Carlos et al. I decided to design my own solution to the problem, and worry about merging with other tools later. The solution I have created is called repoclean, and can be found in maven-components/sandbox/repoclean. It's a plexus application, with some basic bash shell scripts used to install and run the application. The steps enumerated above were implemented as separate components, then stitched together with a Main class and controller component which serves as the entry point for Main. As a final point, the reporting takes place both at the entire-process level for operations such as artifact discovery, and at the per-artifact level. A report is only written in the event of an error or warning, and per-artifact reports are mentioned in the entire-process report if they contained an error. In the event that an error was detected, the entire-process report should be mailed to the m2-dev list with a subject similar to: [REPOCLEAN] Error(s) occurred while converting the repository. Other reports can be found in the reports directory of the sync work directory (mentioned below). *Synchronization Now, the synchronization process as-is was only maintaining a maven1 repository from a set of feeds. In order to refactor this into a maintenance process for both maven1 and maven2 repositories, I had to make a few minor changes. In order to aid in understanding this process, I moved the tools suite into $HOME/repository-tools. I moved the synchronization work directory (the directory into which all feeds will copy, and which the outbound rsync will use as a source) into $HOME/repository-staging. The tools suite (in $HOME/repository-tools) does NOT contain the only copy of syncopate and the outbound rsync script, only the copies I made and modified for the new synchronization process...this was an insurance policy made to allow rollback. As I said, I made some minor changes to the existing process. These mainly consisted of reconfiguring syncopate and the outbound rsync script to use the new directory structures, along with adding a control script which would be called from cron, and which would inject a call to repoclean into the middle of the process. The new controller script was used to consolidate all synchronization logic into the repository-tools directory, and expose it all equally as scripts to be maintained as a unit. Now, the crontab entry is very simple, only referencing the controller script. The new synchronization process executes the following operations: [[1]] Run syncopate to collect
repository synchronization restored
we're on the new repo synchronization stuff now. all seems to be functioning well, and we're starting to convert the m2 codebase to use ibiblio via a redirect at repo1.maven.org. Please let me know if you find problems with repository synchronization. -john
