initially, i just followed the simple starting instructions, which don’t use the –prefix option to git svn init.

it wasn’t long before i saw someone’s suggestion to add a svn prefix to the remote branch names.. as a way of segregating the namespace, and to easily allow me to have local branches that have the same name.

i searched around, but there weren’t any explicit instructions on how to add the prefix post-init. well, you can. here’s how.

in your .git/config, there will be a block for the SVN configuration:

[svn-remote "svn"]
	url = http://example.com/your/repo/root
	fetch = trunk:refs/remotes/svn/trunk
	branches = branches/*:refs/remotes/svn/*
	tags = tags/*:refs/remotes/svn/tags/*

what you will want to do is edit this file and add the /svn entries that i have in bold.

then, re-run git svn fetch. this will populate the new branches. thanks to the metadata git-svn keeps, its aware that there are already local commits that correspond to specific SVN revisions.

finally, you can delete all of the old branches using something like git branch -d -r | grep -v svn | xargs -n 1 git branch -d -r

then sit back and bask in your new prefixed life

i needed to publish a jar containing the asdocs, but alas, the asdoc plugin doesn’t contain an equivalent to the javadoc:jar goal from the javadoc plugin.

needing something immediately, GMaven to the rescue!

the below profile will generate an attached jar when running mvn -P release

<profiles>
    <profile>
        <id>release</id>
        <build>
            <plugins>
                <plugin>
                    <groupId>info.flex-mojos</groupId>
                    <artifactId>asdoc-mojo</artifactId>
                    <executions>
                        <execution>
                            <phase>package</phase>
                            <id>attach-asdocs</id>
                            <goals>
                                <goal>asdoc</goal>
                            </goals>
                        </execution>
                    </executions>
                </plugin>
                <plugin>
                    <groupId>org.codehaus.groovy.maven</groupId>
                    <artifactId>gmaven-plugin</artifactId>
                    <version>1.0-rc-3</version>
                    <executions>
                        <execution>
                            <id>package-asdoc</id>
                            <phase>package</phase>
                            <goals>
                                <goal>execute</goal>
                            </goals>
                            <configuration>
                                <classpath>
                                    <classpath>
                                        <groupId>org.codehaus.plexus</groupId>
                                        <artifactId>plexus-archiver</artifactId>
                                    </classpath>
                                    <classpath>
                                        <groupId>org.apache.maven</groupId>
                                        <artifactId>maven-archiver</artifactId>
                                    </classpath>
                                </classpath>
                                <source>
                                    import org.codehaus.plexus.archiver.Archiver;
                                    import org.codehaus.plexus.archiver.jar.JarArchiver;
                                    import org.apache.maven.archiver.MavenArchiver;
                                    import org.apache.maven.archiver.MavenArchiveConfiguration;

                                    File asDocJar = new File(project.build.directory, "${project.build.finalName}-asdoc.jar")

                                    if( asDocJar.exists() ) asDocJar.delete()

                                    archiver = new MavenArchiver()
                                    archiver.archiver = new JarArchiver()
                                    archiver.outputFile = asDocJar
                                    archiver.archiver.addDirectory( new File(project.build.directory, "site/asdocs") )

                                    archive = new MavenArchiveConfiguration()
                                    archive.addMavenDescriptor = false

                                    archiver.createArchive( project, archive )

                                    helper = session.lookup("org.apache.maven.project.MavenProjectHelper")

                                    // need to attach to the *original* project
                                    // http://jira.codehaus.org/browse/MGROOVY-172
                                    project.class.getDeclaredField("original").accessible = true
                                    helper.attachArtifact( project.original, "zip", "asdoc", asDocJar )
                                </source>
                            </configuration>
                        </execution>
                    </executions>
                </plugin>
            </plugins>
        </build>

        <dependencies>
            <dependency>
              <groupId>org.codehaus.plexus</groupId>
              <artifactId>plexus-archiver</artifactId>
              <version>1.0-alpha-7</version>
            </dependency>
            <dependency>
              <groupId>org.apache.maven</groupId>
              <artifactId>maven-archiver</artifactId>
              <version>2.3</version>
            </dependency>
        </dependencies>
    </profile>
</profiles>

if you were using Hudson, there’s a plugin that will start/stop Xvnc for you. there’s demand for a Bamboo plugin, but nothing yet.

however, you don’t really need a plugin! if you’re using maven 2.0, drop these three lines into ~/.mavenrc:

vncserver -kill :0
vncserver :0
export DISPLAY=:0

(be sure to run vncserver once as the user Bamboo runs as to set a password first).

then, when maven is launched, it will destroy the existing X session, start a new one, and set the display property properly. should anything go awry, you can always connect a VNC client to see the screen prior to the next build starting.

while it’d be nice to have it more automagic like what Hudson has, its easy enough to string a solution up

Like him, when I started using it on the Mac, they drove me nuts. Since this was back when Eclipse sucked mightily on the Mac, I remapped them all.

You can download the file here. Place it in your ~/Library/Preferences/IntelliJIDEAxx/keymaps folder and restart IDEA.

this afternoon, i tried to do a release of some software at work.. and the maven release plugin was failing! its a very odd error:


[INFO] Tagging release with the label release-0.4...
[INFO] Executing: svn --non-interactive copy --file /tmp/maven-scm-1130425261.commit . https://example.com/workstuff/release-0.4
[INFO] Working directory: /Users/osi/Documents/workstuff/trunk
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Unable to tag SCM
Provider message:
The svn tag command failed.
Command output:
svn: Commit failed (details follow):
svn: File '/workstuff/tags/release-0.4/pom.xml' already exists


very weird. i tried executing that same command at the prompt, and got the same error. i did a svn up, and then it worked.. hrm. thankfully, macports makes it very easy to drop back to 1.5.0, and after i did that, maven was able to release no problem.

UPDATE: using 2.0-beta-9 of the maven-release-plugin has a workaround for this issue.