Accepting request 1231979 from Java:packages

Build with ant

OBS-URL: https://build.opensuse.org/request/show/1231979
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jcip-annotations?expand=0&rev=19

_service

@@ -0,0 +1,16 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/stephenc/jcip-annotations.git</param>
+		<param name="revision">jcip-annotations-1.0-1</param>
+		<param name="match-tag">jcip-annotations-*</param>
+		<param name="versionformat">@PARENT_TAG@</param>
+		<param name="versionrewrite-pattern">jcip-annotations-(\d+).(\d+)-(\d+)</param>
+		<param name="versionrewrite-replacement">\1.\2.\3</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="disabled"/>
+</services>

jcip-annotations-1.0.1.tar.xz

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

jcip-annotations-1.0.pom

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>net.jcip</groupId>
-  <artifactId>jcip-annotations</artifactId>
-  <version>1.0</version>
-</project>

jcip-annotations-build.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="jcip-annotations" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property name="build.finalName" value="jcip-annotations"/>
+  <property name="build.dir" value="target"/>
+  <property name="build.outputDir" value="${build.dir}/classes"/>
+  <property name="build.srcDir" value="src/main/java"/>
+  <property name="build.resourceDir" value="src/main/resources"/>
+
+  <property name="reporting.outputDirectory" value="${build.dir}/site"/>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${build.outputDir}"/>
+    <javac destdir="${build.outputDir}"
+           nowarn="false"
+           debug="true"
+           optimize="false"
+           deprecation="true"
+           encoding="utf-8"
+           release="8"
+           target="1.8"
+           verbose="false"
+           fork="false"
+           source="1.8">
+      <src>
+        <pathelement location="${build.srcDir}"/>
+      </src>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${build.srcDir}"
+             packagenames="*"
+             destdir="${reporting.outputDirectory}/apidocs"
+             access="protected"
+             source="1.8"
+             encoding="utf-8"
+             verbose="false"
+             version="true"
+             use="true"
+             author="true"
+             splitindex="false"
+             nodeprecated="false"
+             nodeprecatedlist="false"
+             notree="false"
+             noindex="false"
+             nohelp="false"
+             nonavbar="false"
+             serialwarn="false"
+             charset="ISO-8859-1"
+             linksource="false"
+             breakiterator="false"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile" description="Package the application">
+    <jar jarfile="${build.dir}/${build.finalName}.jar"
+         compress="true"
+         index="false"
+         basedir="${build.outputDir}"
+         excludes="**/package.html"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+</project>

jcip-annotations-src.jar

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

jcip-annotations.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Thu Dec 19 02:46:22 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use ant to build
+
+-------------------------------------------------------------------
+Wed Dec 18 16:09:47 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Switch to clean room implementation, as original implementation
+  uses CC-BY-2.5 licence. The clean room implementation is under
+  Apache-2.0
+
+-------------------------------------------------------------------
+Sun Dec  8 20:13:14 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- The pom file is simple, so it does not need to be installed
+  using the %%mvn_install_pom macro
+
+-------------------------------------------------------------------
+Wed Dec  4 11:15:53 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Add alias to the other implementation out there
+
+-------------------------------------------------------------------
+Mon Sep 23 13:15:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use SOURCE_DATE_EPOCH for reproducible builds
+- Clean the spec file, fix download urls and redownload the sources
+
 -------------------------------------------------------------------
 Sun Mar 20 07:01:18 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

jcip-annotations.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package jcip-annotations
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,75 +17,68 @@
 
 
 Name:           jcip-annotations
-Version:        1.0
+Version:        1.0.1
 Release:        0
-Summary:        Java Concurrency in Practice
+Summary:        A clean room implementation of the JCIP Annotations
-License:        CC-BY-2.5
+License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://www.jcip.net/
+URL:            https://github.com/stephenc/jcip-annotations
-Source0:        http://www.jcip.net/jcip-annotations-src.jar
+Source0:        %{name}-%{version}.tar.xz
-Source1:        http://repo1.maven.org/maven/livetribe/maven/m2/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.pom
+Source1:        %{name}-build.xml
+BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
-BuildRequires:  javapackages-tools
-BuildRequires:  unzip
 BuildArch:      noarch
 
 %description
-Class, field, and method level annotations for describing thread-safety
+A clean room implementation of the JCIP Annotations based entirely on the
-policies.
+specification provided by the javadocs.
 
 %package javadoc
-Summary:        Javadoc for %{name}
+Summary:        API documentation for %{name}
 Group:          Development/Libraries/Java
 
 %description javadoc
-Class, field, and method level annotations for describing thread-safety
+A clean room implementation of the JCIP Annotations based entirely on the
-policies.
+specification provided by the javadocs.
+
+This package contains the API documentation.
 
 %prep
-%setup -q -c
+%setup -q
-mkdir -p target/site/apidocs/
+cp %{SOURCE1} build.xml
-mkdir -p target/classes/
+
-mkdir -p src/main/java/
+# Remove unnecessary dependency on parent POM
-mv net src/main/java
+%pom_remove_parent
+
+# Remove unnecessary dependency on JUnit
+%pom_remove_dep junit:junit
 
 %build
-export JAVA_HOME=%{_jvmdir}/java
+ant jar javadoc
-$JAVA_HOME/bin/javac -source 1.8 -target 1.8 -d target/classes $(find src/main/java -name "*.java")
-$JAVA_HOME/bin/javadoc -source 1.8 -d target/site/apidocs -sourcepath src/main/java net.jcip.annotations
-for f in $(find aQute/ -type f -not -name "*.class"); do
-    cp $f target/classes/$f
-done
-pushd target/classes
-$JAVA_HOME/bin/jar cmf ../../META-INF/MANIFEST.MF ../%{name}-%{version}.jar *
-popd
 
 %install
 # jars
-install -d -m 755 %{buildroot}%{_javadir}
+install -dm 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar \
+install -pm 0644 target/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
-  %{buildroot}%{_javadir}/%{name}.jar
 
 # pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -dm 0755 %{buildroot}%{_mavenpomdir}
-install -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "net.jcip:%{name}"
 
 # javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-%fdupes -s %{buildroot}%{_javadocdir}/%{name}-%{version}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink
 
-%files
+%files -f .mfiles
-%{_javadir}/*
+%license LICENSE.txt
-%{_mavenpomdir}/*
+%doc README.md
-%{_datadir}/maven-metadata/%{name}.xml
 
 %files javadoc
-%doc %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
-%doc %{_javadocdir}/%{name}
+%license LICENSE.txt
 
 %changelog