[Bug 745118] New: commons-jaxl should provide compat depmap for commons-jaxl:commons-jaxl
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: commons-jaxl should provide compat depmap for commons-jaxl:commons-jaxl
https://bugzilla.redhat.com/show_bug.cgi?id=745118
Summary: commons-jaxl should provide compat depmap for
commons-jaxl:commons-jaxl
Product: Fedora
Version: rawhide
Platform: Unspecified
OS/Version: Unspecified
Status: NEW
Severity: unspecified
Priority: unspecified
Component: apache-commons-jexl
AssignedTo: sochotni(a)redhat.com
ReportedBy: sochotni(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: orion(a)cora.nwra.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Story Points: ---
Type: ---
Some packages use older groupId mapping for commons-jaxl. It will be easier for
packagers if this depmap is provided automatically.
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years, 6 months
[apache-commons-jexl] Packaging fixes
by Stanislav Ochotnicky
commit 3d1a28051b26c8c934cbfba11b4285005738ae13
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Oct 11 14:51:49 2011 +0200
Packaging fixes
- New maven macro for depmaps (include a compat depmap) #745118
apache-commons-jexl.spec | 51 ++++++++++++++-------------------------------
1 files changed, 16 insertions(+), 35 deletions(-)
---
diff --git a/apache-commons-jexl.spec b/apache-commons-jexl.spec
index 9d26920..b31e5bb 100644
--- a/apache-commons-jexl.spec
+++ b/apache-commons-jexl.spec
@@ -11,13 +11,14 @@ URL: http://commons.apache.org/jexl
Source0: http://www.apache.org/dist/commons/jexl/source/%{jarname}-%{version}-src....
# Java 1.6 contains bsf 3.0, so we don't need the dependency in the pom.xml file
Patch0: %{name}-2.0.1-bsf.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: jpackage-utils
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: apache-commons-parent
BuildRequires: maven-release-plugin
BuildRequires: javacc-maven-plugin
+BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven
BuildArch: noarch
@@ -32,12 +33,12 @@ and the Expression Language defined in the JavaServer Pages Standard Tag
Library version 1.1 (JSTL) and JavaServer Pages version 2.0 (JSP). While
inspired by JSTL EL, it must be noted that JEXL is not a compatible
implementation of EL as defined in JSTL 1.1 (JSR-052) or JSP 2.0 (JSR-152).
-For a compatible implementation of these specifications, see the Commons EL
+For a compatible implementation of these specifications, see the Commons EL
project.
JEXL attempts to bring some of the lessons learned by the Velocity community
about expression languages in templating to a wider audience. Commons Jelly
-needed Velocity-ish method access, it just had to have it.
+needed Velocity-ish method access, it just had to have it.
%package javadoc
@@ -59,60 +60,40 @@ find -name '*.txt' -exec sed -i 's/\r//' '{}' +
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
--Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-install javadoc:javadoc
-
+mvn-rpmbuild install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp target/%{jarname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{jarname}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{jarname}-%{version}.jar
+cp target/%{jarname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{jarname}.jar
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
cp -rp target/site/apidocs \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-cp -p pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.commons %{jarname} %{version} JPP %{name}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+mkdir -p $RPM_BUILD_ROOT/%{_mavenpomdir}
+cp -p pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a 'commons-jexl:commons-jexl'
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-%{_datadir}/maven2/poms/JPP-%{name}.pom
-%{_mavendepmapfragdir}
-%{_javadir}/%{name}-%{version}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%{_javadir}/%{name}.jar
-%{_javadir}/%{jarname}-%{version}.jar
%{_javadir}/%{jarname}.jar
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE.txt
%{_javadocdir}/%{name}
%changelog
+* Tue Oct 11 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.0.1-4
+- Packaging fixes
+- New maven macro for depmaps (include a compat depmap) #745118
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 6 months
[maven/f16] Provide mvn script now instead of maven2
by Stanislav Ochotnicky
commit d058e9b6f7c8e8fcff92e9695c2bcddb681f7e2f
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Oct 11 12:53:56 2011 +0200
Provide mvn script now instead of maven2
- Conflict with older versions of maven2
maven.spec | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index 5a364f0..548a617 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.3
-Release: 14%{?dist}.1
+Release: 15%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -63,9 +63,6 @@ BuildRequires: google-guice >= 3.0
BuildRequires: hamcrest
BuildRequires: apache-commons-parent
-# temporary for default poms resolving fix
-BuildRequires: maven2
-
Requires: java >= 1:1.6.0
Requires: maven-parent
Requires: plexus-classworlds >= 2.4
@@ -96,6 +93,8 @@ Requires: apache-commons-parent
# for noarch->arch change
Obsoletes: %{name} < 0:3.0.3-11
+# maven now provides "mvn" script and new maven2 mvn2
+Conflicts: maven2 < 2.2.1-28
%description
Maven is a software project management and comprehension tool. Based on the
@@ -271,7 +270,7 @@ install -m 644 %{SOURCE105} $RPM_BUILD_ROOT%{_javadir}/%{name}/empty-dep.jar
install -dm 755 $RPM_BUILD_ROOT%{_bindir}
# Wrappers
-cp -af %{SOURCE200} $RPM_BUILD_ROOT%{_bindir}/mvn3
+cp -af %{SOURCE200} $RPM_BUILD_ROOT%{_bindir}/mvn
cp -af %{SOURCE201} $RPM_BUILD_ROOT%{_bindir}/mvn-local
cp -af %{SOURCE202} $RPM_BUILD_ROOT%{_bindir}/mvn-rpmbuild
@@ -306,7 +305,7 @@ install -Dm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
%files
%doc LICENSE.txt NOTICE.txt README.txt
-%attr(0755,root,root) %{_bindir}/mvn3
+%attr(0755,root,root) %{_bindir}/mvn
%attr(0755,root,root) %{_bindir}/mvn-local
%attr(0755,root,root) %{_bindir}/mvn-rpmbuild
%dir %{_datadir}/%{name}
@@ -334,6 +333,10 @@ install -Dm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
%changelog
+* Tue Oct 11 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.3-15
+- Provide mvn script now instead of maven2
+- Conflict with older versions of maven2
+
* Mon Oct 03 2011 Rex Dieter <rdieter(a)fedoraproject.org> - 3.0.3-14.1
- rebuild (java), rel-eng#4932
12 years, 6 months
[maven] Provide mvn script now instead of maven2
by Stanislav Ochotnicky
commit fdef3da76717d37a95fbd3f751f91d3fa053b907
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Oct 11 12:53:56 2011 +0200
Provide mvn script now instead of maven2
- Conflict with older versions of maven2
maven.spec | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index c156278..a06355e 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.3
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -63,9 +63,6 @@ BuildRequires: google-guice >= 3.0
BuildRequires: hamcrest
BuildRequires: apache-commons-parent
-# temporary for default poms resolving fix
-BuildRequires: maven2
-
Requires: java >= 1:1.6.0
Requires: maven-parent
Requires: plexus-classworlds >= 2.4
@@ -96,6 +93,8 @@ Requires: apache-commons-parent
# for noarch->arch change
Obsoletes: %{name} < 0:3.0.3-11
+# maven now provides "mvn" script and new maven2 mvn2
+Conflicts: maven2 < 2.2.1-28
%description
Maven is a software project management and comprehension tool. Based on the
@@ -271,7 +270,7 @@ install -m 644 %{SOURCE105} $RPM_BUILD_ROOT%{_javadir}/%{name}/empty-dep.jar
install -dm 755 $RPM_BUILD_ROOT%{_bindir}
# Wrappers
-cp -af %{SOURCE200} $RPM_BUILD_ROOT%{_bindir}/mvn3
+cp -af %{SOURCE200} $RPM_BUILD_ROOT%{_bindir}/mvn
cp -af %{SOURCE201} $RPM_BUILD_ROOT%{_bindir}/mvn-local
cp -af %{SOURCE202} $RPM_BUILD_ROOT%{_bindir}/mvn-rpmbuild
@@ -306,7 +305,7 @@ install -Dm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
%files
%doc LICENSE.txt NOTICE.txt README.txt
-%attr(0755,root,root) %{_bindir}/mvn3
+%attr(0755,root,root) %{_bindir}/mvn
%attr(0755,root,root) %{_bindir}/mvn-local
%attr(0755,root,root) %{_bindir}/mvn-rpmbuild
%dir %{_datadir}/%{name}
@@ -334,6 +333,10 @@ install -Dm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
%changelog
+* Tue Oct 11 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.3-15
+- Provide mvn script now instead of maven2
+- Conflict with older versions of maven2
+
* Tue Aug 30 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.3-14
- Fix test scope skipping
12 years, 6 months
[maven2] Provide mvn2 script instead of mvn (maven provides that now)
by Stanislav Ochotnicky
commit bc0f91b322469307dc1d2c7432ecd3565d9226eb
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Oct 11 12:54:01 2011 +0200
Provide mvn2 script instead of mvn (maven provides that now)
maven2.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/maven2.spec b/maven2.spec
index 6681d1d..590a891 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -3,7 +3,7 @@
Name: maven2
Version: 2.2.1
-Release: 27%{?dist}
+Release: 28%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Build Tools
@@ -504,7 +504,7 @@ install -m 644 %{SOURCE104} $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.maven2-e
install -m 644 %{SOURCE105} $RPM_BUILD_ROOT%{_javadir}/%{name}/empty-dep.jar
# Wrappers
-/bin/cp -af %{SOURCE200} $RPM_BUILD_ROOT%{_bindir}/mvn
+/bin/cp -af %{SOURCE200} $RPM_BUILD_ROOT%{_bindir}/mvn2
/bin/cp -af %{SOURCE201} $RPM_BUILD_ROOT%{_bindir}/mvn-jpp
%if %{bootstrap}
@@ -589,7 +589,7 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
%endif
%files
-%attr(0755,root,root) %{_bindir}/mvn
+%attr(0755,root,root) %{_bindir}/mvn2
%attr(0755,root,root) %{_bindir}/mvn-jpp
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/bin
@@ -668,6 +668,9 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
%changelog
+* Tue Oct 11 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-28
+- Provide mvn2 script instead of mvn (maven provides that now)
+
* Tue Jul 19 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-27
- Add maven-error-diagnostics subpackage
- Order subpackages according to alphabet
12 years, 6 months