SLFO-pool/plexus-containers
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main plexus-containers revision 750ff9093abbcb6a77ca8475934b1105

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-03 19:25:35 +02:00
commit 4ca34e6bca
14 changed files with 1007 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

202
LICENSE-2.0.txt Normal file
View File

@ -0,0 +1,202 @@
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.

21
LICENSE.MIT Normal file
View File

@ -0,0 +1,21 @@
The MIT License
Copyright (c) 2005, The Codehaus
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

5
_multibuild Normal file
View File

@ -0,0 +1,5 @@
<multibuild>
<package>plexus-component-metadata</package>
<package>plexus-metadata-generator</package>
</multibuild>

38
plexus-component-metadata.changes Normal file
View File

@ -0,0 +1,38 @@
-------------------------------------------------------------------
Sun Mar 20 17:45:24 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with java source and target levels 8
-------------------------------------------------------------------
Fri May 14 16:39:03 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Removed patch:
* plexus-containers-asm6.patch
+ build using asm >= 7
-------------------------------------------------------------------
Sun Nov 24 14:53:52 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Upgrade to version 2.1.0
- Removed patch:
* 0001-Port-to-current-qdox.patch
+ integrated upstream
- Added patch:
* plexus-containers-asm6.patch
+ allow building against asm6
- Specify maven.compiler.release to fix build with jdk9+ and newer
maven-javadoc-plugin
-------------------------------------------------------------------
Thu Apr 11 19:58:47 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Require for build the mvn(org.codehaus.plexus:plexus:pom:)
instead of mvn(org.codehaus.plexus:plexus-containers:pom:)
provided in the sources
-------------------------------------------------------------------
Wed Apr 3 09:35:22 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Initial packaging of the plexus-component-metadata 1.7.1 maven
plugin
* Generates META-INF/plexus/components.xml during maven build

139
plexus-component-metadata.spec Normal file
View File

@ -0,0 +1,139 @@
#
# spec file
#
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%global base_name plexus-containers
%global comp_name plexus-component-metadata
%bcond_with tests
Name: %{comp_name}
Version: 2.1.1
Release: 0
Summary: Component metadata from %{base_name}
# Most of the files are either under ASL 2.0 or MIT
# The following files are under xpp:
# plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/Driver.java
# plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/MXParser.java
License: Apache-2.0 AND MIT AND xpp
Group: Development/Libraries/Java
URL: https://github.com/codehaus-plexus/plexus-containers
Source0: https://github.com/codehaus-plexus/%{base_name}/archive/%{base_name}-%{version}.tar.gz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
Source2: LICENSE.MIT
BuildRequires: fdupes
BuildRequires: maven-local
BuildRequires: mvn(com.thoughtworks.qdox:qdox)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-model)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.codehaus.plexus:plexus:pom:)
BuildRequires: mvn(org.jdom:jdom2)
BuildRequires: mvn(org.ow2.asm:asm) >= 7
#!BuildRequires: maven-compiler-plugin-bootstrap
#!BuildRequires: maven-jar-plugin-bootstrap
#!BuildRequires: maven-javadoc-plugin-bootstrap
#!BuildRequires: maven-plugin-plugin-bootstrap
#!BuildRequires: maven-resources-plugin-bootstrap
#!BuildRequires: maven-surefire-plugin-bootstrap
BuildArch: noarch
%description
The Plexus project seeks to create end-to-end developer tools for
writing applications. At the core is the container, which can be
embedded or for a full scale application server. There are many
reusable components for hibernate, form processing, jndi, i18n,
velocity, etc. Plexus also includes an application server which
is like a J2EE application server, without all the baggage.
%package javadoc
Summary: API documentation for %{name}
Group: Documentation/HTML
%description javadoc
%{summary}.
%prep
%setup -q -n %{base_name}-%{base_name}-%{version}
cp %{SOURCE1} .
cp %{SOURCE2} .
rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
%pom_remove_plugin -r :maven-site-plugin
# For Maven 3 compat
%pom_add_dep org.apache.maven:maven-core plexus-component-metadata
# ASM dependency was changed to "provided" in XBean 4.x, so we need to provide ASM
%pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default
%pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default
# Generate OSGI info
%pom_xpath_inject "pom:project" "
<packaging>bundle</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<_nouses>true</_nouses>
<Export-Package>org.codehaus.plexus.component.annotations.*</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>" plexus-component-annotations
# to prevent ant from failing
mkdir -p plexus-component-annotations/src/test/java
%build
pushd %{comp_name}
%{mvn_file} :%{comp_name} %{base_name}/%{comp_name}
%{mvn_build} \
%if %{without tests}
-f \
%endif
-- \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-Dmaven.compiler.release=8 \
%endif
-Dsource=8
popd
%install
pushd %{comp_name}
%mvn_install
%fdupes -s %{buildroot}%{_javadocdir}
popd
%files -f %{comp_name}/.mfiles
%license LICENSE-2.0.txt LICENSE.MIT
%files javadoc -f %{comp_name}/.mfiles-javadoc
%license LICENSE-2.0.txt LICENSE.MIT
%changelog

BIN
plexus-containers-2.1.1.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
plexus-containers-build.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

58
plexus-containers.changes Normal file
View File

@ -0,0 +1,58 @@
-------------------------------------------------------------------
Thu May 4 12:06:52 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Add _multibuild to define 2nd spec file as additional flavor.
Eliminates the need for source package links in OBS.
-------------------------------------------------------------------
Sun Mar 20 17:43:12 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with source and target levels 8
-------------------------------------------------------------------
Tue Jan 18 07:57:30 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Upgrade to version 2.1.1
* Last version before deprecation
* Requires Java 7 and Maven 3.2.5+
* Upgrade ASM to 9.2
* Security upgrade org.jdom:jdom2 from 2.0.6 to 2.0.6.1
-------------------------------------------------------------------
Sun Nov 24 14:46:44 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Upgrade to version 2.1.0
* Does not build plexus-component-javadoc any more
- Removed patch:
* 0001-Port-to-current-qdox.patch
+ integrated upstream
- Do not force building with java < 9 any more
-------------------------------------------------------------------
Tue Apr 9 17:10:35 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Remove references to parent poms since we are not building with
Maven.
-------------------------------------------------------------------
Fri Mar 22 21:34:55 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Add another spec file to build plexus-metadata-generator in order
to be able to generate plexus components.xml descriptor
- Added patch:
* plexus-metadata-generator-nomojo.patch
+ Allow building this command-line tool without needing to use
exceptions defined in maven-plugin-api
-------------------------------------------------------------------
Sun Mar 3 18:20:04 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Describe package, not project.
-------------------------------------------------------------------
Sat Mar 2 13:22:53 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Initial packaging of plexus-containers 1.7.1
- Generate and customize ant build files
- Leave out the plexus-component-metadata that will be built
by a different spec file

177
plexus-containers.spec Normal file
View File

@ -0,0 +1,177 @@
#
# spec file for package plexus-containers
#
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%bcond_with tests
Name: plexus-containers
Version: 2.1.1
Release: 0
Summary: Containers for Plexus
# Most of the files are either under ASL 2.0 or MIT
# The following files are under xpp:
# plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/Driver.java
# plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/MXParser.java
License: Apache-2.0 AND MIT AND xpp
Group: Development/Libraries/Java
URL: https://github.com/codehaus-plexus/plexus-containers
Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
Source2: LICENSE.MIT
Source100: %{name}-build.tar.xz
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: guava
BuildRequires: javapackages-local
BuildRequires: junit
BuildRequires: plexus-classworlds
BuildRequires: plexus-utils
BuildRequires: xbean
BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
BuildRequires: objectweb-asm
%endif
%description
Plexus contains end-to-end developer tools for writing applications.
At the core is the container, which can be embedded or for an
application server. There are many reusable components for hibernate,
form processing, jndi, i18n, velocity, etc. Plexus also includes an
application server which is like a J2EE application server.
%package component-annotations
Summary: Component API from %{name}
Group: Development/Libraries/Java
%description component-annotations
%{summary}.
%package container-default
Summary: Default Container from %{name}
Group: Development/Libraries/Java
Requires: mvn(com.google.guava:guava)
Requires: mvn(org.apache.xbean:xbean-reflect)
Requires: mvn(org.codehaus.plexus:plexus-classworlds)
Requires: mvn(org.codehaus.plexus:plexus-utils)
Requires: mvn(org.ow2.asm:asm)
Requires: mvn(org.ow2.asm:asm-commons)
%description container-default
%{summary}.
%package javadoc
Summary: API documentation for all plexus-containers packages
Group: Documentation/HTML
%description javadoc
%{summary}.
%prep
%setup -q -n %{name}-%{name}-%{version} -a100
mkdir -p lib
build-jar-repository -s lib plexus/classworlds plexus/utils guava/guava junit xbean/xbean-reflect
%if %{with tests}
build-jar-repository -s lib objectweb-asm/asm objectweb-asm/asm-commons hamcrest/core
%endif
cp %{SOURCE1} .
cp %{SOURCE2} .
rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
%pom_remove_plugin -r :maven-site-plugin
# For Maven 3 compat
%pom_add_dep org.apache.maven:maven-core plexus-component-metadata
# ASM dependency was changed to "provided" in XBean 4.x, so we need to provide ASM
%pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default
%pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default
# Generate OSGI info
%pom_xpath_inject "pom:project" "
<packaging>bundle</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<_nouses>true</_nouses>
<Export-Package>org.codehaus.plexus.component.annotations.*</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>" plexus-component-annotations
# to prevent ant from failing
mkdir -p plexus-component-annotations/src/test/java
%build
for i in plexus-component-annotations plexus-container-default; do
pushd ${i}
%pom_remove_parent .
%pom_xpath_inject "pom:project" "<groupId>org.codehaus.plexus</groupId><version>%{version}</version>" .
ant \
%if %{without tests}
-Dtest.skip=true \
%endif
jar javadoc
popd
done
%install
# jars
install -dm 0755 %{buildroot}%{_javadir}/%{name}
for i in plexus-component-annotations plexus-container-default; do
install -pm 0644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
done
install -dm 0755 %{buildroot}%{_javadir}/plexus
# keep compat symlink for maven's sake
ln -sf ../%{name}/plexus-component-annotations.jar %{buildroot}%{_javadir}/plexus/containers-component-annotations.jar
# poms
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
for i in plexus-component-annotations plexus-container-default; do
install -pm 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
done
%add_maven_depmap %{name}/plexus-component-annotations.pom %{name}/plexus-component-annotations.jar -f component-annotations
%add_maven_depmap %{name}/plexus-container-default.pom %{name}/plexus-container-default.jar -f container-default -a org.codehaus.plexus:containers-component-api
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
for i in plexus-component-annotations plexus-container-default; do
cp -pr ${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i}
done
%fdupes -s %{buildroot}%{_javadocdir}
%files component-annotations -f .mfiles-component-annotations
%license LICENSE-2.0.txt LICENSE.MIT
%{_javadir}/plexus
%files container-default -f .mfiles-container-default
%license LICENSE-2.0.txt LICENSE.MIT
%files javadoc
%license LICENSE-2.0.txt LICENSE.MIT
%{_javadocdir}/%{name}
%changelog

66
plexus-metadata-generator-cli.patch Normal file
View File

@ -0,0 +1,66 @@
diff -urEbwBN plexus-containers-plexus-containers-2.1.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/PlexusMetadataGeneratorCli.java plexus-containers-plexus-containers-2.1.0.new/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/PlexusMetadataGeneratorCli.java
--- plexus-containers-plexus-containers-2.1.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/PlexusMetadataGeneratorCli.java 1970-01-01 01:00:00.000000000 +0100
+++ plexus-containers-plexus-containers-2.1.0.new/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/PlexusMetadataGeneratorCli.java 2019-11-22 04:47:34.934070355 +0100
@@ -0,0 +1,62 @@
+package org.codehaus.plexus.metadata;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.tools.cli.AbstractCli;
+
+public class PlexusMetadataGeneratorCli
+ extends AbstractCli
+{
+ public static final String SOURCE_DIRECTORY = "s";
+ public static final String SOURCE_ENCODING = "e";
+ public static final String CLASSES_DIRECTORY = "c";
+ public static final String OUTPUT_FILE = "o";
+ public static final String DESCRIPTORS_DIRECTORY = "m";
+
+ public static void main( String[] args )
+ throws Exception
+ {
+ new PlexusMetadataGeneratorCli().execute( args );
+ }
+
+ @Override
+ public String getPomPropertiesPath()
+ {
+ return "META-INF/maven/org.codehaus.plexus/plexus-metadata-generator/pom.properties";
+ }
+
+ @Override
+ @SuppressWarnings("static-access")
+ public Options buildCliOptions( Options options )
+ {
+ options.addOption( Option.builder( SOURCE_DIRECTORY ).longOpt( "source" ).hasArg().desc( "Source directory." ).build() );
+ options.addOption( Option.builder( SOURCE_ENCODING ).longOpt( "encoding" ).hasArg().desc( "Source file encoding." ).build() );
+ options.addOption( Option.builder( CLASSES_DIRECTORY ).longOpt( "classes" ).hasArg().desc( "Classes directory." ).build() );
+ options.addOption( Option.builder( OUTPUT_FILE ).longOpt( "output" ).hasArg().desc( "Output directory." ).build() );
+ options.addOption( Option.builder( DESCRIPTORS_DIRECTORY ).longOpt( "descriptors" ).hasArg().desc( "Descriptors directory." ).build() );
+ return options;
+ }
+
+ public void invokePlexusComponent( CommandLine cli, PlexusContainer plexus )
+ throws Exception
+ {
+ MetadataGenerator metadataGenerator = plexus.lookup( MetadataGenerator.class );
+
+ MetadataGenerationRequest request = new MetadataGenerationRequest();
+ request.classesDirectory = new File( cli.getOptionValue( CLASSES_DIRECTORY ) );
+ request.classpath = Collections.emptyList();
+ request.sourceDirectories = Arrays.asList( new String[]{ new File( cli.getOptionValue( SOURCE_DIRECTORY ) ).getAbsolutePath() } );
+ request.sourceEncoding = cli.getOptionValue( SOURCE_ENCODING );
+ request.useContextClassLoader = true;
+ request.outputFile = new File( cli.getOptionValue( OUTPUT_FILE ) );
+ request.componentDescriptorDirectory = new File( cli.getOptionValue( DESCRIPTORS_DIRECTORY ) );
+
+ metadataGenerator.generateDescriptor( request );
+ }
+}

26
plexus-metadata-generator-nomojo.patch Normal file
View File

@ -0,0 +1,26 @@
--- plexus-containers-plexus-containers-1.7.1/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ClassComponentDescriptorExtractor.java 2016-08-31 21:01:49.000000000 +0200
+++ plexus-containers-plexus-containers-1.7.1/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ClassComponentDescriptorExtractor.java 2019-03-07 07:59:40.878835988 +0100
@@ -23,7 +23,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.maven.plugin.MojoExecutionException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.repository.ComponentDescriptor;
import org.codehaus.plexus.metadata.gleaner.AnnotationComponentGleaner;
@@ -95,15 +94,8 @@
// Add the projects dependencies
for ( String filename : elements )
{
- try
- {
list.add( new File( filename ).toURI().toURL() );
}
- catch ( MalformedURLException e )
- {
- throw new MojoExecutionException( "Invalid classpath entry: " + filename, e );
- }
- }
URL[] urls = list.toArray( new URL[list.size()] );

68
plexus-metadata-generator.changes Normal file
View File

@ -0,0 +1,68 @@
-------------------------------------------------------------------
Fri May 20 12:13:42 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Modified patch:
* plexus-metadata-generator-cli.patch
+ Do not use the deprecated plexus-cli functions, but port
the generator to the recommended replacement
-------------------------------------------------------------------
Sun Mar 20 17:43:54 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with source and target levels 8
-------------------------------------------------------------------
Fri May 14 16:39:03 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Removed patch:
* plexus-containers-asm6.patch
+ build using asm >= 7
-------------------------------------------------------------------
Sun Nov 24 14:50:30 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Upgrade to version 2.1.0
- Removed patch:
* 0001-Port-to-current-qdox.patch
+ integrated upstream
- Added patches:
* plexus-containers-asm6.patch
+ allow building against asm6
* plexus-metadata-generator-cli.patch
+ bring back the PlexusMetadataGeneratorCli.java removed by
upstream, but which we use heavily
-------------------------------------------------------------------
Tue Apr 9 17:17:04 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Remove reference to parent pom, since we are not building with
Maven.
- Clean the classpath of the script to include only neede jars
-------------------------------------------------------------------
Sat Mar 23 08:40:02 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- plexus-metadata-generator.spec: Describe package, not project.
-------------------------------------------------------------------
Fri Mar 22 21:34:55 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Add another spec file to build plexus-metadata-generator in order
to be able to generate plexus components.xml descriptor
- Added patch:
* plexus-metadata-generator-nomojo.patch
+ Allow building this command-line tool without needing to use
exceptions defined in maven-plugin-api
-------------------------------------------------------------------
Sun Mar 3 18:20:04 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Describe package, not project.
-------------------------------------------------------------------
Sat Mar 2 13:22:53 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Initial packaging of plexus-containers 1.7.1
- Generate and customize ant build files
- Leave out the plexus-component-metadata that will be built
by a different spec file

178
plexus-metadata-generator.spec Normal file
View File

@ -0,0 +1,178 @@
#
# spec file for package plexus-metadata-generator
#
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%global base_name plexus-containers
%global comp_name component-metadata
%bcond_with tests
Name: plexus-metadata-generator
Version: 2.1.1
Release: 0
Summary: Component metadata from %{base_name}
# Most of the files are either under ASL 2.0 or MIT
# The following files are under xpp:
# plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/Driver.java
# plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/MXParser.java
License: Apache-2.0 AND MIT AND xpp
Group: Development/Libraries/Java
URL: https://github.com/codehaus-plexus/plexus-containers
Source0: https://github.com/codehaus-plexus/%{base_name}/archive/%{base_name}-%{version}.tar.gz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
Source2: LICENSE.MIT
Source100: %{base_name}-build.tar.xz
Patch1: plexus-metadata-generator-cli.patch
Patch1000: %{name}-nomojo.patch
BuildRequires: ant
BuildRequires: apache-commons-cli
BuildRequires: fdupes
BuildRequires: javapackages-local
BuildRequires: jdom2
BuildRequires: junit
BuildRequires: objectweb-asm >= 7
BuildRequires: plexus-classworlds
BuildRequires: plexus-cli
BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-utils
BuildRequires: qdox >= 2
BuildRequires: xbean
Requires: apache-commons-cli
Requires: guava
Requires: jdom2
Requires: objectweb-asm >= 7
Requires: plexus-cli
Requires: plexus-containers-component-annotations = %{version}
Requires: plexus-containers-container-default = %{version}
Requires: plexus-utils
Requires: qdox >= 2
Requires: xbean
BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
%endif
%description
Plexus contains end-to-end developer tools for writing applications.
At the core is the container, which can be embedded or for an
application server. There are many reusable components for hibernate,
form processing, jndi, i18n, velocity, etc. Plexus also includes an
application server which is like a J2EE application server.
%package javadoc
Summary: API documentation for %{name}
Group: Documentation/HTML
%description javadoc
%{summary}.
%prep
%setup -q -n %{base_name}-%{base_name}-%{version} -a100
mkdir -p lib
build-jar-repository -s lib %{base_name} objectweb-asm/asm objectweb-asm/asm-commons plexus/classworlds plexus/utils jdom2/jdom2 commons-cli qdox plexus/cli
%if %{with tests}
build-jar-repository -s lib hamcrest/core xbean/xbean-reflect
%endif
%patch1 -p1
%patch1000 -p1
cp %{SOURCE1} .
cp %{SOURCE2} .
rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
%pom_remove_plugin -r :maven-site-plugin
# For Maven 3 compat
%pom_add_dep org.apache.maven:maven-core plexus-component-metadata
# ASM dependency was changed to "provided" in XBean 4.x, so we need to provide ASM
%pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default
%pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default
# Generate OSGI info
%pom_xpath_inject "pom:project" "
<packaging>bundle</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<_nouses>true</_nouses>
<Export-Package>org.codehaus.plexus.component.annotations.*</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>" plexus-component-annotations
# to prevent ant from failing
mkdir -p plexus-component-annotations/src/test/java
rm -rf plexus-%{comp_name}/src/main/java/org/codehaus/plexus/maven
rm -rf plexus-%{comp_name}/src/main/resources/META-INF/maven
%pom_remove_dep :maven-core plexus-%{comp_name}
%pom_remove_dep :maven-model plexus-%{comp_name}
%pom_remove_dep :maven-plugin-api plexus-%{comp_name}
%pom_remove_parent plexus-%{comp_name}
%pom_xpath_inject "pom:project" "
<groupId>org.codehaus.plexus</groupId>
<version>%{version}</version>
" plexus-%{comp_name}
%pom_xpath_set "pom:project/pom:artifactId" %{name} plexus-%{comp_name}
%build
pushd plexus-%{comp_name}
ant \
-f generator-build.xml \
%if %{without tests}
-Dtest.skip=true \
%endif
jar javadoc
popd
%install
# jar
install -dm 0755 %{buildroot}%{_javadir}
install -pm 0644 plexus-%{comp_name}/target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
# pom
install -dm 0755 %{buildroot}%{_mavenpomdir}
install -pm 0644 plexus-%{comp_name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
%add_maven_depmap %{name}.pom %{name}.jar
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr plexus-%{comp_name}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir}
# script
%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:%{base_name}/plexus-container-default:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect %{name}
%files -f .mfiles
%license LICENSE-2.0.txt LICENSE.MIT
%{_bindir}/%{name}
%files javadoc
%license LICENSE-2.0.txt LICENSE.MIT
%{_javadocdir}/%{name}
%changelog