Skip to content

Commit

Permalink
Fix test issue with injected test, add @symbol annotation for pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
slide committed Mar 5, 2018
1 parent 3dc70f2 commit 0ffc188
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 29 deletions.
40 changes: 12 additions & 28 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,6 @@
<artifactId>plugin</artifactId>
<version>1.642.4</version>
</parent>
<properties>
<jenkins.buildId>${env.BUILD_ID}</jenkins.buildId>
<jenkins.buildNumber>${env.BUILD_NUMBER}</jenkins.buildNumber>
<jenkins.buildTag>${env.BUILD_TAG}</jenkins.buildTag>
<jenkins.cvsBranch>${env.CVS_BRANCH}</jenkins.cvsBranch>
<jenkins.executorNumber>${env.EXECUTOR_NUMBER}</jenkins.executorNumber>
<jenkins.hudsonUrl>${env.HUDSON_URL}</jenkins.hudsonUrl>
<jenkins.javaHome>${env.JAVA_HOME}</jenkins.javaHome>
<jenkins.jobName>${env.JOB_NAME}</jenkins.jobName>
<jenkins.svnRevision>${env.SVN_REVISION}</jenkins.svnRevision>
<jenkins.workspace>${env.WORKSPACE}</jenkins.workspace>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<disabledTestInjection>true</disabledTestInjection>
</configuration>
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>maven.jenkins-ci.org</id>
Expand All @@ -45,8 +21,8 @@
<url>https://wiki.jenkins-ci.org/display/JENKINS/Change+Assembly+Version</url>
<developers>
<developer>
<id>lkobus</id>
<name>Leonardo Kobus</name>
<id>slide_o_mix</id>
<name>Alex Earl</name>
</developer>
</developers>
<groupId>org.jenkinsci.plugins</groupId>
Expand All @@ -64,15 +40,23 @@
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>

<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
<version>1.2</version>
</dependency>
</dependencies>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import org.apache.commons.lang.StringUtils;

import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;

Expand Down Expand Up @@ -264,7 +265,7 @@ public void perform(Run<?, ?> run, FilePath workspace, Launcher launcher, TaskLi

}

@Extension
@Extension @Symbol("changeAsmVer")
public static class DescriptorImpl extends BuildStepDescriptor<Builder> {

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
<f:entry title="${%Assembly Version}" field="versionPattern">
<f:textbox/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?jelly escape-by-default='true'?>
<div>
This plugin lets the user modify the AssemblyVersion and AssemblyFileVersion attributes, typically contained in the AssemblyInfo.cs file.
</div>

0 comments on commit 0ffc188

Please sign in to comment.