Compare commits

...

No commits in common. "stream-javapackages-bootstrap-202501-rhel-9.6.0" and "c8-stream-3.6" have entirely different histories.

9 changed files with 11 additions and 175 deletions

View File

@ -1 +0,0 @@
1

13
.gitignore vendored
View File

@ -1,12 +1 @@
/results_* SOURCES/plexus-interpolation-1.26.tar.gz
/*.src.rpm
/plexus-interpolation-1.13.tar.bz2
/plexus-interpolation-1.14.tar.xz
/sonatype-plexus-interpolation-plexus-interpolation-1.15-0-g9690e65.tar.gz
/plexus-interpolation-1.15.tar.gz
/plexus-interpolation-1.21.tar.gz
/plexus-interpolation-1.22.tar.gz
/plexus-interpolation-1.25.tar.gz
/plexus-interpolation-1.26.tar.gz
/plexus-interpolation-1.27.tar.gz

View File

@ -0,0 +1 @@
a790bb4bb94a888c61f696477133c27e7e952b61 SOURCES/plexus-interpolation-1.26.tar.gz

View File

@ -1,39 +0,0 @@
From 9f4eedf194102b9bcc1fb9885463a47dd3ca9ec8 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 25 Mar 2020 06:58:13 +0100
Subject: [PATCH] Use PATH env variable instead of JAVA_HOME
---
.../plexus/interpolation/EnvarBasedValueSourceTest.java | 2 +-
.../plexus/interpolation/fixed/EnvarBasedValueSourceTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java b/src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java
index 8a3c76c..4bcff96 100644
--- a/src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java
+++ b/src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java
@@ -77,7 +77,7 @@ public class EnvarBasedValueSourceTest {
EnvarBasedValueSource source = new EnvarBasedValueSource();
- String realEnvVar = "JAVA_HOME";
+ String realEnvVar = "PATH";
String realValue = System.getenv().get(realEnvVar);
assertNotNull(realValue, "Can't run this test until " + realEnvVar + " env variable is set");
diff --git a/src/test/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSourceTest.java b/src/test/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSourceTest.java
index b6ff638..42c601c 100644
--- a/src/test/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSourceTest.java
+++ b/src/test/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSourceTest.java
@@ -77,7 +77,7 @@ public class EnvarBasedValueSourceTest {
EnvarBasedValueSource source = new EnvarBasedValueSource();
- String realEnvVar = "JAVA_HOME";
+ String realEnvVar = "PATH";
String realValue = System.getenv().get(realEnvVar);
assertNotNull(realValue, "Can't run this test until " + realEnvVar + " env variable is set");
--
2.41.0

View File

@ -1,28 +1,18 @@
%bcond_with bootstrap
Name: plexus-interpolation Name: plexus-interpolation
Version: 1.27 Version: 1.26
Release: 10%{?dist} Release: 3%{?dist}
Summary: Plexus Interpolation API Summary: Plexus Interpolation API
# Most of the code is ASL 2.0, a few source files are ASL 1.1 and some tests are MIT # Most of the code is ASL 2.0, a few source files are ASL 1.1 and some tests are MIT
License: Apache-2.0 AND Apache-1.1 AND MIT License: ASL 2.0 and ASL 1.1 and MIT
URL: https://github.com/codehaus-plexus/plexus-interpolation URL: https://github.com/codehaus-plexus/plexus-interpolation
BuildArch: noarch BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
Source0: https://github.com/codehaus-plexus/plexus-interpolation/archive/plexus-interpolation-%{version}.tar.gz Source0: https://github.com/codehaus-plexus/plexus-interpolation/archive/plexus-interpolation-%{version}.tar.gz
Patch: 0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch BuildRequires: maven-local-openjdk8
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.codehaus.plexus:plexus-components:pom:)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.codehaus.plexus:plexus:pom:)
BuildRequires: mvn(org.junit.jupiter:junit-jupiter)
%endif
%description %description
Plexus interpolator is the outgrowth of multiple iterations of development Plexus interpolator is the outgrowth of multiple iterations of development
@ -30,15 +20,11 @@ focused on providing a more modular, flexible interpolation framework for
the expression language style commonly seen in Maven, Plexus, and other the expression language style commonly seen in Maven, Plexus, and other
related projects. related projects.
%package javadoc %{?module_package}
Summary: API documentation for %{name} %{?javadoc_package}
%description javadoc
API documentation for %{name}.
%prep %prep
%autosetup -p1 -n plexus-interpolation-plexus-interpolation-%{version} %setup -q -n plexus-interpolation-plexus-interpolation-%{version}
%pom_add_dep junit:junit:4.13.1:test
%pom_remove_plugin :maven-release-plugin %pom_remove_plugin :maven-release-plugin
%pom_remove_plugin :maven-scm-publish-plugin %pom_remove_plugin :maven-scm-publish-plugin
@ -49,105 +35,21 @@ API documentation for %{name}.
%install %install
%mvn_install %mvn_install
%files -f .mfiles %files -n %{?module_prefix}%{name} -f .mfiles
%files javadoc -f .mfiles-javadoc
%changelog %changelog
* Fri Nov 29 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.27-9
- Update javapackages test plan to f42
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.27-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1.27-3
- Rebuilt for java-21-openjdk as system jdk
* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 1.27-2
- bump of release for for java-21-openjdk as system jdk
* Thu Feb 01 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.27-1
- Update to upstream version 1.27
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-17
- Rebuild to regenerate auto-Requires on java
* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-16
- Rebuild
* Thu Aug 10 2023 Marian Koncek <mkoncek@redhat.com> - 1.26-15
- Use implicit maven toolchains
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Apr 29 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-11
- Add missing test dependency on JUnit 4
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.26-10
- Rebuilt for java-17-openjdk as system jdk
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-7
- Bootstrap build
- Non-bootstrap build
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.26-4
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-3 * Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-3
- Build with OpenJDK 8 - Build with OpenJDK 8
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-2 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-2
- Mass rebuild for javapackages-tools 201902 - Mass rebuild for javapackages-tools 201902
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Jul 17 2019 Marian Koncek <mkoncek@redhat.com> - 1.26-1 * Wed Jul 17 2019 Marian Koncek <mkoncek@redhat.com> - 1.26-1
- Update to upstream version 1.26 - Update to upstream version 1.26
* Wed Jul 03 2019 Filipe Rosset <rosset.filipe@gmail.com> - 1.26-1
- Update to version 1.26, fixes rhbz#1724390
* Sat Jun 08 2019 Fabio Valentini <decathorpe@gmail.com> - 1.25-1
- Update to version 1.25.
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.22-10 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.22-10
- Mass rebuild for javapackages-tools 201901 - Mass rebuild for javapackages-tools 201901
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.22-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.22-9 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.22-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

1
ci.fmf
View File

@ -1 +0,0 @@
resultsdb-testcase: separate

View File

@ -1,7 +0,0 @@
--- !Policy
product_versions:
- rhel-9
decision_contexts:
- osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}

View File

@ -1,7 +0,0 @@
summary: Run javapackages-specific tests
discover:
how: fmf
url: https://src.fedoraproject.org/tests/javapackages
ref: c9s
execute:
how: tmt

View File

@ -1 +0,0 @@
SHA512 (plexus-interpolation-1.27.tar.gz) = bf67f564312b238d4608ef827ca808a60b77006f12127089afe9ae4691ded994ec0fa626ebc65fde14b56223bbb18cc1c0204a1371eacf18acaf6d9a4b2c2a28