未验证 提交 0268cc99 编写于 作者: J Jesse Glick

Remove ${build.version} property in favor of ${project.version}.

上级 d004eea0
......@@ -2,6 +2,6 @@
<extension>
<groupId>io.jenkins.tools</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.0-alpha-3</version>
<version>1.0-beta-1</version>
</extension>
</extensions>
......@@ -99,7 +99,7 @@
<mainClass>hudson.cli.CLI</mainClass>
</manifest>
<manifestEntries>
<Jenkins-CLI-Version>${build.version}</Jenkins-CLI-Version>
<Jenkins-CLI-Version>${project.version}</Jenkins-CLI-Version>
</manifestEntries>
</archive>
</configuration>
......
......@@ -644,6 +644,7 @@ THE SOFTWARE.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>add-source</id>
......
version=${build.version}
\ No newline at end of file
version=${project.version}
version=${build.version}
\ No newline at end of file
version=${project.version}
......@@ -4945,7 +4945,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
}
String ver = props.getProperty("version");
if(ver==null) ver = UNCOMPUTED_VERSION;
if(Main.isDevelopmentMode && "${build.version}".equals(ver)) {
if(Main.isDevelopmentMode && "${project.version}".equals(ver)) {
// in dev mode, unable to get version (ahem Eclipse)
try {
File dir = new File(".").getAbsoluteFile();
......
......@@ -81,7 +81,6 @@ THE SOFTWARE.
<!-- *.html files are in UTF-8, and *.properties are in iso-8859-1, so this configuration is actually incorrect,
but this suppresses a warning from Maven, and as long as we don't do filtering we should be OK. -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<build.type>private</build.type>
<!-- configuration for patch tracker plugin -->
<project.patchManagement.system>github</project.patchManagement.system>
......@@ -305,50 +304,6 @@ THE SOFTWARE.
</resources>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>timestamp-property</id>
<goals>
<goal>timestamp-property</goal>
</goals>
<configuration>
<name>now</name>
<pattern>MM/dd/yyyy HH:mm z</pattern>
<locale>en_US</locale>
</configuration>
</execution>
<execution>
<id>user.name</id>
<goals>
<goal>regex-property</goal>
</goals>
<configuration>
<name>user.name.escaped</name>
<value>${user.name}</value>
<regex>([$\\])</regex>
<replacement>\\$1</replacement>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
<execution>
<id>version-property</id>
<goals>
<goal>regex-property</goal>
</goals>
<configuration>
<name>build.version</name>
<value>${project.version}</value>
<regex>-SNAPSHOT</regex>
<replacement>-SNAPSHOT (${build.type}-${now}-${user.name.escaped})</replacement>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
......@@ -550,10 +505,6 @@ THE SOFTWARE.
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
......@@ -660,30 +611,6 @@ THE SOFTWARE.
</build>
<profiles>
<profile>
<id>rc</id>
<properties>
<build.type>rc</build.type>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>version-property</id>
<configuration>
<replacement>-RC (${now})</replacement>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
<profile>
<id>metrics</id>
<build>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册