Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package atinject for openSUSE:Factory 
checked in at 2024-04-11 19:41:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/atinject (Old)
 and      /work/SRC/openSUSE:Factory/.atinject.new.29460 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "atinject"

Thu Apr 11 19:41:04 2024 rev:5 rq:1166715 version:1.0.5

Changes:
--------
--- /work/SRC/openSUSE:Factory/atinject/atinject.changes        2022-04-04 
19:26:49.716237218 +0200
+++ /work/SRC/openSUSE:Factory/.atinject.new.29460/atinject.changes     
2024-04-11 19:41:12.709890920 +0200
@@ -1,0 +2,33 @@
+Wed Apr 10 08:19:26 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Upgrade to version 1.0.5 and switch to sources in
+  https://github.com/jakartaee/inject/
+  * Changes of 1.0.5:
+    + This switches the module name back to the java.inject that was
+      used by the 1.0.3 release with automatic module. This is a
+      multi-release jar
+  * Changes of 1.0.4:
+    + This is a 1.0.4 service release with a multi-release jar that
+      adds the module-info class to
+      META-INF/versions/9/module-info.class using the
+      https://github.com/moditect/moditect plugin for the
+      javax.inject module.
+  * Changes of 1.0.3:
+    + This release corrects the 1.0.2 release which was incorrectly
+      done from the master branch with the jakarta.* packages.
+    + It adds the Automatic-Module-Name=java.inject to the api jar
+      manifest.
+  * Changes of 1.0.2:
+    + A service release that addresses:
+      - #14, set Automatic-Module-Name to java.inject
+      - #15, add OSGi bundle headers
+  * Changes of 1.0.1:
+    + Add Automatic-Module-Name of jakarta.inject
+  * Changes of 1.0:
+    + First Injection API release for Jakarta EE
+- Remove unused sub-package tck
+- Removed patch:
+  * atinject-javadoc.patch
+    + not needed with this version
+
+-------------------------------------------------------------------

Old:
----
  LICENSE-2.0.txt
  MANIFEST-TCK.MF
  MANIFEST.MF
  _service
  atinject-1+20160610git1f74ea7.tar.xz
  atinject-javadoc.patch

New:
----
  1.0.5.tar.gz
  atinject-build.xml

BETA DEBUG BEGIN:
  Old:- Removed patch:
  * atinject-javadoc.patch
    + not needed with this version
BETA DEBUG END:

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ atinject.spec ++++++
--- /var/tmp/diff_new_pack.TXeUhI/_old  2024-04-11 19:41:13.317913413 +0200
+++ /var/tmp/diff_new_pack.TXeUhI/_new  2024-04-11 19:41:13.321913561 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package atinject
 #
-# 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,23 +17,18 @@
 
 
 Name:           atinject
-Version:        1+20160610git1f74ea7
+Version:        1.0.5
 Release:        0
 Summary:        Dependency injection specification for Java (JSR-330)
 License:        Apache-2.0
-Group:          Development/Libraries/Java
-URL:            https://javax-inject.github.io/javax-inject/
-Source0:        %{name}-%{version}.tar.xz
-# These manifests based on the ones shipped by eclipse.org
-Source1:        MANIFEST.MF
-Source2:        MANIFEST-TCK.MF
-Source3:        http://www.apache.org/licenses/LICENSE-2.0.txt
-Patch0:         atinject-javadoc.patch
+URL:            https://github.com/jakartaee/inject/
+Source0:        https://github.com/jakartaee/inject/archive/%{version}.tar.gz
+Source1:        %{name}-build.xml
+BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  java-devel > 1.8
-BuildRequires:  javapackages-local
-BuildRequires:  junit
-BuildRequires:  xz
+BuildRequires:  java-devel >= 1.8
+BuildRequires:  javapackages-local >= 6
+Obsoletes:      %{name}-tck
 BuildArch:      noarch
 
 %description
@@ -43,84 +38,40 @@
 locators (e.g., JNDI). This process, known as dependency injection, is
 beneficial to most nontrivial applications.
 
-%package        tck
-Summary:        TCK for testing %{name} compatibility with JSR-330
-Group:          Development/Libraries/Java
-Requires:       %{name} = %{version}
-Requires:       junit
-
-%description    tck
-%{summary}.
-
 %package javadoc
-Summary:        API documentation for %{name}
+Summary:        Javadoc for %{name}
 Group:          Documentation/HTML
 
 %description javadoc
-API documentation for %{name}.
+This package contains the API documentation for %{name}.
 
 %prep
-%setup -q
-%patch0 -p1
-cp %{SOURCE3} LICENSE
-
-# Fix dep in TCK pom
-sed -i -e 's/pom\.groupId/project.groupId/' tck-pom.xml
+%setup -q -n inject-%{version}
+cp %{SOURCE1} build.xml
 
 %build
-rm -rf build
-mkdir -p build/classes
-mkdir -p build/tck
-mkdir -p build/dist
-mkdir -p build/tck/classes
-mkdir -p build/tck/dist
-
-# Compile classes.
-javac -source 8 -target 8 -g -d build/classes `find src -name \*.java`
-javac -source 8 -target 8 -g -classpath build/classes:$(build-classpath junit) 
-d build/tck/classes \
-       `find tck -name \*.java`
-
-# Generate Javadocs.
-FOOTER="<font size='-1'>Copyright (C) 2009 <a 
href='https://github.com/javax-inject/javax-inject'>\
-The JSR-330 Expert Group</a>. \
-Licensed under the <a href='http://www.apache.org/licenses/LICENSE-2.0'>Apache 
\
-License</a>, Version 2.0.</font>"
-javadoc -source 8 -protected -bottom "${FOOTER}" \
-    -header "<font color='red'><b>This is a DRAFT specification.</b></font>" \
-       -sourcepath src -d build/javadoc javax.inject
-javadoc -source 8 -classpath build/classes:lib/junit.jar -protected -bottom 
"$FOOTER" \
-       -sourcepath tck -d build/javadoc/tck org.atinject.tck \
-       org.atinject.tck.auto org.atinject.tck.auto.accessories
-
-# Generate jars.
-jar cmf %{SOURCE1} build/dist/javax.inject.jar -C build/classes .
-jar cmf %{SOURCE2} build/tck/dist/javax.inject-tck.jar -C build/tck/classes .
+%{ant} package javadoc
 
 %install
 # jars
 install -dm 755 %{buildroot}%{_javadir}/javax.inject
-install -m 0644 build/dist/javax.inject.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m 0644 target/jakarta.inject-api-%{version}.jar 
%{buildroot}%{_javadir}/%{name}.jar
 (cd %{buildroot}%{_javadir}/javax.inject && ln -s ../%{name}.jar .)
-install -m 0644 build/tck/dist/javax.inject-tck.jar 
%{buildroot}%{_javadir}/%{name}-tck.jar
 
-# poms
+# pom
 install -dm 755 %{buildroot}%{_mavenpomdir}
-install -m 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
-install -m 0644 tck-pom.xml %{buildroot}%{_mavenpomdir}/%{name}-tck.pom
-%add_maven_depmap %{name}.pom %{name}.jar -a 
"jakarta.inject:jakarta.inject-api"
-%add_maven_depmap %{name}-tck.pom %{name}-tck.jar -f tck
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar -a javax.inject:javax.inject
 
 # javadoc
 install -dm 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr  build/javadoc/* %{buildroot}%{_javadocdir}/%{name}/
-%fdupes -s %{buildroot}%{_javadocdir}/%{name}/
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
 %files -f .mfiles
-%license LICENSE
+%license LICENSE.txt NOTICE.md
 %{_javadir}/javax.inject
 
-%files tck -f .mfiles-tck
-
 %files javadoc
 %{_javadocdir}/%{name}
 

++++++ atinject-build.xml ++++++
<?xml version="1.0" encoding="UTF-8"?>

<project name="jakarta.inject-api" default="package" basedir=".">

  <!-- ====================================================================== 
-->
  <!-- Build environment properties                                           
-->
  <!-- ====================================================================== 
-->

  <property file="build.properties"/>

  <property name="project.groupId" value="jakarta.inject"/>
  <property name="project.artifactId" value="jakarta.inject-api"/>
  <property name="project.version" value="1.0.5"/>

  <property name="compiler.release" value="8"/>
  <property name="compiler.source" value="1.${compiler.release}"/>
  <property name="compiler.target" value="${compiler.source}"/>

  <property name="build.finalName" 
value="${project.artifactId}-${project.version}"/>
  <property name="build.dir" value="target"/>
  <property name="build.outputDir" value="${build.dir}/classes"/>
  <property name="build.outputDirJava9" 
value="${build.outputDir}/META-INF/versions/9"/>
  <property name="build.srcDir" value="src/main/java"/>
  <property name="build.srcDirJava9" value="src/main/java9"/>
  <property name="build.resourceDir" value="."/>

  <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" 
           release="${compiler.release}" 
           target="${compiler.target}" 
           verbose="false" 
           fork="false" 
           source="${compiler.source}">
      <src>
        <pathelement location="${build.srcDir}"/>
      </src>
          <exclude name="**/module-info.java"/>
    </javac>
    <!-- compile the module-info.java -->
    <mkdir dir="${build.outputDirJava9}"/>
    <javac destdir="${build.outputDirJava9}"
           nowarn="false"
           debug="true"
           encoding="utf-8"
           optimize="false"
           deprecation="true"
           release="9"
           verbose="false"
           fork="false">
      <src>
        <pathelement location="${build.srcDir}"/>
        <pathelement location="${build.srcDirJava9}"/>
      </src>
          <include name="**/module-info.java"/>
    </javac>
    <mkdir dir="${build.outputDir}/META-INF"/>
    <copy todir="${build.outputDir}/META-INF">
      <fileset dir="${build.resourceDir}">
        <include name="LICENSE.txt"/>
        <include name="NOTICE.md"/>
      </fileset>
    </copy>
  </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="${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" 
             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">
      <manifest>
                <attribute name="Bundle-Description" value="Jakarta Dependency 
Injection"/>
                <attribute name="Bundle-License" 
value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
                <attribute name="Bundle-ManifestVersion" value="2"/>
                <attribute name="Bundle-Name" value="Jakarta Dependency 
Injection"/>
                <attribute name="Bundle-SymbolicName" 
value="${project.groupId}.${project.artifactId}"/>
                <!-- <attribute name="Bundle-SymbolicName" 
value="javax.inject"/> -->
                <attribute name="Bundle-Version" value="${project.version}"/>
                <attribute name="Export-Package" 
value="javax.inject;version=&quot;${project.version}&quot;"/>
                <attribute name="Implementation-Version" value="1.1"/>
                <attribute name="JavaPackages-ArtifactId" 
value="${project.artifactId}"/>
                <attribute name="JavaPackages-GroupId" 
value="${project.groupId}"/>
                <attribute name="JavaPackages-Version" 
value="${project.version}"/>
                <attribute name="Multi-Release" value="true"/>
                <attribute name="Require-Capability" 
value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
      </manifest>
    </jar>
  </target>

</project>

Reply via email to