prepared to merge to the trunk

huybrechts · Mar 1, 2011 · 87ba0b5 · 87ba0b5
1 parent 9e58472
commit 87ba0b5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -109,7 +109,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>token-macro</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
       <optional>true</optional>
     </dependency>
   </dependencies>

diff --git a/src/main/java/hudson/plugins/git/GitBranchTokenMacro.java b/src/main/java/hudson/plugins/git/GitBranchTokenMacro.java
@@ -37,7 +37,7 @@
  *
  * @author Kohsuke Kawaguchi
  */
-@Extension
+@Extension(optional=true)
 public class GitBranchTokenMacro extends DataBoundTokenMacro {
     /**
      * If true, list up all the branches not just the first one.

diff --git a/src/main/java/hudson/plugins/git/GitRevisionTokenMacro.java b/src/main/java/hudson/plugins/git/GitRevisionTokenMacro.java
@@ -37,7 +37,7 @@
  *
  * @author Kohsuke Kawaguchi
  */
-@Extension
+@Extension(optional=true)
 public class GitRevisionTokenMacro extends DataBoundTokenMacro {
     /**
      * Number of chars to use