[maven-one-plugin] Packaging fixes
by Stanislav Ochotnicky
Summary of changes:
fde3290... Packaging fixes (*)
(*) This commit already existed in another branch; no separate mail sent
12 years, 5 months
[maven-one-plugin/f16] Packaging fixes
by Stanislav Ochotnicky
commit fde3290c75bae446353b2679f814a353368e2512
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Dec 2 13:43:13 2011 +0100
Packaging fixes
- Use new macros
- Fix build with maven-compat patch
maven-one-plugin.spec | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
---
diff --git a/maven-one-plugin.spec b/maven-one-plugin.spec
index 2267c4a..40eae7d 100644
--- a/maven-one-plugin.spec
+++ b/maven-one-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-one-plugin
Version: 1.2
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Plugin provides some integration tasks with Maven 1.x
Group: Development/Libraries
@@ -34,33 +34,31 @@ Requires: maven
Requires: maven-shared-model-converter
Requires: jpackage-utils
Requires: java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
Obsoletes: maven2-plugin-one <= 0:2.0.8
Provides: maven2-plugin-one = 1:%{version}-%{release}
%description
This plugin provides some integration tasks with Maven 1.x:
-* Helps you to switch your project from Maven 1 to Maven 2 by
+* Helps you to switch your project from Maven 1 to Maven 2 by
converting your project.xml to a pom.xml
-* Provides a packaging mechanism for Maven 1.x plugins,
+* Provides a packaging mechanism for Maven 1.x plugins,
building them using Maven 2.0
-* Provides a hook for installation that will copy built artifacts
-into a local or remote Maven 1.x repository, for concurrent development with
+* Provides a hook for installation that will copy built artifacts
+into a local or remote Maven 1.x repository, for concurrent development with
Maven 1.x projects
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
+Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
%prep
-%setup -q
+%setup -q
%patch0 -p1
%build
@@ -73,32 +71,32 @@ mvn-rpmbuild \
install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%files javadoc
%{_javadocdir}/%{name}
%changelog
+* Fri Dec 2 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.2-7
+- Packaging fixes
+- Use new macros
+- Fix build with maven-compat patch
+
* Thu Jun 9 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.2-6
- Build with maven 3.x.
- Guidelines fixes.
12 years, 5 months
[maven-one-plugin] Maven-compat patch
by Stanislav Ochotnicky
Summary of changes:
e51f34e... Maven-compat patch (*)
(*) This commit already existed in another branch; no separate mail sent
12 years, 5 months
[maven-one-plugin/f16] Maven-compat patch
by Stanislav Ochotnicky
commit e51f34e9766a7a88d63e86a3993440994c35f92b
Author: Tomas Radej <tradej(a)redhat.com>
Date: Fri Dec 2 13:17:27 2011 +0100
Maven-compat patch
maven-one-plugin-compat.patch | 15 +++++++++++++++
maven-one-plugin.spec | 3 +++
2 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/maven-one-plugin-compat.patch b/maven-one-plugin-compat.patch
new file mode 100644
index 0000000..1f0e6dd
--- /dev/null
+++ b/maven-one-plugin-compat.patch
@@ -0,0 +1,15 @@
+diff --git a/pom.xml b/pom.xml
+index 3bb590b..bec379b 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -90,6 +90,10 @@
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
diff --git a/maven-one-plugin.spec b/maven-one-plugin.spec
index 80561b2..2267c4a 100644
--- a/maven-one-plugin.spec
+++ b/maven-one-plugin.spec
@@ -11,6 +11,8 @@ URL: http://maven.apache.org/plugins/maven-one-plugin/
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}-jpp-depmap.xml
+Patch0: %{name}-compat.patch
+
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -59,6 +61,7 @@ API documentation for %{name}.
%prep
%setup -q
+%patch0 -p1
%build
mvn-rpmbuild \
12 years, 5 months
[apache-commons-dbcp/f16] Build with maven 3
by Stanislav Ochotnicky
commit a068e983e8f6acacc18645c7df65ad610707dd4d
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Dec 1 15:22:56 2011 +0100
Build with maven 3
- Fixes according to latest guidelines
apache-commons-dbcp.spec | 85 ++++++++++++++++++---------------------------
1 files changed, 34 insertions(+), 51 deletions(-)
---
diff --git a/apache-commons-dbcp.spec b/apache-commons-dbcp.spec
index 9253038..03c9144 100644
--- a/apache-commons-dbcp.spec
+++ b/apache-commons-dbcp.spec
@@ -3,17 +3,16 @@
Name: apache-%{short_name}
Version: 1.4
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Apache Commons DataBase Pooling Package
Group: Development/Libraries
License: ASL 2.0
URL: http://commons.apache.org/%{base_name}/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{ve...
-# Depmap needed to remove tomcat* deps (needed only for testing)
+# Depmap needed to remove tomcat* deps (needed only for testing)
# and fix geronimo transaction
Source1: %{short_name}.depmap
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -23,14 +22,12 @@ BuildRequires: apache-commons-pool
BuildRequires: geronimo-parent-poms
BuildRequires: jta
BuildRequires: maven-plugin-cobertura
+BuildRequires: maven
Requires: java >= 1:1.6.0
Requires: jpackage-utils
Requires: apache-commons-pool
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
# This should go away with F-17
Provides: jakarta-%{short_name} = 0:%{version}-%{release}
Obsoletes: jakarta-%{short_name} < 0:1.4-1
@@ -38,16 +35,16 @@ Obsoletes: jakarta-%{short_name}-tomcat5 < 0:1.4-1
Obsoletes: hibernate_jdbc_cache < 0:1.4-1
%description
-Many Apache projects support interaction with a relational database. Creating a
-new connection for each user can be time consuming (often requiring multiple
-seconds of clock time), in order to perform a database transaction that might
-take milliseconds. Opening a connection per user can be unfeasible in a
-publicly-hosted Internet application where the number of simultaneous users can
-be very large. Accordingly, developers often wish to share a "pool" of open
-connections between all of the application's current users. The number of users
-actually performing a request at any given time is usually a very small
-percentage of the total number of active users, and during request processing
-is the only time that a database connection is required. The application itself
+Many Apache projects support interaction with a relational database. Creating a
+new connection for each user can be time consuming (often requiring multiple
+seconds of clock time), in order to perform a database transaction that might
+take milliseconds. Opening a connection per user can be unfeasible in a
+publicly-hosted Internet application where the number of simultaneous users can
+be very large. Accordingly, developers often wish to share a "pool" of open
+connections between all of the application's current users. The number of users
+actually performing a request at any given time is usually a very small
+percentage of the total number of active users, and during request processing
+is the only time that a database connection is required. The application itself
logs into the DBMS, and handles any user account issues internally.
%package javadoc
@@ -65,63 +62,49 @@ This package contains the API documentation for %{name}.
iconv -f iso8859-1 -t utf-8 RELEASE-NOTES.txt > RELEASE-NOTES.txt.conv && mv -f RELEASE-NOTES.txt.conv RELEASE-NOTES.txt
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-
# Skip tests, tomcat:naming-java and tomcat:naming-common not available
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
+mvn-rpmbuild \
+ -Dmaven.local.depmap.file="%{SOURCE1}" \
-Dmaven.test.skip=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}
-install -pm 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -pm 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+ln -s %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
-
-# following line is only for backwards compatibility. New packages
-# should use proper groupid org.apache.commons and also artifactid
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.commons:%{short_name}"
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-
-%post
-%update_maven_depmap
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-%postun
-%update_maven_depmap
+%pre javadoc
+# workaround for rpm bug, can be removed in F-20
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-%clean
-rm -rf %{buildroot}
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_javadir}/%{name}.jar
+%{_javadir}/%{short_name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
-%doc LICENSE.txt
-%{_javadocdir}/%{name}-%{version}
+%doc LICENSE.txt NOTICE.txt
%{_javadocdir}/%{name}
%changelog
+* Thu Dec 1 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.4-7
+- Build with maven 3
+- Fixes according to latest guidelines
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 5 months
[maven-invoker-plugin/f16] Release number + Changelog
by tradej＠fedoraproject.org
commit c100e4812a93a42000a290ad4c28dd7387ecfdb3
Author: Tomas Radej <tradej(a)redhat.com>
Date: Thu Dec 1 15:12:33 2011 +0100
Release number + Changelog
maven-invoker-plugin.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/maven-invoker-plugin.spec b/maven-invoker-plugin.spec
index f52be6f..1d11fe1 100644
--- a/maven-invoker-plugin.spec
+++ b/maven-invoker-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-invoker-plugin
Version: 1.5
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Maven Invoker Plugin
Group: Development/Libraries
@@ -101,6 +101,10 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Thu Dec 01 2011 Tomas Radej <tradej(a)redhat.com> - 1.5-6
+- Modello BR
+- Maven-core and compat dep
+
* Thu Jun 9 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.5-5
- Build with maven 3.x.
- Use upstream source.
12 years, 5 months
[maven-invoker-plugin/f16] Modello BR + maven-core and compat dep
by tradej＠fedoraproject.org
commit df0bcebca2bbabd2bb32c92170521683ff5a37b1
Author: Tomas Radej <tradej(a)redhat.com>
Date: Thu Dec 1 13:01:43 2011 +0100
Modello BR + maven-core and compat dep
maven-invoker-plugin-core-compat.patch | 19 +++++++++++++++++++
maven-invoker-plugin.spec | 3 +++
2 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/maven-invoker-plugin-core-compat.patch b/maven-invoker-plugin-core-compat.patch
new file mode 100644
index 0000000..26cf721
--- /dev/null
+++ b/maven-invoker-plugin-core-compat.patch
@@ -0,0 +1,19 @@
+diff --git a/pom.xml b/pom.xml
+index ad1927b..073b390 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -60,6 +60,14 @@ under the License.
+
+ <dependencies>
+ <dependency>
++ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-core</artifactId>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ </dependency>
++ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-invoker</artifactId>
+ <version>2.0.11</version>
diff --git a/maven-invoker-plugin.spec b/maven-invoker-plugin.spec
index 9b43e4f..f52be6f 100644
--- a/maven-invoker-plugin.spec
+++ b/maven-invoker-plugin.spec
@@ -8,6 +8,7 @@ License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-invoker-plugin/
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
+Patch0: %{name}-core-compat.patch
BuildArch: noarch
# Basic stuff
@@ -28,6 +29,7 @@ BuildRequires: maven-surefire-plugin
BuildRequires: maven-plugin-cobertura
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-shared-invoker
+BuildRequires: modello
# Others
BuildRequires: groovy
@@ -61,6 +63,7 @@ API documentation for %{name}.
%prep
%setup -q
+%patch0 -p1
%build
mvn-rpmbuild \
12 years, 5 months
