Accepting request 1280076 from Java:packages

3.0.0

OBS-URL: https://build.opensuse.org/request/show/1280076
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/j2objc-annotations?expand=0&rev=3

_service

@@ -2,8 +2,8 @@
 	<service name="tar_scm" mode="disabled">
 		<param name="scm">git</param>
 		<param name="url">https://github.com/google/j2objc.git</param>
-		<param name="revision">58a43c25788f95f3ea9444d800d09a57533edcbc</param>
-		<param name="versionformat">2.2</param>
+		<param name="revision">3.0.0</param>
+		<param name="versionformat">@PARENT_TAG@</param>
 		<param name="subdir">annotations</param>
 		<param name="filename">j2objc-annotations</param>
 	</service>

j2objc-annotations-3.0.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1dfe604ee4ab385fa399291f87a56da0c803b295088f4b7646558bf4ae6b52d8
+size 7364

j2objc-annotations-build.xml

@@ -8,7 +8,7 @@
 
   <property name="project.groupId" value="com.google.j2objc"/>
   <property name="project.artifactId" value="j2objc-annotations"/>
-  <property name="project.version" value="2.2"/>
+  <property name="project.version" value="3.0.0"/>
 
   <property name="compiler.source" value="1.8"/>
   <property name="compiler.target" value="${compiler.source}"/>
@@ -35,20 +35,39 @@
 
   <target name="compile" description="Compile the code">
     <mkdir dir="${build.outputDir}"/>
-    <javac destdir="${build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           encoding="UTF-8" 
-           optimize="false" 
-           deprecation="true" 
-           target="${compiler.target}" 
-           verbose="false" 
-           fork="false" 
+    <javac destdir="${build.outputDir}"
+           nowarn="false"
+           debug="true"
+           encoding="UTF-8"
+           optimize="false"
+           deprecation="true"
+           target="${compiler.target}"
+           verbose="false"
+           fork="false"
            source="${compiler.source}">
+	  <exclude name="**/module-info.java"/>
       <src>
         <pathelement location="${build.srcDir}"/>
       </src>
     </javac>
+    <javac destdir="${build.outputDir}"
+           nowarn="false"
+           debug="true"
+           encoding="utf-8"
+           optimize="false"
+           deprecation="true"
+           target="9"
+           verbose="false"
+           fork="false"
+           source="9">
+      <src>
+        <pathelement location="${build.srcDir}"/>
+      </src>
+	  <include name="**/module-info.java"/>
+      <modulepath>
+        <pathelement location="${build.outputDir}"/>
+      </modulepath>
+    </javac>
   </target>
 
   <!-- ====================================================================== -->
@@ -56,25 +75,25 @@
   <!-- ====================================================================== -->
 
   <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${build.srcDir}" 
-             packagenames="*" 
-             destdir="${reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             source="${compiler.source}" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             encoding="UTF-8" 
-             linksource="false" 
+    <javadoc sourcepath="${build.srcDir}"
+             packagenames="*"
+             destdir="${reporting.outputDirectory}/apidocs"
+             access="protected"
+             source="${compiler.source}"
+             verbose="false"
+             version="true"
+             use="true"
+             author="true"
+             splitindex="false"
+             nodeprecated="false"
+             nodeprecatedlist="false"
+             notree="false"
+             noindex="false"
+             nohelp="false"
+             nonavbar="false"
+             serialwarn="false"
+             encoding="UTF-8"
+             linksource="false"
              breakiterator="false"/>
   </target>
 
@@ -83,10 +102,10 @@
   <!-- ====================================================================== -->
 
   <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${build.dir}/${build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${build.outputDir}" 
+    <jar jarfile="${build.dir}/${build.finalName}.jar"
+         compress="true"
+         index="false"
+         basedir="${build.outputDir}"
          excludes="**/package.html"/>
   </target>
 

j2objc-annotations.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon May 26 08:11:11 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Update to version 3.0.0
+  * no structured changelog available
+  * this version is a modular jar needed by guava
+
 -------------------------------------------------------------------
 Wed Oct  2 15:43:13 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

j2objc-annotations.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package j2objc-annotations
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           j2objc-annotations
-Version:        2.2
+Version:        3.0.0
 Release:        0
 Summary:        J2ObjC Annotations
 License:        Apache-2.0
@@ -48,8 +48,6 @@ This package provides %{summary}.
 cp %{SOURCE1} .
 cp %{SOURCE2} build.xml
 
-%pom_remove_parent
-
 %build
 %{ant} jar javadoc