Permalink
Browse files

Merge branch 'master' of git://github.com/stephenh/hudson-git2

Conflicts:
	src/main/java/hudson/plugins/git/GitLastHashProperty.java
  • Loading branch information...
2 parents 5e72ec9 + 512d3aa commit 0458fa97afa84cd7225db7cfac86360b10785aa5 R. Tyler Ballance committed Dec 31, 2008
Showing with 128 additions and 2 deletions.
  1. +126 −0 pom-hudson.xml
  2. +1 −1 pom.xml
  3. +1 −1 src/main/java/hudson/plugins/git/GitLastHashProperty.java
  4. BIN target/git.hpi
View
@@ -0,0 +1,126 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jvnet.hudson</groupId>
+ <artifactId>hudson</artifactId>
+ <version>1.6</version>
+ <packaging>pom</packaging>
+
+ <name>Hudson</name>
+ <url>https://hudson.dev.java.net/</url>
+
+ <scm>
+ <connection>scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/</connection>
+ <developerConnection>scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/</developerConnection>
+ <url>https://hudson.dev.java.net/source/browse/hudson/trunk/hudson</url>
+ </scm>
+
+ <repositories>
+ <repository>
+ <id>m.g.o-public</id>
+ <url>http://maven.glassfish.org/content/groups/public/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>m.g.o-public</id>
+ <url>http://maven.glassfish.org/content/groups/public/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <distributionManagement>
+ <repository>
+ <uniqueVersion>false</uniqueVersion>
+ <id>java.net-m2-repository</id>
+ <!--url>svn:https://svn.dev.java.net/svn/maven2-repository/trunk/www/repository/</url-->
+ <url>java-net:/maven2-repository/trunk/www/repository/</url>
+ </repository>
+ <snapshotRepository>
+ <!-- prevent accidental deployment of SNAPSHOTS to repository -->
+ <id>local</id>
+ <url>file:.</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>display-info</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <jdkName>JDK1.5</jdkName>
+ </configuration>
+ </plugin>
+ </plugins>
+ <extensions>
+ <extension>
+ <groupId>org.jvnet.wagon-svn</groupId>
+ <artifactId>wagon-svn</artifactId>
+ <version>1.8</version>
+ </extension>
+ </extensions>
+ </build>
+
+ <modules>
+ <module>main</module>
+ <module>tools</module>
+ <module>plugins</module>
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>always-check-remote-repositories</id>
+ <properties>
+ <maven.repository.update.freqency>always</maven.repository.update.freqency>
+ </properties>
+ </profile>
+ </profiles>
+ <properties>
+ <!-- by default only check remote repositories once per week -->
+ <maven.repository.update.freqency>interval:10080</maven.repository.update.freqency>
+
+ <!-- the version of Maven that we embed in Hudson -->
+ <maven.version>2.0.4</maven.version>
+ </properties>
+</project>
View
@@ -4,7 +4,7 @@
<groupId>org.jvnet.hudson.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.235</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>pom-hudson.xml</relativePath>
</parent>
<artifactId>git</artifactId>
@@ -29,7 +29,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
// Make sure we can cast to GitSCM; it's possible that this will be hudson.scm.NullSCM
if (!(genericScm instanceof GitSCM))
return true;
- GitSCM scm = (GitSCM)genericScm;
+ GitSCM scm = (GitSCM) genericScm;
GitAPI git = new GitAPI(scm.getDescriptor(), launcher, build.getParent().getWorkspace(), listener);
String tipHash = git.revParse(scm.getRemoteBranch());
View
Binary file not shown.

0 comments on commit 0458fa9

Please sign in to comment.