Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from May 11, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0268cc9
Remove ${build.version} property in favor of ${project.version}.
jglick May 9, 2018
86cfcba
No need to be touching .mvn/extensions.xml here.
jglick May 11, 2018
40433c2
Merge branch 'master' into no-build.version
jglick May 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion cli/src/filter/resources/jenkins/cli/jenkins-cli-version.properties
View file
Open in desktop
@@ -1 +1 @@
version=${build.version}
version=${project.version}
1 change: 1 addition & 0 deletions core/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion core/src/filter/resources/hudson/model/hudson-version.properties
View file
Open in desktop
@@ -1 +1 @@
version=${build.version}
version=${project.version}
2 changes: 1 addition & 1 deletion core/src/filter/resources/jenkins/model/jenkins-version.properties
View file
Open in desktop
@@ -1 +1 @@
version=${build.version}
version=${project.version}
2 changes: 1 addition & 1 deletion core/src/main/java/jenkins/model/Jenkins.java
View file
Open in desktop
Expand Up @@ -4945,7 +4945,7 @@ private static void computeVersion(ServletContext context) {
}
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();
Expand Down
73 changes: 0 additions & 73 deletions pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down