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

Accepting request 1174583 from Java:packages

Browse Source 
2.2.0

OBS-URL: https://build.opensuse.org/request/show/1174583
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-containers?expand=0&rev=14
This commit is contained in:
Ana Guerrero 2024-05-16 15:17:18 +00:00 committed by Git OBS Bridge
commit 7f9381ec05
10 changed files with 116 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plexus-component-metadata.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Thu May 16 12:59:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Upgrade to version 2.2.0
* improve documentation to switch to Sisu
* pom clean after parent upgrade
* Improve plexus-component metadata - remove dependency to
plexus-container-default
* Add deprecation information to Plexus components
* Require Java 8
* Drop plexus-container-default artefact
* Require Maven 3.6.3+
* Switch to JUnit5
* Bump org.eclipse.sisu.plexus from 0.3.0.M1 to 0.9.0.M2
-------------------------------------------------------------------
Wed May 15 13:38:06 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Fix build with maven-plugin-plugin >= 3.11.0: define goalPrefix
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 2 17:33:04 UTC 2024 - Fridrich Strba <fstrba@suse.com> Tue Apr 2 17:33:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>
@ -14,6 +34,15 @@ Sun Mar 20 17:45:24 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with java source and target levels 8 - Build with java 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
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 14 16:39:03 UTC 2021 - Fridrich Strba <fstrba@suse.com> Fri May 14 16:39:03 UTC 2021 - Fridrich Strba <fstrba@suse.com>

19
plexus-component-metadata.spec
View File

@ -20,7 +20,7 @@
%global comp_name plexus-component-metadata %global comp_name plexus-component-metadata
%bcond_with tests %bcond_with tests
Name: %{comp_name} Name: %{comp_name}
Version: 2.1.1 Version: 2.2.0
Release: 0 Release: 0
Summary: Component metadata from %{base_name} Summary: Component metadata from %{base_name}
# Most of the files are either under ASL 2.0 or MIT # Most of the files are either under ASL 2.0 or MIT
@ -42,7 +42,6 @@ BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-model)
BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) 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-utils)
BuildRequires: mvn(org.codehaus.plexus:plexus-xml) BuildRequires: mvn(org.codehaus.plexus:plexus-xml)
BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:)
@ -77,18 +76,8 @@ Group: Documentation/HTML
cp %{SOURCE1} . cp %{SOURCE1} .
cp %{SOURCE2} . cp %{SOURCE2} .
rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
%pom_remove_plugin -r :maven-site-plugin %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 %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-component-metadata
# Generate OSGI info # Generate OSGI info
@ -110,6 +99,12 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
</plugins> </plugins>
</build>" plexus-component-annotations </build>" plexus-component-annotations
# Fix build with maven-plugin-plugin >= 3.11.0
%pom_add_plugin org.apache.maven.plugins:maven-plugin-plugin plexus-component-metadata "
<configuration>
<goalPrefix>plexus-component-metadata</goalPrefix>
</configuration>"
# to prevent ant from failing # to prevent ant from failing
mkdir -p plexus-component-annotations/src/test/java 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.

15
plexus-containers.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Thu May 16 12:59:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Upgrade to version 2.2.0
* improve documentation to switch to Sisu
* pom clean after parent upgrade
* Improve plexus-component metadata - remove dependency to
plexus-container-default
* Add deprecation information to Plexus components
* Require Java 8
* Drop plexus-container-default artefact
* Require Maven 3.6.3+
* Switch to JUnit5
* Bump org.eclipse.sisu.plexus from 0.3.0.M1 to 0.9.0.M2
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 2 17:33:09 UTC 2024 - Fridrich Strba <fstrba@suse.com> Tue Apr 2 17:33:09 UTC 2024 - Fridrich Strba <fstrba@suse.com>

57
plexus-containers.spec
View File

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

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

@ -1,5 +1,5 @@
--- 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-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-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 +++ 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 @@ @@ -23,7 +23,6 @@
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -8,19 +8,15 @@
import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.repository.ComponentDescriptor; import org.codehaus.plexus.component.repository.ComponentDescriptor;
import org.codehaus.plexus.metadata.gleaner.AnnotationComponentGleaner; import org.codehaus.plexus.metadata.gleaner.AnnotationComponentGleaner;
@@ -95,15 +94,8 @@ @@ -81,11 +80,7 @@
// Add the projects dependencies // Add the projects dependencies
for ( String filename : elements ) for (String filename : elements) {
{ - try {
- try list.add(new File(filename).toURI().toURL());
- { - } catch (MalformedURLException e) {
list.add( new File( filename ).toURI().toURL() ); - throw new MojoExecutionException("Invalid classpath entry: " + filename, e);
}
- catch ( MalformedURLException e )
- {
- throw new MojoExecutionException( "Invalid classpath entry: " + filename, e );
- } - }
- } }
URL[] urls = list.toArray( new URL[list.size()] );
URL[] urls = list.toArray(new URL[list.size()]);

27
plexus-metadata-generator.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Thu May 16 12:59:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Upgrade to version 2.2.0
* improve documentation to switch to Sisu
* pom clean after parent upgrade
* Improve plexus-component metadata - remove dependency to
plexus-container-default
* Add deprecation information to Plexus components
* Require Java 8
* Drop plexus-container-default artefact
* Require Maven 3.6.3+
* Switch to JUnit5
* Bump org.eclipse.sisu.plexus from 0.3.0.M1 to 0.9.0.M2
- Modified patch:
* plexus-metadata-generator-nomojo.patch
+ rediff to changed context
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 2 17:33:15 UTC 2024 - Fridrich Strba <fstrba@suse.com> Tue Apr 2 17:33:15 UTC 2024 - Fridrich Strba <fstrba@suse.com>
@ -22,6 +40,15 @@ Sun Mar 20 17:43:54 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with source and target levels 8 - 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
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 14 16:39:03 UTC 2021 - Fridrich Strba <fstrba@suse.com> Fri May 14 16:39:03 UTC 2021 - Fridrich Strba <fstrba@suse.com>

25
plexus-metadata-generator.spec
View File

@ -20,7 +20,7 @@
%global comp_name component-metadata %global comp_name component-metadata
%bcond_with tests %bcond_with tests
Name: plexus-metadata-generator Name: plexus-metadata-generator
Version: 2.1.1 Version: 2.2.0
Release: 0 Release: 0
Summary: Component metadata from %{base_name} Summary: Component metadata from %{base_name}
# Most of the files are either under ASL 2.0 or MIT # Most of the files are either under ASL 2.0 or MIT
@ -46,21 +46,24 @@ BuildRequires: objectweb-asm >= 7
BuildRequires: plexus-classworlds BuildRequires: plexus-classworlds
BuildRequires: plexus-cli BuildRequires: plexus-cli
BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-utils BuildRequires: plexus-utils
BuildRequires: plexus-xml BuildRequires: plexus-xml
BuildRequires: qdox >= 2 BuildRequires: qdox >= 2
BuildRequires: sisu-plexus
BuildRequires: xbean BuildRequires: xbean
Requires: apache-commons-cli Requires: apache-commons-cli
Requires: atinject
Requires: google-guice
Requires: guava Requires: guava
Requires: jdom2 Requires: jdom2
Requires: objectweb-asm >= 7 Requires: objectweb-asm >= 7
Requires: plexus-cli Requires: plexus-cli
Requires: plexus-containers-component-annotations = %{version} Requires: plexus-containers-component-annotations = %{version}
Requires: plexus-containers-container-default = %{version}
Requires: plexus-utils Requires: plexus-utils
Requires: plexus-xml Requires: plexus-xml
Requires: qdox >= 2 Requires: qdox >= 2
Requires: sisu-inject
Requires: sisu-plexus
Requires: xbean Requires: xbean
BuildArch: noarch BuildArch: noarch
%if %{with tests} %if %{with tests}
@ -85,7 +88,7 @@ Group: Documentation/HTML
%setup -q -n %{base_name}-%{base_name}-%{version} -a100 %setup -q -n %{base_name}-%{base_name}-%{version} -a100
mkdir -p lib 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} objectweb-asm/asm objectweb-asm/asm-commons org.eclipse.sisu.plexus plexus/classworlds plexus/utils plexus/xml jdom2/jdom2 commons-cli qdox plexus/cli
%if %{with tests} %if %{with tests}
build-jar-repository -s lib hamcrest/core xbean/xbean-reflect build-jar-repository -s lib hamcrest/core xbean/xbean-reflect
%endif %endif
@ -97,19 +100,9 @@ build-jar-repository -s lib hamcrest/core xbean/xbean-reflect
cp %{SOURCE1} . cp %{SOURCE1} .
cp %{SOURCE2} . cp %{SOURCE2} .
rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
%pom_remove_plugin -r :maven-site-plugin %pom_remove_plugin -r :maven-site-plugin
# For Maven 3 compat %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-component-metadata
%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 # Generate OSGI info
%pom_xpath_inject "pom:project" " %pom_xpath_inject "pom:project" "
@ -165,7 +158,7 @@ install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr plexus-%{comp_name}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ cp -pr plexus-%{comp_name}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir} %fdupes -s %{buildroot}%{_javadocdir}
# script # 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}:atinject:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:guice/google-guice:%{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 %files -f .mfiles
%license LICENSE-2.0.txt LICENSE.MIT %license LICENSE-2.0.txt LICENSE.MIT