You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/01/22 22:00:36 UTC
[22/25] storm git commit: STORM-243:rename file
core-version-info.properties to storm-core-version-info.properties
STORM-243:rename file core-version-info.properties to storm-core-version-info.properties
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/14e12aa8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/14e12aa8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/14e12aa8
Branch: refs/heads/master
Commit: 14e12aa8d4d733510390afe55c779af2a527a9a3
Parents: 2cef782
Author: caofangkun <ca...@gmail.com>
Authored: Wed Jan 14 09:43:49 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Wed Jan 14 09:43:49 2015 +0800
----------------------------------------------------------------------
storm-core/pom.xml | 4 ++--
.../jvm/backtype/storm/utils/VersionInfo.java | 2 +-
.../src/resources/core-version-info.properties | 24 --------------------
.../storm-core-version-info.properties | 24 ++++++++++++++++++++
4 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/14e12aa8/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 75e24de..4e1d0d7 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -308,14 +308,14 @@
<resource>
<directory>${basedir}/src/resources</directory>
<excludes>
- <exclude>core-version-info.properties</exclude>
+ <exclude>storm-core-version-info.properties</exclude>
</excludes>
<filtering>false</filtering>
</resource>
<resource>
<directory>${basedir}/src/resources</directory>
<includes>
- <include>core-version-info.properties</include>
+ <include>storm-core-version-info.properties</include>
</includes>
<filtering>true</filtering>
</resource>
http://git-wip-us.apache.org/repos/asf/storm/blob/14e12aa8/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java b/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
index d9b437c..1740e18 100644
--- a/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
+++ b/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
@@ -86,7 +86,7 @@ public class VersionInfo {
}
- private static VersionInfo COMMON_VERSION_INFO = new VersionInfo("core");
+ private static VersionInfo COMMON_VERSION_INFO = new VersionInfo("storm-core");
public static String getVersion() {
return COMMON_VERSION_INFO._getVersion();
http://git-wip-us.apache.org/repos/asf/storm/blob/14e12aa8/storm-core/src/resources/core-version-info.properties
----------------------------------------------------------------------
diff --git a/storm-core/src/resources/core-version-info.properties b/storm-core/src/resources/core-version-info.properties
deleted file mode 100644
index 7ae3130..0000000
--- a/storm-core/src/resources/core-version-info.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-version=${pom.version}
-revision=${version-info.scm.commit}
-branch=${version-info.scm.branch}
-user=${user.name}
-date=${version-info.build.time}
-url=${version-info.scm.uri}
-srcChecksum=${version-info.source.md5}
http://git-wip-us.apache.org/repos/asf/storm/blob/14e12aa8/storm-core/src/resources/storm-core-version-info.properties
----------------------------------------------------------------------
diff --git a/storm-core/src/resources/storm-core-version-info.properties b/storm-core/src/resources/storm-core-version-info.properties
new file mode 100644
index 0000000..7ae3130
--- /dev/null
+++ b/storm-core/src/resources/storm-core-version-info.properties
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+version=${pom.version}
+revision=${version-info.scm.commit}
+branch=${version-info.scm.branch}
+user=${user.name}
+date=${version-info.build.time}
+url=${version-info.scm.uri}
+srcChecksum=${version-info.source.md5}