pool/groovy18
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/groovy18?expand=0&rev=27

Browse Source
This commit is contained in:
Fridrich Strba 2023-09-14 19:12:32 +00:00 committed by Git OBS Bridge
parent a869a78e17
commit 830a82848f
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
groovy18-timestamp.patch
View File

@ -1,5 +1,5 @@
--- groovy-core-GROOVY_1_8_9/gradle/assemble.gradle 2023-09-14 17:55:59.522896097 +0200 --- groovy-core-GROOVY_1_8_9/gradle/assemble.gradle 2023-09-14 17:55:59.522896097 +0200
+++ groovy-core-GROOVY_1_8_9/gradle/assemble.gradle 2023-09-14 18:31:52.621162384 +0200 +++ groovy-core-GROOVY_1_8_9/gradle/assemble.gradle 2023-09-14 21:03:58.849056055 +0200
@@ -45,6 +45,10 @@ @@ -45,6 +45,10 @@
binaryJarsMetaInf = { binaryJarsMetaInf = {
@ -12,7 +12,7 @@
from("$projectDir/src/main/META-INF/groovy-release-info.properties") { from("$projectDir/src/main/META-INF/groovy-release-info.properties") {
filter {String line -> filter {String line ->
--- groovy-core-GROOVY_1_8_9/src/examples/transforms/global/CompiledAtASTTransformation.groovy 2023-09-14 17:55:59.532896167 +0200 --- groovy-core-GROOVY_1_8_9/src/examples/transforms/global/CompiledAtASTTransformation.groovy 2023-09-14 17:55:59.532896167 +0200
+++ groovy-core-GROOVY_1_8_9/src/examples/transforms/global/CompiledAtASTTransformation.groovy 2023-09-14 18:18:30.645595375 +0200 +++ groovy-core-GROOVY_1_8_9/src/examples/transforms/global/CompiledAtASTTransformation.groovy 2023-09-14 21:03:58.849056055 +0200
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
@GroovyASTTransformation(phase=CompilePhase.CONVERSION) @GroovyASTTransformation(phase=CompilePhase.CONVERSION)
public class CompiledAtASTTransformation implements ASTTransformation { public class CompiledAtASTTransformation implements ASTTransformation {
@ -23,7 +23,7 @@
public void visit(ASTNode[] astNodes, SourceUnit sourceUnit) { public void visit(ASTNode[] astNodes, SourceUnit sourceUnit) {
--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html 2023-09-14 17:55:59.569563087 +0200 --- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html 2023-09-14 17:55:59.569563087 +0200
+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html 2023-09-14 18:27:30.922678287 +0200 +++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html 2023-09-14 21:03:58.849056055 +0200
@@ -62,9 +62,9 @@ @@ -62,9 +62,9 @@
%> %>
<html> <html>
@ -37,7 +37,7 @@
<link href="${classDoc.relativeRootPath}groovy.ico" type="image/x-icon" rel="shortcut icon"> <link href="${classDoc.relativeRootPath}groovy.ico" type="image/x-icon" rel="shortcut icon">
<link href="${classDoc.relativeRootPath}groovy.ico" type="image/x-icon" rel="icon"> <link href="${classDoc.relativeRootPath}groovy.ico" type="image/x-icon" rel="icon">
--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/deprecated-list.html 2023-09-14 17:55:59.569563087 +0200 --- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/deprecated-list.html 2023-09-14 17:55:59.569563087 +0200
+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/deprecated-list.html 2023-09-14 18:29:48.580300951 +0200 +++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/deprecated-list.html 2023-09-14 21:03:58.849056055 +0200
@@ -38,9 +38,9 @@ @@ -38,9 +38,9 @@
%> %>
<html><head> <html><head>
@ -51,7 +51,7 @@
<link href="groovy.ico" type="image/x-icon" rel="shortcut icon"> <link href="groovy.ico" type="image/x-icon" rel="shortcut icon">
<link href="groovy.ico" type="image/x-icon" rel="icon"> <link href="groovy.ico" type="image/x-icon" rel="icon">
--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/help-doc.html 2023-09-14 17:55:59.569563087 +0200 --- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/help-doc.html 2023-09-14 17:55:59.569563087 +0200
+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/help-doc.html 2023-09-14 18:30:08.917108852 +0200 +++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/help-doc.html 2023-09-14 21:03:58.849056055 +0200
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
<% def title = subtitle + (props.windowTitle ? " (${props.windowTitle})" : "") %> <% def title = subtitle + (props.windowTitle ? " (${props.windowTitle})" : "") %>
<html><head> <html><head>
@ -62,7 +62,7 @@
<link href="groovy.ico" type="image/x-icon" rel="shortcut icon"> <link href="groovy.ico" type="image/x-icon" rel="shortcut icon">
<link href="groovy.ico" type="image/x-icon" rel="icon"> <link href="groovy.ico" type="image/x-icon" rel="icon">
--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index-all.html 2023-09-14 17:55:59.569563087 +0200 --- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index-all.html 2023-09-14 17:55:59.569563087 +0200
+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index-all.html 2023-09-14 18:29:08.500022604 +0200 +++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index-all.html 2023-09-14 21:03:58.849056055 +0200
@@ -16,9 +16,9 @@ @@ -16,9 +16,9 @@
%> %>
<html><head> <html><head>
@ -76,14 +76,14 @@
<link href="groovy.ico" type="image/x-icon" rel="shortcut icon"> <link href="groovy.ico" type="image/x-icon" rel="shortcut icon">
<link href="groovy.ico" type="image/x-icon" rel="icon"> <link href="groovy.ico" type="image/x-icon" rel="icon">
--- groovy-core-GROOVY_1_8_9/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy 2023-09-14 17:55:59.506229315 +0200 --- groovy-core-GROOVY_1_8_9/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy 2023-09-14 17:55:59.506229315 +0200
+++ groovy-core-GROOVY_1_8_9/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy 2023-09-14 18:08:37.814820693 +0200 +++ groovy-core-GROOVY_1_8_9/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy 2023-09-14 21:08:56.304430856 +0200
@@ -93,7 +93,13 @@ @@ -93,7 +93,13 @@
} }
private def getNormalizedDate(date) { private def getNormalizedDate(date) {
- if (!date) return new Date() - if (!date) return new Date()
+ def sourceDateEpoch = System.getenv("SOURCE_DATE_EPOCH")
+ if (!date) { + if (!date) {
+ def sourceDateEpoch = System.getenv("SOURCE_DATE_EPOCH")
+ if (sourceDateEpoch != null) { + if (sourceDateEpoch != null) {
+ return new Date(1000 * Long.parseLong(sourceDateEpoch)) + return new Date(1000 * Long.parseLong(sourceDateEpoch))
+ } + }
@ -92,16 +92,13 @@
if (date instanceof Date) { if (date instanceof Date) {
return date return date
} }
@@ -102,8 +108,12 @@ @@ -103,6 +109,9 @@
case null:
case "now": case "now":
default: default:
startDate = new Date()
+ if (sourceDateEpoch != null) { + if (sourceDateEpoch != null) {
+ startDate = new Date(1000 * Long.parseLong(sourceDateEpoch)) + startDate = new Date(1000 * Long.parseLong(sourceDateEpoch))
+ } else { + }
startDate = new Date()
} }
+ }
return startDate return startDate
} }