Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

Conflicts:
	src/main/java/hudson/plugins/git/GitLastHashProperty.java
  • Loading branch information...
commit 0458fa97afa84cd7225db7cfac86360b10785aa5 2 parents 5e72ec9 + 512d3aa
authored December 30, 2008
126  pom-hudson.xml
... ...
@@ -0,0 +1,126 @@
  1
+<project>
  2
+  <modelVersion>4.0.0</modelVersion>
  3
+  <groupId>org.jvnet.hudson</groupId>
  4
+  <artifactId>hudson</artifactId>
  5
+  <version>1.6</version>
  6
+  <packaging>pom</packaging>
  7
+
  8
+  <name>Hudson</name>
  9
+  <url>https://hudson.dev.java.net/</url>
  10
+
  11
+  <scm>
  12
+    <connection>scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/</connection>
  13
+    <developerConnection>scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/</developerConnection>
  14
+    <url>https://hudson.dev.java.net/source/browse/hudson/trunk/hudson</url>
  15
+  </scm>
  16
+
  17
+  <repositories>
  18
+    <repository>
  19
+      <id>m.g.o-public</id>
  20
+      <url>http://maven.glassfish.org/content/groups/public/</url>
  21
+      <releases>
  22
+        <enabled>true</enabled>
  23
+      </releases>
  24
+      <snapshots>
  25
+        <enabled>false</enabled>
  26
+      </snapshots>
  27
+    </repository>
  28
+  </repositories>
  29
+
  30
+  <pluginRepositories>
  31
+    <pluginRepository>
  32
+      <id>m.g.o-public</id>
  33
+      <url>http://maven.glassfish.org/content/groups/public/</url>
  34
+      <releases>
  35
+        <enabled>true</enabled>
  36
+      </releases>
  37
+      <snapshots>
  38
+        <enabled>false</enabled>
  39
+      </snapshots>
  40
+    </pluginRepository>
  41
+  </pluginRepositories>
  42
+
  43
+  <distributionManagement>
  44
+    <repository>
  45
+      <uniqueVersion>false</uniqueVersion>
  46
+      <id>java.net-m2-repository</id>
  47
+      <!--url>svn:https://svn.dev.java.net/svn/maven2-repository/trunk/www/repository/</url-->
  48
+      <url>java-net:/maven2-repository/trunk/www/repository/</url>
  49
+    </repository>
  50
+    <snapshotRepository>
  51
+      <!-- prevent accidental deployment of SNAPSHOTS to repository -->
  52
+      <id>local</id>
  53
+      <url>file:.</url>
  54
+    </snapshotRepository>
  55
+  </distributionManagement>
  56
+
  57
+  <dependencies>
  58
+    <dependency>
  59
+      <groupId>junit</groupId>
  60
+      <artifactId>junit</artifactId>
  61
+      <version>3.8</version>
  62
+      <scope>test</scope>
  63
+    </dependency>
  64
+  </dependencies>
  65
+
  66
+
  67
+  <build>
  68
+    <plugins>
  69
+      <plugin>
  70
+        <groupId>org.apache.maven.plugins</groupId>
  71
+        <artifactId>maven-enforcer-plugin</artifactId>
  72
+        <executions>
  73
+          <execution>
  74
+            <phase>validate</phase>
  75
+            <goals>
  76
+              <goal>display-info</goal>
  77
+            </goals>
  78
+          </execution>
  79
+        </executions>
  80
+      </plugin>
  81
+      <plugin>
  82
+        <artifactId>maven-compiler-plugin</artifactId>
  83
+        <configuration>
  84
+          <source>1.5</source>
  85
+          <target>1.5</target>
  86
+        </configuration>
  87
+      </plugin>
  88
+      <plugin>
  89
+        <artifactId>maven-idea-plugin</artifactId>
  90
+        <version>2.1</version>
  91
+        <configuration>
  92
+          <jdkName>JDK1.5</jdkName>
  93
+        </configuration>
  94
+      </plugin>
  95
+    </plugins>
  96
+    <extensions>
  97
+      <extension>
  98
+        <groupId>org.jvnet.wagon-svn</groupId>
  99
+        <artifactId>wagon-svn</artifactId>
  100
+        <version>1.8</version>
  101
+      </extension>
  102
+    </extensions>
  103
+  </build>
  104
+
  105
+  <modules>
  106
+    <module>main</module>
  107
+    <module>tools</module>
  108
+    <module>plugins</module>
  109
+  </modules>
  110
+  
  111
+  <profiles>
  112
+    <profile>
  113
+      <id>always-check-remote-repositories</id>
  114
+      <properties>
  115
+        <maven.repository.update.freqency>always</maven.repository.update.freqency>
  116
+      </properties>
  117
+    </profile>
  118
+  </profiles>
  119
+  <properties>
  120
+    <!-- by default only check remote repositories once per week -->
  121
+    <maven.repository.update.freqency>interval:10080</maven.repository.update.freqency>
  122
+
  123
+    <!-- the version of Maven that we embed in Hudson -->
  124
+    <maven.version>2.0.4</maven.version>
  125
+  </properties>
  126
+</project>
2  pom.xml
@@ -4,7 +4,7 @@
4 4
     <groupId>org.jvnet.hudson.plugins</groupId>
5 5
     <artifactId>plugin</artifactId>
6 6
     <version>1.235</version>
7  
-    <relativePath>../pom.xml</relativePath>
  7
+    <relativePath>pom-hudson.xml</relativePath>
8 8
   </parent>
9 9
 
10 10
   <artifactId>git</artifactId>
2  src/main/java/hudson/plugins/git/GitLastHashProperty.java
@@ -29,7 +29,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
29 29
 		// Make sure we can cast to GitSCM; it's possible that this will be hudson.scm.NullSCM
30 30
 		if (!(genericScm instanceof GitSCM))
31 31
 			return true;
32  
-		GitSCM scm = (GitSCM)genericScm;
  32
+		GitSCM scm = (GitSCM) genericScm;
33 33
 		GitAPI git = new GitAPI(scm.getDescriptor(), launcher, build.getParent().getWorkspace(), listener);
34 34
 		String tipHash = git.revParse(scm.getRemoteBranch());
35 35
 
BIN  target/git.hpi
Binary file not shown

0 notes on commit 0458fa9

Please sign in to comment.
Something went wrong with that request. Please try again.