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

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

Browse Source
This commit is contained in:
Fridrich Strba 2024-05-15 17:03:55 +00:00 committed by Git OBS Bridge
parent 5c0f8fe6eb
commit 9939f1a54b
7 changed files with 51 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plexus-component-metadata.spec
View File

@ -20,7 +20,7 @@
%global comp_name plexus-component-metadata
%bcond_with tests
Name: %{comp_name}
Version: 2.1.1
Version: 2.2.0
Release: 0
Summary: Component metadata from %{base_name}
# Most of the files are either under ASL 2.0 or MIT
@ -42,10 +42,10 @@ 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-xml)
BuildRequires: mvn(org.codehaus.plexus:plexus:pom:)
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
BuildRequires: mvn(org.jdom:jdom2)
BuildRequires: mvn(org.ow2.asm:asm) >= 7
#!BuildRequires: maven-compiler-plugin-bootstrap
@ -77,20 +77,8 @@ Group: Documentation/HTML
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
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-container-default
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-component-metadata
# Generate OSGI info
%pom_xpath_inject "pom:project" "
<packaging>bundle</packaging>
@ -111,7 +99,8 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
</build>" plexus-component-annotations
# Fix build with maven-plugin-plugin >= 3.11.0
%pom_xpath_inject "pom:project/pom:build" "
%pom_xpath_inject "pom:project" "
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -120,7 +109,8 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
<goalPrefix>plexus-component-metadata</goalPrefix>
</configuration>
</plugin>
</plugins>" plexus-component-metadata
</plugins>
</build>" plexus-component-metadata
# to prevent ant from failing
mkdir -p plexus-component-annotations/src/test/java

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

59
plexus-containers.spec
View File

@ -18,7 +18,7 @@
%bcond_with tests
Name: plexus-containers
Version: 2.1.1
Version: 2.2.0
Release: 0
Summary: Containers for Plexus
# Most of the files are either under ASL 2.0 or MIT
@ -61,13 +61,6 @@ Group: Development/Libraries/Java
%description component-annotations
%{summary}.
%package container-default
Summary: Default Container from %{name}
Group: Development/Libraries/Java
%description container-default
%{summary}.
%package javadoc
Summary: API documentation for all plexus-containers packages
Group: Documentation/HTML
@ -87,20 +80,8 @@ build-jar-repository -s lib objectweb-asm/asm objectweb-asm/asm-commons hamcrest
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
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-container-default
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-component-metadata
# Generate OSGI info
%pom_xpath_inject "pom:project" "
<packaging>bundle</packaging>
@ -124,46 +105,32 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
mkdir -p plexus-component-annotations/src/test/java
%build
for i in plexus-component-annotations plexus-container-default; do
pushd ${i}
%{ant} \
pushd plexus-component-annotations
%{ant} \
%if %{without tests}
-Dtest.skip=true \
-Dtest.skip=true \
%endif
jar javadoc
popd
done
jar javadoc
popd
%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
install -pm 0644 plexus-component-annotations/target/plexus-component-annotations-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/plexus-component-annotations.jar
# poms
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
for i in plexus-component-annotations plexus-container-default; do
%{mvn_install_pom} ${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
%{mvn_install_pom} plexus-component-annotations/pom.xml \
%{buildroot}%{_mavenpomdir}/%{name}/plexus-component-annotations.pom
%add_maven_depmap %{name}/plexus-component-annotations.pom %{name}/plexus-component-annotations.jar
# 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
cp -pr plexus-component-annotations/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/plexus-component-annotations
%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
%files component-annotations -f .mfiles
%license LICENSE-2.0.txt LICENSE.MIT
%files javadoc

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

@ -0,0 +1,22 @@
--- plexus-containers-2.2.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ClassComponentDescriptorExtractor.java 2024-05-15 18:50:14.906335826 +0200
+++ plexus-containers-2.2.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ClassComponentDescriptorExtractor.java 2024-05-15 18:52:35.743977916 +0200
@@ -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;
@@ -81,11 +80,7 @@
// 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()]);

20
plexus-metadata-generator.spec
View File

@ -20,7 +20,7 @@
%global comp_name component-metadata
%bcond_with tests
Name: plexus-metadata-generator
Version: 2.1.1
Version: 2.2.0
Release: 0
Summary: Component metadata from %{base_name}
# Most of the files are either under ASL 2.0 or MIT
@ -46,10 +46,10 @@ BuildRequires: objectweb-asm >= 7
BuildRequires: plexus-classworlds
BuildRequires: plexus-cli
BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-utils
BuildRequires: plexus-xml
BuildRequires: qdox >= 2
BuildRequires: sisu-plexus
BuildRequires: xbean
Requires: apache-commons-cli
Requires: guava
@ -57,10 +57,10 @@ 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: plexus-xml
Requires: qdox >= 2
Requires: sisu-plexus
Requires: xbean
BuildArch: noarch
%if %{with tests}
@ -85,7 +85,7 @@ Group: Documentation/HTML
%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 plexus/xml jdom2/jdom2 commons-cli qdox plexus/cli
build-jar-repository -s lib %{base_name} org.eclipse.sisu.plexus objectweb-asm/asm objectweb-asm/asm-commons plexus/classworlds plexus/utils plexus/xml jdom2/jdom2 commons-cli qdox plexus/cli
%if %{with tests}
build-jar-repository -s lib hamcrest/core xbean/xbean-reflect
%endif
@ -101,16 +101,6 @@ 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
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-container-default
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-%{comp_name}
# Generate OSGI info
%pom_xpath_inject "pom:project" "
<packaging>bundle</packaging>
@ -165,7 +155,7 @@ 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:plexus/xml:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect %{name}
%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:org.eclipse.sisu.plexus:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:plexus/xml:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect %{name}
%files -f .mfiles
%license LICENSE-2.0.txt LICENSE.MIT