Author: mlusetti
Date: Wed Aug 31 15:10:32 2011
New Revision: 1163658
URL: http://svn.apache.org/viewvc?rev=1163658&view=rev
Log:
fix the announced tapestry version
Modified:
tapestry/tapestry5/trunk/tapestry-core/build.gradle
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/VersionUtils.java
Modified: tapestry/tapestry5/trunk/tapestry-core/build.gradle
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/build.gradle?rev=1163658&r1=1163657&r2=1163658&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/build.gradle (original)
+++ tapestry/tapestry5/trunk/tapestry-core/build.gradle Wed Aug 31 15:10:32 2011
@@ -55,7 +55,7 @@ task generateProjectProperties(dependsOn
doLast {
outputDir.mkdirs()
- outputFile << "version=${version}";
+ outputFile << "version=${project.version}";
println "Generating $outputFile"
}
}
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/VersionUtils.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/VersionUtils.java?rev=1163658&r1=1163657&r2=1163658&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/VersionUtils.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/VersionUtils.java
Wed Aug 31 15:10:32 2011
@@ -1,4 +1,4 @@
-// Copyright 2007, 2008 The Apache Software Foundation
+// Copyright 2007, 2008, 2011 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -26,9 +26,9 @@ public class VersionUtils
{
/**
- * Reads a version number from a properties file on the classpath. These
files are generally created by Maven. For
- * example, tapestry-core's properties file is
<code>META-INF/maven/org.apache.tapestry/tapestry-core/pom.properties</code>.
- * The Maven generated properties files include the artifact id and group
id as well as the version.
+ * Reads a version number from a properties file on the classpath. These
files are generally created by Gradle. For
+ * example, tapestry-core's properties file is
<code>META-INF/gradle/org.apache.tapestry/tapestry-core/pom.properties</code>.
+ * The Gradle generated properties files include the version and possibly
others properties.
* <p/>
* The resource is located using the Thread's context class loader.
*
@@ -62,7 +62,7 @@ public class VersionUtils
String version = properties.getProperty("version");
- // Since the file, if it exists, is created by Maven and will have
the key, I can't see
+ // Since the file, if it exists, is created by Gradle and will
have the key, I can't see
// how version would EVER be null, unless there's a problem
reading the properties.
if (version != null) result = version;
