From 2049bba21f6d0d4ee91e43f4251310a6b6c39cf6b58b4fca762413c28b744910 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 2 Apr 2019 10:06:40 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-containers?expand=0&rev=15 --- plexus-component-metadata.spec | 145 +++++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 plexus-component-metadata.spec diff --git a/plexus-component-metadata.spec b/plexus-component-metadata.spec new file mode 100644 index 0000000..f335acd --- /dev/null +++ b/plexus-component-metadata.spec @@ -0,0 +1,145 @@ +# +# spec file for package plexus +# +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# +# 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: 1.7.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 +Patch0: 0001-Port-to-current-qdox.patch +BuildRequires: fdupes +BuildRequires: maven-local +BuildRequires: mvn(com.thoughtworks.qdox:qdox) +BuildRequires: mvn(commons-cli:commons-cli) +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.apache.maven:maven-project) +BuildRequires: mvn(org.codehaus.plexus:plexus-cli) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) +BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) +BuildRequires: mvn(org.codehaus.plexus:plexus-containers:pom:) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.jdom:jdom2) +BuildRequires: mvn(org.ow2.asm:asm-all) +BuildArch: noarch +%if %{with tests} +BuildRequires: ant-junit +%endif + +%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} + +%patch0 -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 + +%pom_change_dep -r :google-collections com.google.guava:guava:20.0 + +# 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_remove_dep com.sun:tools plexus-component-javadoc +%pom_add_dep com.sun:tools plexus-component-javadoc + +# Generate OSGI info +%pom_xpath_inject "pom:project" " + bundle + + + + org.apache.felix + maven-bundle-plugin + true + + + <_nouses>true + org.codehaus.plexus.component.annotations.* + + + + + " plexus-component-annotations + +# to prevent ant from failing +mkdir -p plexus-component-annotations/src/test/java + +# integration tests fix +sed -i "s|2.3| %{javadoc_plugin_version}|" plexus-component-javadoc/src/it/basic/pom.xml + +%build +pushd %{comp_name} +%mvn_file :%{comp_name} %{base_name}/%{comp_name} +%if %{with tests} + %mvn_build +%else + %mvn_build -f +%endif +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 From c031e55ab8ea4f4bf59977d1804c70b96f57dad40346a8a0ae2ae078be3fc0c5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 2 Apr 2019 16:46:38 +0000 Subject: [PATCH 2/3] Accepting request 690709 from Java:packages . OBS-URL: https://build.opensuse.org/request/show/690709 OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-containers?expand=0&rev=16 --- plexus-component-metadata.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/plexus-component-metadata.spec b/plexus-component-metadata.spec index f335acd..ea7a04c 100644 --- a/plexus-component-metadata.spec +++ b/plexus-component-metadata.spec @@ -51,10 +51,13 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-containers:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.jdom:jdom2) BuildRequires: mvn(org.ow2.asm:asm-all) +#!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 -%if %{with tests} -BuildRequires: ant-junit -%endif %description The Plexus project seeks to create end-to-end developer tools for @@ -122,11 +125,11 @@ sed -i "s|2.3| %{javadoc_plugin_version}|" %build pushd %{comp_name} -%mvn_file :%{comp_name} %{base_name}/%{comp_name} +%{mvn_file} :%{comp_name} %{base_name}/%{comp_name} %if %{with tests} - %mvn_build + %{mvn_build} %else - %mvn_build -f + %{mvn_build} -f %endif popd @@ -139,7 +142,7 @@ popd %files -f %{comp_name}/.mfiles %license LICENSE-2.0.txt LICENSE.MIT -%files javadoc -f %{comp_name}/.mfiles-javadoc +%files javadoc -f %{comp_name}/.mfiles-javadoc %license LICENSE-2.0.txt LICENSE.MIT %changelog From 5693dbae5d0af8440e1a1b073ab4bba6d959e86b714564ad7367dadfee07e395 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 3 Apr 2019 09:36:32 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-containers?expand=0&rev=17 --- plexus-component-metadata.changes | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 plexus-component-metadata.changes diff --git a/plexus-component-metadata.changes b/plexus-component-metadata.changes new file mode 100644 index 0000000..1f22e26 --- /dev/null +++ b/plexus-component-metadata.changes @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Wed Apr 3 09:35:22 UTC 2019 - Fridrich Strba + +- Initial packaging of the plexus-component-metadata 1.7.1 maven + plugin + * Generates META-INF/plexus/components.xml during maven build