Skip to content

Commit

Permalink
[MSHADE-420] small adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
hboutemy committed Jan 23, 2024
1 parent 079560e commit 8fa3133
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/it/projects/MSHADE-420/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

invoker.goals.1 = clean package -DfinalName=current-OS dependency:copy-dependencies

invoker.mavenOpts.2=-Duser.timezone=UTC
invoker.mavenOpts.2=-Duser.timezone=Etc/UTC
invoker.goals.2 = package -DfinalName=UTC
invoker.mavenOpts.3=-Duser.timezone=Asia/Tokyo
invoker.goals.3 = package -DfinalName=Tokyo
Expand Down
6 changes: 3 additions & 3 deletions src/it/projects/MSHADE-420/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import java.util.jar.JarFile

String describeEntry(JarFile jar, String name, long time) {
def entry = jar.getEntry(name)
return String.format(" - %-47s: time = ", name) + entry.getTime() + ", lastModified = " + entry.getLastModifiedTime()\
+ " = diff " + (long)((entry.getTime() / 1000L - time)/60L) + " min., extra = " + entry.getExtra()
return String.format(" - %-47s: time = %d, lastModified = %s = diff %d min., extra = %b", name, entry.getTime(), entry.getLastModifiedTime().toString(),
(long)((entry.getTime() / 1000L - time)/60L), entry.getExtra() != null)
}

String describeJar(JarFile jar) {
Expand All @@ -48,7 +48,7 @@ describeTz(TimeZone.getDefault())
println(describe("dependency/jna-5.13.0.jar"))
println(describe("current-OS.jar"))
def utcDescription = describe("UTC.jar")
describeTz(TimeZone.getTimeZone("UTC"))
describeTz(TimeZone.getTimeZone("Etc/UTC"))
println(utcDescription)
def tokyoDescription = describe("Tokyo.jar")
describeTz(TimeZone.getTimeZone("Asia/Tokyo"))
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/MSHADE-420/zipdetails.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

# extract of zipdetails Linux tool output on target/dependency/jna-5.13.0.jar
# extract of zipdetails tool (https://perldoc.perl.org/zipdetails) output on target/dependency/jna-5.13.0.jar
# and on UTC.jar and Tokyo.jar
# to compare details of a problematic zip entry vs non-problematic in origin jar
# vs in shaded jars
Expand Down

0 comments on commit 8fa3133

Please sign in to comment.