Skip to content

Commit 22deba9

Browse files
authored
HDDS-17538. source file checksum in common jars cause cache miss (#11830)
1 parent 461600c commit 22deba9

7 files changed

Lines changed: 3 additions & 23 deletions

File tree

‎hadoop-hdds/common/pom.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,7 @@
233233
<phase>generate-resources</phase>
234234
<configuration>
235235
<source>
236-
<directory>${basedir}/../</directory>
237-
<includes>
238-
<include>*/src/main/java/**/*.java</include>
239-
<include>*/src/main/proto/*.proto</include>
240-
</includes>
236+
<directory>${project.basedir}/src/main/resources</directory>
241237
</source>
242238
</configuration>
243239
</execution>

‎hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/HddsVersionInfo.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ public static void main(String[] args) {
4545
HDDS_VERSION_INFO.getRevision());
4646
System.out.println(
4747
"Compiled with protoc " + HDDS_VERSION_INFO.getProtoVersions());
48-
System.out.println(
49-
"From source with checksum " + HDDS_VERSION_INFO.getSrcChecksum());
5048
System.out.println(
5149
"Compiled on platform " + HDDS_VERSION_INFO.getCompilePlatform());
5250
if (LOG.isDebugEnabled()) {

‎hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/VersionInfo.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@ public String getUrl() {
6767
return info.getProperty("url", "Unknown");
6868
}
6969

70-
public String getSrcChecksum() {
71-
return info.getProperty("srcChecksum", "Unknown");
72-
}
73-
7470
public String getProtoVersions() {
7571
return info.getProperty("protoVersions", "Unknown");
7672
}
@@ -80,8 +76,6 @@ public String getCompilePlatform() {
8076
}
8177

8278
public String getBuildVersion() {
83-
return getVersion() +
84-
" from " + getRevision() +
85-
" source checksum " + getSrcChecksum();
79+
return getVersion() + " from " + getRevision();
8680
}
8781
}

‎hadoop-hdds/common/src/main/resources/hdds-version-info.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,5 @@
1919
version=${declared.hdds.version}
2020
revision=${version-info.scm.commit}
2121
url=${version-info.scm.uri}
22-
srcChecksum=${version-info.source.md5}
2322
protoVersions=${protobuf.version}, ${ratis-thirdparty.protobuf.version} (Ratis)
2423
compilePlatform=${os.detected.classifier}

‎hadoop-ozone/common/pom.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,7 @@
206206
<phase>generate-resources</phase>
207207
<configuration>
208208
<source>
209-
<directory>${basedir}/../</directory>
210-
<includes>
211-
<include>*/src/main/java/**/*.java</include>
212-
<include>*/src/main/proto/*.proto</include>
213-
</includes>
209+
<directory>${project.basedir}/src/main/resources</directory>
214210
</source>
215211
</configuration>
216212
</execution>

‎hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/OzoneVersionInfo.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ public static void main(String[] args) {
8383
OZONE_VERSION_INFO.getRevision());
8484
System.out.println(
8585
"Compiled with protoc " + OZONE_VERSION_INFO.getProtoVersions());
86-
System.out.println(
87-
"From source with checksum " + OZONE_VERSION_INFO.getSrcChecksum());
8886
System.out.println(
8987
"With Apache Ratis: " + RATIS_VERSION_INFO.getBuildVersion());
9088
System.out.println(

‎hadoop-ozone/common/src/main/resources/ozone-version-info.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ version=${declared.ozone.version}
2020
release=${ozone.release}
2121
revision=${version-info.scm.commit}
2222
url=${version-info.scm.uri}
23-
srcChecksum=${version-info.source.md5}
2423
protoVersions=${protobuf.version}, ${ratis-thirdparty.protobuf.version} (Ratis)
2524
compilePlatform=${os.detected.classifier}

0 commit comments

Comments
 (0)