diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt
deleted file mode 100644
index 81fbaf6..0000000
--- a/LICENSE-2.0.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/plexus-build-api-1.2.0.tar.gz b/plexus-build-api-1.2.0.tar.gz
new file mode 100644
index 0000000..9561cb3
--- /dev/null
+++ b/plexus-build-api-1.2.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47aae8f94b6fffd3ea0816eca79094541a28fbf35a9d0ac1fd6459196b30ee1b
+size 10581
diff --git a/plexus-build-api-build.xml b/plexus-build-api-build.xml
index d9ba5f8..30afbb6 100644
--- a/plexus-build-api-build.xml
+++ b/plexus-build-api-build.xml
@@ -9,14 +9,11 @@
-
-
-
-
+
+
-
-
-
+
+
@@ -32,8 +29,6 @@
-
@@ -57,6 +52,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
@@ -72,24 +68,25 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+ description="Generate javax.inject.Name index">
+
+
+
+
+
+
+
+
+
+
+
@@ -125,24 +122,16 @@
-
+
-
-
-
-
-
-
-
-
diff --git a/plexus-build-api-javadoc.patch b/plexus-build-api-javadoc.patch
deleted file mode 100644
index 0e5e96c..0000000
--- a/plexus-build-api-javadoc.patch
+++ /dev/null
@@ -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 true for all paths
- * newScanner returns Scanner that scans all files under provided basedir
- * newDeletedScanner always returns empty scanner.
-- * isIncremental returns falsefalse
- * getValue always returns null
- *
- * @plexus.component role="org.sonatype.plexus.build.incremental.BuildContext"
diff --git a/plexus-build-api-utils-3.3.0.patch b/plexus-build-api-utils-3.3.0.patch
deleted file mode 100644
index 2df64b2..0000000
--- a/plexus-build-api-utils-3.3.0.patch
+++ /dev/null
@@ -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 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 filenameComparator) {
-+ }
- }
-
- private final Set changedFiles;
diff --git a/plexus-build-api.changes b/plexus-build-api.changes
index 44d3835..fed5ab1 100644
--- a/plexus-build-api.changes
+++ b/plexus-build-api.changes
@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Wed May 1 11:49:37 UTC 2024 - Fridrich Strba
+
+- 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
+
+- Use %patch -P N instead of deprecated %patchN.
+
-------------------------------------------------------------------
Thu May 19 06:23:14 UTC 2022 - Fridrich Strba
diff --git a/plexus-build-api.spec b/plexus-build-api.spec
index e88415d..9212773 100644
--- a/plexus-build-api.spec
+++ b/plexus-build-api.spec
@@ -1,7 +1,7 @@
#
# spec file for package plexus-build-api
#
-# 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,26 +17,23 @@
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
-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
+Source0: https://github.com/codehaus-plexus/%{name}/archive/refs/tags/%{name}-%{version}.tar.gz
+Source1: %{name}-build.xml
BuildRequires: ant
+BuildRequires: atinject
BuildRequires: fdupes
-BuildRequires: javapackages-local
-BuildRequires: plexus-classworlds
-BuildRequires: plexus-containers-container-default
-BuildRequires: plexus-metadata-generator
+BuildRequires: javapackages-local >= 6
+BuildRequires: plexus-build-api0
BuildRequires: plexus-utils
-Requires: mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires: sisu-inject
+BuildRequires: sisu-plexus
+BuildRequires: slf4j
BuildArch: noarch
%description
@@ -50,17 +47,18 @@ Group: Documentation/HTML
API documentation for %{name}.
%prep
-%setup -q -n sonatype-sisu-build-api-f1f8849
-%patch0 -p1
-%patch1 -p1
-cp -p %{SOURCE1} .
-cp -p %{SOURCE2} build.xml
-
-%pom_remove_parent .
+%setup -q -n %{name}-%{name}-%{version}
+cp -p %{SOURCE1} build.xml
%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
@@ -70,7 +68,7 @@ install -dm 0755 %{buildroot}%{_javadir}/plexus
install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/%{name}.jar
# pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/plexus/%{name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/plexus/%{name}.pom
%add_maven_depmap plexus/%{name}.pom plexus/%{name}.jar
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
@@ -78,10 +76,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir}
%files -f .mfiles
-%doc LICENSE-2.0.txt
+%license LICENSE
%files javadoc
-%doc LICENSE-2.0.txt
+%license LICENSE
%{_javadocdir}/%{name}
%changelog
diff --git a/sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz b/sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz
deleted file mode 100644
index 6c80a17..0000000
--- a/sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ca1dd48fe8eb451208948e6f72fb7a46893f3674121f039fc540812f60ae4df
-size 6175