Update picocli to version 4.7.5 / rev 8 via SR 1110246

https://build.opensuse.org/request/show/1110246 by user fstrba + anag+factory reproducible
bmwiedemann · Sep 11, 2023 · 39ec1c5 · 39ec1c5
1 parent d6896f4
commit 39ec1c5
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 47 deletions.
diff --git a/packages/p/picocli/.files b/packages/p/picocli/.files
diff --git a/packages/p/picocli/.rev b/packages/p/picocli/.rev
@@ -55,4 +55,12 @@
     <comment>4.7.5</comment>
     <requestid>1106117</requestid>
   </revision>
+  <revision rev="8" vrev="2">
+    <srcmd5>a0268764040d41f59b8d9b914056db2a</srcmd5>
+    <version>4.7.5</version>
+    <time>1694460130</time>
+    <user>anag+factory</user>
+    <comment>reproducible</comment>
+    <requestid>1110246</requestid>
+  </revision>
 </revisionlist>
diff --git a/packages/p/picocli/picocli-build.xml b/packages/p/picocli/picocli-build.xml
@@ -47,8 +47,8 @@
            verbose="false"
            fork="false"
            source="${compiler.source}"
-		   encoding="UTF-8"
-		   createMissingPackageInfoClass="false">
+           encoding="UTF-8"
+           createMissingPackageInfoClass="false">
       <src>
         <pathelement location="${build.srcDir}"/>
       </src>
@@ -62,8 +62,8 @@
            release="9"
            verbose="false"
            fork="false"
-		   encoding="UTF-8"
-		   createMissingPackageInfoClass="false">
+           encoding="UTF-8"
+           createMissingPackageInfoClass="false">
       <src>
         <pathelement location="${build.srcDir9}"/>
       </src>
@@ -79,14 +79,14 @@
            verbose="false"
            fork="false"
            source="${compiler.source}"
-		   encoding="UTF-8"
-		   createMissingPackageInfoClass="false">
+           encoding="UTF-8"
+           createMissingPackageInfoClass="false">
       <src>
-	  	<pathelement location="picocli-codegen/${build.srcDir}"/>
+        <pathelement location="picocli-codegen/${build.srcDir}"/>
       </src>
-	  <classpath>
-	  	<pathelement location="${build.outputDir}"/>
-	  </classpath>
+      <classpath>
+        <pathelement location="${build.outputDir}"/>
+      </classpath>
     </javac>
     <!-- Build module-info.java with release 9 -->
     <javac destdir="picocli-codegen/${build.outputDir}"
@@ -97,15 +97,15 @@
            release="9"
            verbose="false"
            fork="false"
-		   encoding="UTF-8"
-		   createMissingPackageInfoClass="false">
+           encoding="UTF-8"
+           createMissingPackageInfoClass="false">
       <src>
-	  	<pathelement location="picocli-codegen/${build.srcDir9}"/>
+        <pathelement location="picocli-codegen/${build.srcDir9}"/>
       </src>
       <include name="**/module-info.java"/>
-	  <modulepath>
-	  	<pathelement location="${build.outputDir}"/>
-	  </modulepath>
+      <modulepath>
+        <pathelement location="${build.outputDir}"/>
+      </modulepath>
     </javac>
     <!-- Build all except module-info.java with source/target 8 -->
     <mkdir dir="picocli-shell-jline2/${build.outputDir}"/>
@@ -118,15 +118,15 @@
            verbose="false"
            fork="false"
            source="${compiler.source}"
-		   encoding="UTF-8"
-		   createMissingPackageInfoClass="false">
+           encoding="UTF-8"
+           createMissingPackageInfoClass="false">
       <src>
-	  	<pathelement location="picocli-shell-jline2/${build.srcDir}"/>
+        <pathelement location="picocli-shell-jline2/${build.srcDir}"/>
       </src>
-	  <classpath>
-	  	<pathelement location="${build.outputDir}"/>
-	  	<pathelement location="${jline2.jar}"/>
-	  </classpath>
+      <classpath>
+        <pathelement location="${build.outputDir}"/>
+        <pathelement location="${jline2.jar}"/>
+      </classpath>
     </javac>
     <!-- Build module-info.java with release 9 -->
     <javac destdir="picocli-shell-jline2/${build.outputDir}"
@@ -137,15 +137,15 @@
            release="9"
            verbose="false"
            fork="false"
-		   encoding="UTF-8"
-		   createMissingPackageInfoClass="false">
+           encoding="UTF-8"
+           createMissingPackageInfoClass="false">
       <src>
-	  	<pathelement location="picocli-shell-jline2/${build.srcDir9}"/>
+        <pathelement location="picocli-shell-jline2/${build.srcDir9}"/>
       </src>
-	  <modulepath>
-	  	<pathelement location="${build.outputDir}"/>
-	  	<pathelement location="${jline2.jar}"/>
-	  </modulepath>
+      <modulepath>
+        <pathelement location="${build.outputDir}"/>
+        <pathelement location="${jline2.jar}"/>
+      </modulepath>
     </javac>
   </target>
 
@@ -174,16 +174,16 @@
              charset="UTF-8"
              linksource="false"
              breakiterator="false"
-			 source="${compiler.source}"
-			 >
-	  <sourcepath>
-	  	<pathelement location="${build.srcDir}"/>
-	  	<pathelement location="picocli-codegen/${build.srcDir}"/>
-	  </sourcepath>
-	  <classpath>
-	  	<pathelement location="${build.outputDir}"/>
-	  </classpath>
-	</javadoc>
+             source="${compiler.source}"
+             >
+      <sourcepath>
+        <pathelement location="${build.srcDir}"/>
+        <pathelement location="picocli-codegen/${build.srcDir}"/>
+      </sourcepath>
+      <classpath>
+        <pathelement location="${build.outputDir}"/>
+      </classpath>
+    </javadoc>
   </target>
 
   <!-- ====================================================================== -->
@@ -201,9 +201,9 @@
          index="false"
          basedir="picocli-codegen/${build.outputDir}"
          excludes="**/package.html">
-	  <service type="javax.annotation.processing.Processor"
+      <service type="javax.annotation.processing.Processor"
          provider="picocli.codegen.aot.graalvm.processor.NativeImageConfigGeneratorProcessor"/>
-	</jar>
+    </jar>
     <jar jarfile="${build.dir}/${project.artifactId}-shell-jline2-${project.version}.jar"
          compress="true"
          index="false"

diff --git a/packages/p/picocli/picocli.changes b/packages/p/picocli/picocli.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Sep 10 10:27:31 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Reproducible builds: Do not create timestamps with bnd wrap
+
 -------------------------------------------------------------------
 Sun Aug 27 06:46:38 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

diff --git a/packages/p/picocli/picocli.spec b/packages/p/picocli/picocli.spec
@@ -81,13 +81,18 @@ cp %{SOURCE1} build.xml
 	-Djline2.jar=$(find-jar jline/jline) \
 	jar javadoc
 
+echo "-reproducible: true" >> bnd.bnd
+echo "-noextraheaders: true" >> bnd.bnd
+echo "-snapshot: SNAPSHOT" >> bnd.bnd
+
 # Convert to OSGi bundle
 bnd wrap \
-	--bsn %{name} \
-	--version %{version} \
-	--output target/%{name}-%{version}.bar \
-	--properties bnd.bnd \
-	target/%{name}-%{version}.jar
+    --force \
+    --bsn %{name} \
+    --version %{version} \
+    --output target/%{name}-%{version}.bar \
+    --properties bnd.bnd \
+    target/%{name}-%{version}.jar
 mv target/%{name}-%{version}.bar target/%{name}-%{version}.jar
 
 %install