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

plexus-build-api-build.xml

@@ -9,14 +9,11 @@
   <property file="build.properties"/>
 
   <property name="project.artifactId" value="plexus-build-api"/>
-  <property name="project.groupId" value="org.sonatype.plexus"/>
-  <property name="project.version" value="0.0.7"/>
-  <property name="project.url" value="http://forge.sonatype.com/spice-parent/plexus-build-api/"/>
-  <property name="project.organization.name" value="Sonatype, Inc."/>
+  <property name="project.groupId" value="org.codehaus.plexus"/>
+  <property name="project.version" value="1.2.0"/>
 
-  <property name="spec.version" value="0.0"/>
-
-  <property name="compiler.source" value="1.8"/>
+  <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}"/>
@@ -32,8 +29,6 @@
 
   <path id="build.classpath">
     <fileset dir="lib">
-      <!-- plexus-utils-1.5.8 plexus-container-default-1.0-alpha-9
-           classworlds-1.1-alpha-2 -->
       <include name="**/*.jar"/>
     </fileset>
   </path>
@@ -57,6 +52,7 @@
            debug="true"
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"
@@ -72,24 +68,25 @@
   </target>
 
   <!-- ====================================================================== -->
-  <!-- Target to generate Plexus component.xml                                -->
+  <!-- Sisu javax.inject.Named generation target                              -->
   <!-- ====================================================================== -->
 
-  <target name="generate-metadata"
+  <target name="sisu"
           depends="compile"
-          description="Generate Plexus component.xml">
-    <mkdir dir="${build.outputDir}/META-INF/plexus"/>
-    <exec executable="plexus-metadata-generator" failonerror="true">
-      <env key="CLASSPATH" value="${build.outputDir}"/>
-      <arg value="-s"/>
-      <arg value="${build.srcDir}"/>
-      <arg value="-c"/>
-      <arg value="${build.outputDir}"/>
-      <arg value="-m"/>
-      <arg value="${build.outputDir}/META-INF/plexus"/>
-      <arg value="-o"/>
-      <arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
-    </exec>
+          description="Generate javax.inject.Name index">
+    <sequential>
+	  <java classname="org.eclipse.sisu.space.SisuIndex"
+	        failonerror="true"
+			fork="true">
+        <classpath>
+          <path refid="build.classpath"/>
+        </classpath>
+        <arg value="${build.outputDir}"/>
+      </java>
+      <move todir="${build.outputDir}/META-INF">
+        <fileset dir="META-INF"/>
+      </move>
+	</sequential>
   </target>
 
   <!-- ====================================================================== -->
@@ -125,24 +122,16 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="generate-metadata" description="Package the application">
+  <target name="package" depends="sisu" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar"
          compress="true"
          index="false"
          basedir="${build.outputDir}"
          excludes="**/package.html">
       <manifest>
-        <attribute name="Implementation-Title" value="${project.artifactId}"/>
-        <attribute name="Implementation-URL" value="${project.url}"/>
-        <attribute name="Implementation-Vendor" value="${project.organization.name}"/>
-        <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
-        <attribute name="Implementation-Version" value="${project.version}"/>
         <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
         <attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
         <attribute name="JavaPackages-Version" value="${project.version}"/>
-        <attribute name="Specification-Title" value="${project.artifactId}"/>
-        <attribute name="Specification-Vendor" value="${project.organization.name}"/>
-        <attribute name="Specification-Version" value="0.0"/>
       </manifest>
     </jar>
   </target>

plexus-build-api-javadoc.patch

@@ -1,11 +0,0 @@
---- sonatype-sisu-build-api-f1f8849/src/main/java/org/sonatype/plexus/build/incremental/DefaultBuildContext.java	2022-05-19 08:15:44.882357964 +0200
-+++ sonatype-sisu-build-api-f1f8849/src/main/java/org/sonatype/plexus/build/incremental/DefaultBuildContext.java	2022-05-19 08:16:29.470635918 +0200
-@@ -30,7 +30,7 @@
-  * hasDelta returns <code>true</code> for all paths
-  * newScanner returns Scanner that scans all files under provided basedir
-  * newDeletedScanner always returns empty scanner.
-- * isIncremental returns <code>false</code<
-+ * isIncremental returns <code>false</code>
-  * getValue always returns <code>null</code>
-  * 
-  * @plexus.component role="org.sonatype.plexus.build.incremental.BuildContext"

plexus-build-api-utils-3.3.0.patch

@@ -1,42 +0,0 @@
-diff --git a/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java b/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java
-index 7cce37d..68b5b41 100644
---- a/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java
-+++ b/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java
-@@ -14,6 +14,7 @@ See the Apache License Version 2.0 for the specific language governing permissio
- package org.sonatype.plexus.build.incremental;
- 
- import java.io.File;
-+import java.util.Comparator;
- 
- import org.codehaus.plexus.util.Scanner;
- 
-@@ -54,4 +55,7 @@ public class EmptyScanner implements Scanner {
-     return basedir;
-   }
- 
-+  public void setFilenameComparator(Comparator<String> filenameComparator) {
-+  }
-+
- }
-diff --git a/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java b/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java
-index 14c1e26..c89fa52 100644
---- a/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java
-+++ b/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java
-@@ -18,6 +18,7 @@ import java.io.FileOutputStream;
- import java.io.IOException;
- import java.io.OutputStream;
- import java.util.ArrayList;
-+import java.util.Comparator;
- import java.util.HashSet;
- import java.util.Iterator;
- import java.util.List;
-@@ -66,6 +67,9 @@ public class TestIncrementalBuildContext implements BuildContext {
-     public File getBasedir() {
-       return basedir;
-     }
-+
-+    public void setFilenameComparator(Comparator<String> filenameComparator) {
-+    }
-   }
- 
-   private final Set changedFiles;

plexus-build-api.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Wed May  1 11:49:37 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 1.2.0
+  * Breaking changes
+    + change package to org.codehaus.plexus.build
+  * New features and improvements
+    + Convert to JSR 330 component
+    + Bump sisu-maven-plugin from 0.3.5 to 0.9.0.M2
+    + Switch to parent 13 and reformat
+    + Use a CachingOutputStream when using the build context
+    + Reuse plexus-pom action for CI
+    + Add README and LICENSE
+    + Remove ThreadBuildContext (#51) @laeubi
+  * Bug Fixes
+    + Store Objects in the DefaultContext in a map
+    + Let the DefaultBuildContext delegate to the legacy build-api
+- Removed patches:
+  * plexus-build-api-javadoc.patch
+  * plexus-build-api-utils-3.3.0.patch
+    + not needed with this version
+
 -------------------------------------------------------------------
 Tue Feb 20 14:43:01 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

plexus-build-api.spec

@@ -17,25 +17,24 @@
 
 
 Name:           plexus-build-api
-Version:        0.0.7
+Version:        1.2.0
 Release:        0
 Summary:        Plexus Build API
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            https://github.com/sonatype/sisu-build-api
-#Fetched from https://github.com/sonatype/sisu-build-api/tarball/plexus-build-api-0.0.7
-Source0:        sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz
+Source0:        https://github.com/codehaus-plexus/%{name}/archive/refs/tags/%{name}-%{version}.tar.gz
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 Source2:        %{name}-build.xml
-Patch0:         plexus-build-api-utils-3.3.0.patch
-Patch1:         plexus-build-api-javadoc.patch
 BuildRequires:  ant
+BuildRequires:  atinject
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local >= 6
-BuildRequires:  plexus-classworlds
-BuildRequires:  plexus-containers-container-default
-BuildRequires:  plexus-metadata-generator
+BuildRequires:  plexus-build-api0
 BuildRequires:  plexus-utils
+BuildRequires:  sisu-inject
+BuildRequires:  sisu-plexus
+BuildRequires:  slf4j
 BuildArch:      noarch
 
 %description
@@ -49,17 +48,19 @@ Group:          Documentation/HTML
 API documentation for %{name}.
 
 %prep
-%setup -q -n sonatype-sisu-build-api-f1f8849
-%patch -P 0 -p1
-%patch -P 1 -p1
+%setup -q -n %{name}-%{name}-%{version}
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} build.xml
 
-%pom_remove_parent .
-
 %build
 mkdir -p lib
-build-jar-repository -s lib plexus/utils plexus/classworlds plexus-containers/plexus-container-default
+build-jar-repository -s lib \
+    atinject \
+    org.eclipse.sisu.inject \
+    org.eclipse.sisu.plexus \
+    plexus/utils \
+    plexus/plexus-build-api0 \
+    slf4j/api
 %{ant} \
   jar javadoc