[icu4j] Add OSGi manifest for bootstrapping Eclipse.
by Alexander Kurtakov
commit da330a5419e137f7b5ce59c1d6618991a5df2388
Author: Alexander Kurtakov < <akurtako(a)redhat.com>
Date: Tue Nov 15 15:04:46 2011 +0200
Add OSGi manifest for bootstrapping Eclipse.
icu4j-4.4.2-MANIFEST.MF | 28 ++++++++++++++++++++++++++++
icu4j.spec | 18 +++++++++++++++++-
2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/icu4j-4.4.2-MANIFEST.MF b/icu4j-4.4.2-MANIFEST.MF
new file mode 100644
index 0000000..91c262a
--- /dev/null
+++ b/icu4j-4.4.2-MANIFEST.MF
@@ -0,0 +1,28 @@
+Manifest-Version: 1.0
+Export-Package: com.ibm.icu.lang;base=true;full=true;version="4.4.2.1"
+ ,com.ibm.icu.math;base=true;full=true;version="4.4.2.1",com.ibm.icu.t
+ ext;base=true;full=true;version="4.4.2.1",com.ibm.icu.util;base=true;
+ full=true;version="4.4.2.1",com.ibm.icu.impl;x-internal:=true,com.ibm
+ .icu.impl.data;x-internal:=true,com.ibm.icu.impl.data.icudt44b;x-inte
+ rnal:=true,com.ibm.icu.impl.data.icudt44b.brkitr;x-internal:=true,com
+ .ibm.icu.impl.data.icudt44b.coll;x-internal:=true,com.ibm.icu.impl.da
+ ta.icudt44b.curr;x-internal:=true,com.ibm.icu.impl.data.icudt44b.lang
+ ;x-internal:=true,com.ibm.icu.impl.data.icudt44b.rbnf;x-internal:=tru
+ e,com.ibm.icu.impl.data.icudt44b.region;x-internal:=true,com.ibm.icu.
+ impl.data.icudt44b.translit;x-internal:=true,com.ibm.icu.impl.data.ic
+ udt44b.zone;x-internal:=true,com.ibm.icu.impl.duration;x-internal:=tr
+ ue,com.ibm.icu.impl.locale;x-internal:=true
+Bundle-ClassPath: icu-data.jar,.
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-Copyright: Licensed Materials - Property of IBM (C) Copyright I
+ BM Corp. 2000, 2011. All Rights Reserved. IBM is a registered tradema
+ rk of IBM Corp.
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: %providerName
+Eclipse-LazyStart: true
+Bundle-Version: 4.4.2.v20110208
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: com.ibm.icu; singleton:=true
+Eclipse-ExtensibleAPI: true
+
diff --git a/icu4j.spec b/icu4j.spec
index fe37e8a..91a7420 100644
--- a/icu4j.spec
+++ b/icu4j.spec
@@ -42,7 +42,7 @@
Name: icu4j
Version: 4.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
Summary: International Components for Unicode for Java
License: MIT and EPL
@@ -52,6 +52,11 @@ Group: Development/Libraries
#tar caf icu4j-4.4.2.tar.xz icu4j-4.4.2/
Source0: icu4j-4.4.2.tar.xz
Source1: %{name}-4.4.2.pom
+## CAUTION
+## Please do not forget to update this Manifest to the latest one taken from the icu4j bundle from
+## out/projects/ICU4J.com.ibm.icu/com.ibm.icu-com.ibm.icu.zip
+## This is needed to unbreak cyclic dependencies between Eclipse and ICU4J
+Source2: icu4j-%{version}-MANIFEST.MF
Patch0: %{name}-crosslink.patch
BuildRequires: ant >= 1.7.0
@@ -61,6 +66,7 @@ BuildRequires: java-javadoc >= 1:1.6.0
# This is to ensure we get OpenJDK and not GCJ
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.5
+BuildRequires: zip
Requires: jpackage-utils
# This is to ensure we get OpenJDK and not GCJ
Requires: java >= 1:1.6.0
@@ -132,6 +138,13 @@ popd
%endif
%install
+
+# inject OSGi manifests
+mkdir -p META-INF
+cp -p %{SOURCE2} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{name}.jar META-INF/MANIFEST.MF
+
# jars
%__mkdir_p %{buildroot}%{_javadir}
%__cp -ap %{name}.jar %{buildroot}%{_javadir}/%{name}.jar
@@ -172,6 +185,9 @@ cp %{name}-4.4.2.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%endif
%changelog
+* Tue Nov 15 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1:4.4.2-4
+- Add proper manifest to the jar in the main package.
+
* Fri Sep 16 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1:4.4.2-3
- Adapt to current guidelines.
12 years, 6 months
[maven-plugin-bundle] OBR plugin readded (it's been merged to the bundle plugin)
by Jaromír Cápík
commit f6ba1c6fc6be1c226c2f57cc091ae3511b7396a5
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Mon Nov 14 18:37:27 2011 +0100
OBR plugin readded (it's been merged to the bundle plugin)
maven-bundle-plugin-unreported-exception.patch | 13 +++++++++++++
maven-plugin-bundle.spec | 8 ++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/maven-bundle-plugin-unreported-exception.patch b/maven-bundle-plugin-unreported-exception.patch
new file mode 100644
index 0000000..9b6014f
--- /dev/null
+++ b/maven-bundle-plugin-unreported-exception.patch
@@ -0,0 +1,13 @@
+diff -Naur maven-bundle-plugin-2.3.5.orig/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java maven-bundle-plugin-2.3.5/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java
+--- maven-bundle-plugin-2.3.5.orig/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java 2011-07-05 13:56:05.000000000 +0200
++++ maven-bundle-plugin-2.3.5/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java 2011-11-14 18:21:26.878801248 +0100
+@@ -125,6 +125,9 @@
+ {
+ throw new MojoExecutionException( "Unable to configure Wagon: '" + repository.getProtocol() + "'", e );
+ }
++ catch ( Exception e )
++ {
++ }
+
+ try
+ {
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index e3bf9d5..351aba7 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -2,7 +2,7 @@
Name: maven-plugin-bundle
Version: 2.3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Maven Bundle Plugin
Group: Development/Tools
@@ -12,6 +12,7 @@ Source0: http://apache.tradebit.com/pub/felix/%{site_name}-%{version}-sou
Patch0: %{site_name}-unbundling.patch
Patch1: %{site_name}-exception-already-thrown.patch
+Patch2: %{site_name}-unreported-exception.patch
BuildRequires: aqute-bndlib >= 1.43.0
BuildRequires: plexus-utils >= 1.4.5
@@ -68,10 +69,10 @@ API documentation for %{name}.
%patch0 -p1
%patch1 -p1
+%patch2 -p1
# remove bundled stuff
rm -rf src/main/java/org/apache/maven
-rm -rf src/main/java/org/apache/felix/obrplugin
%build
# tests can't be built (seems like a MavenProjectStub incompatibility with MavenProject)
@@ -102,6 +103,9 @@ rm -rf target/site/api*
%{_javadocdir}/%{name}
%changelog
+* Mon Nov 14 2011 Jaromir Capik <jcapik(a)redhat.com> 2.3.5-2
+- OBR plugin readded (it's been merged to the bundle plugin)
+
* Mon Oct 24 2011 Jaromir Capik <jcapik(a)redhat.com> 2.3.5-1
- Update to 2.3.5
12 years, 6 months
[tomcat] +- Drop %%update_maven_depmap as in tomcat6 +- Provide native systemd unit file ported from tomcat6
by Ivan Afonichev
commit ddfc98c4f445649a2886286492f0a5cc585b13a8
Author: Ivan Afonichev <ivan.afonichev(a)gmail.com>
Date: Fri Nov 11 01:48:56 2011 +0400
+- Drop %%update_maven_depmap as in tomcat6
+- Provide native systemd unit file ported from tomcat6
tomcat-7.0-tomcat-sysd | 101 ++++++++++++++++++++++++++++++++++++++++++++++++
tomcat-7.0.init | 8 ++--
tomcat-7.0.service | 16 +++++--
tomcat.spec | 61 +++++++++++++++++++++++------
4 files changed, 165 insertions(+), 21 deletions(-)
---
diff --git a/tomcat-7.0-tomcat-sysd b/tomcat-7.0-tomcat-sysd
new file mode 100644
index 0000000..1e79816
--- /dev/null
+++ b/tomcat-7.0-tomcat-sysd
@@ -0,0 +1,101 @@
+#!/bin/bash
+#
+# This script provides systemd activation of the tomcat service
+# To create clones of this service:
+# 1) SERVICE_NAME must be defined before calling this script
+# 2) Create /etc/sysconfig/${SERVICE_NAME} from /etc/sysconfig/tomcat
+# to override tomcat defaults
+
+# SERVICE_NAME is a required value only if the service name is
+# different from 'tomcat'
+#
+NAME="${SERVICE_NAME:-tomcat}"
+
+#I'll bet this isn't required.
+# unset ISBOOT
+
+# For SELinux we need to use 'runuser' not 'su'
+if [ -x "/sbin/runuser" ]; then
+ SU="/sbin/runuser -s /bin/sh"
+else
+ SU="/bin/su -s /bin/sh"
+fi
+
+# Path to the tomcat launch script
+TOMCAT_SCRIPT="/usr/sbin/tomcat"
+
+# Define the tomcat username
+TOMCAT_USER="${TOMCAT_USER:-tomcat}"
+
+# TOMCAT_LOG should be different from catalina.out.
+# Usually the below config is all that is necessary
+TOMCAT_LOG=/var/log/${NAME}/${NAME}-sysd.log
+
+# Get the tomcat config (use this for environment specific settings)
+TOMCAT_CFG="/etc/tomcat/tomcat.conf"
+if [ -r "$TOMCAT_CFG" ]; then
+ . $TOMCAT_CFG
+fi
+
+# Get instance specific config file
+if [ -r "/etc/sysconfig/${NAME}" ]; then
+ . /etc/sysconfig/${NAME}
+fi
+
+function parseOptions() {
+ options=""
+ options="$options $(
+ awk '!/^#/ && !/^$/ { ORS=" "; print "export ", $0, ";" }' \
+ $TOMCAT_CFG
+ )"
+ if [ -r "/etc/sysconfig/${NAME}" ]; then
+ options="$options $(
+ awk '!/^#/ && !/^$/ { ORS=" ";
+ print "export ", $0, ";" }' \
+ /etc/sysconfig/${NAME}
+ )"
+ fi
+ TOMCAT_SCRIPT="$options ${TOMCAT_SCRIPT}"
+}
+
+# See how we were called.
+function start() {
+ # fix permissions on the log and pid files
+ export CATALINA_PID="/var/run/${NAME}.pid"
+ touch $CATALINA_PID 2>&1
+ if [ "$?" -eq "0" ]; then
+ chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID
+ fi
+
+ touch $TOMCAT_LOG 2>&1
+ if [ "$?" -eq "0" ]; then
+ chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG
+ fi
+
+ parseOptions
+ if [ "$SECURITY_MANAGER" = "true" ]; then
+ $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" >> $TOMCAT_LOG 2>&1
+ else
+ $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> $TOMCAT_LOG 2>&1
+ fi
+}
+
+function stop() {
+ parseOptions
+ $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> $TOMCAT_LOG 2>&1
+}
+
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart)
+ stop
+ start
+ ;;
+esac
+
diff --git a/tomcat-7.0.init b/tomcat-7.0.init
index 7808d23..cddf8cd 100644
--- a/tomcat-7.0.init
+++ b/tomcat-7.0.init
@@ -67,7 +67,7 @@ TOMCAT_PROG="${NAME}"
TOMCAT_USER="${TOMCAT_USER:-tomcat}"
# Define the tomcat log file
-TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat/catalina.out}"
+TOMCAT_LOG="${TOMCAT_LOG:-${CATALINA_HOME}/logs/${NAME}-initd.log}"
RETVAL="0"
@@ -184,10 +184,10 @@ function start() {
parseOptions
if [ "$RETVAL" -eq "0" -a "$SECURITY_MANAGER" = "true" ]; then
$SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" \
- >> /var/log/${NAME}/initd.log 2>&1 || RETVAL="4"
+ >> ${TOMCAT_LOG} 2>&1 || RETVAL="4"
else
- [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> /var/log/${NAME}/initd.log 2>&1 || RETVAL="4"
+ [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> ${TOMCAT_LOG} 2>&1 || RETVAL="4"
fi
if [ "$RETVAL" -eq "0" ]; then
log_success_msg
@@ -206,7 +206,7 @@ function stop() {
parseOptions
if [ "$RETVAL" -eq "0" ]; then
touch /var/lock/subsys/${NAME} 2>&1 || RETVAL="4"
- [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> /var/log/${NAME}/initd.log 2>&1 || RETVAL="4"
+ [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> ${TOMCAT_LOG} 2>&1 || RETVAL="4"
fi
if [ "$RETVAL" -eq "0" ]; then
count="0"
diff --git a/tomcat-7.0.service b/tomcat-7.0.service
index 3e47c4f..e556336 100644
--- a/tomcat-7.0.service
+++ b/tomcat-7.0.service
@@ -1,13 +1,19 @@
+# Systemd unit file for tomcat
+#
+# To create clones of this service:
+# 1) By default SERVICE_NAME=tomcat. When cloned, the value must be defined
+# before tomcat-sysd is called.
+# 2) Create /etc/sysconfig/${SERVICE_NAME} from /etc/sysconfig/tomcat
+# to override tomcat defaults
+
[Unit]
-Description=Release implementation for Servlet 3.0 and JSP 2.2
+Description=Apache Tomcat Web Application Container
After=syslog.target network.target
[Service]
Type=forking
-PIDFile=/var/run/tomcat.pid
-EnvironmentFile=/etc/sysconfig/tomcat
-ExecStart=/etc/init.d/tomcat start
-ExecStop=/etc/init.d/tomcat stop
+ExecStart=/usr/sbin/tomcat-sysd start
+ExecStop=/usr/sbin/tomcat-sysd stop
[Install]
WantedBy=multi-user.target
diff --git a/tomcat.spec b/tomcat.spec
index e568452..2aed06e 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -77,6 +77,7 @@ Source13: jasper-el-OSGi-MANIFEST.MF
Source14: jasper-OSGi-MANIFEST.MF
Source15: tomcat-api-OSGi-MANIFEST.MF
Source16: tomcat-juli-OSGi-MANIFEST.MF
+Source17: %{name}-%{major_version}.%{minor_version}-tomcat-sysd
Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
@@ -97,6 +98,7 @@ BuildRequires: junit
BuildRequires: log4j
BuildRequires: geronimo-jaxrpc
BuildRequires: wsdl4j
+BuildRequires: systemd-units
Requires: apache-commons-daemon
Requires: apache-commons-logging
Requires: apache-commons-collections
@@ -110,8 +112,9 @@ Requires(post): chkconfig
Requires(preun): chkconfig
Requires(post): redhat-lsb
Requires(preun): redhat-lsb
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
%description
Tomcat is the servlet container that is used in the official Reference
@@ -147,6 +150,14 @@ Requires: jpackage-utils
%description javadoc
Javadoc generated documentation for Apache Tomcat.
+%package systemv
+Group: System Environment/Daemons
+Summary: Systemv scripts for Apache Tomcat
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description systemv
+SystemV scripts to start and stop tomcat service
+
%package jsp-%{jspspec}-api
Group: Development/Libraries
Summary: Apache Tomcat JSP API implementation classes
@@ -308,6 +319,7 @@ zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{homedir}
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir}
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{workdir}
+%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_unitdir}
# move things into place
# First copy supporting libs to tomcat lib
@@ -334,7 +346,9 @@ popd
%{__install} -m 0644 %{SOURCE4} \
${RPM_BUILD_ROOT}%{_sbindir}/%{name}
%{__install} -m 0644 %{SOURCE11} \
- ${RPM_BUILD_ROOT}%{_systemddir}/%{name}.service
+ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service
+%{__install} -m 0644 %{SOURCE17} \
+ ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-sysd
%{__ln_s} %{name} ${RPM_BUILD_ROOT}%{_sbindir}/d%{name}
%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \
> ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
@@ -444,7 +458,10 @@ done
%post
# install but don't activate
/sbin/chkconfig --add %{name}
-%update_maven_depmap
+if [ $1 -eq 1 ]; then
+ #initial installation
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
%post jsp-%{jspspec}-api
%{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \
@@ -453,7 +470,6 @@ done
%post servlet-%{servletspec}-api
%{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500
-%update_maven_depmap
%post el-%{elspec}-api
%{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \
@@ -465,11 +481,18 @@ done
if [ "$1" = "0" ]; then
%{_initrddir}/%{name} stop >/dev/null 2>&1
/sbin/chkconfig --del %{name}
+ # package removal, not upgrade
+ /bin/systemctl --no-reload disable tomcat.service > /dev/null 2>&1 || :
+ /bin/systemctl stop tomcat.service > /dev/null 2>&1 || :
fi
-
%postun
-%update_maven_depmap
+/bin/systemctl daemon-reload > /dev/null 2>&1 || :
+if [ $1 -ge 1 ]; then
+ #package upgrade, not uninstall
+ /bin/systemctl try-restart tomcat.service > /dev/null 2>&1 || :
+fi
+
%postun jsp-%{jspspec}-api
if [ "$1" = "0" ]; then
@@ -481,7 +504,6 @@ fi
if [ "$1" = "0" ]; then
%{_sbindir}/update-alternatives --remove servlet \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
- %update_maven_depmap
fi
%postun el-%{elspec}-api
@@ -490,15 +512,20 @@ if [ "$1" = "0" ]; then
%{_javadir}/%{name}-el-%{elspec}-api.jar
fi
+%triggerun -- tomcat < 0:7.0.22-2
+/usr/bin/systemd-sysv-convert -- save tomcat > /dev/null 2>&1 || :
+# Run these becasue the SysV package being removed won't do them
+/sbin/chkconfig --del tomcat > /dev/null 2>&1 || :
+/bin/systemctl try-restart tomcat.service > /dev/null 2>&1 || :
+
%files
%defattr(0664,root,tomcat,0755)
%doc {LICENSE,NOTICE,RELEASE*}
%attr(0755,root,root) %{_bindir}/%{name}-digest
%attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper
-%attr(0755,root,root) %{_sbindir}/d%{name}
%attr(0755,root,root) %{_sbindir}/%{name}
-%attr(0755,root,root) %{_initrddir}/%{name}
-%attr(0644,root,root) %{_systemddir}/%{name}.service
+%attr(0644,root,root) %{_unitdir}/%{name}.service
+%attr(0755,root,root) %{_sbindir}/%{name}-sysd
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%attr(0755,root,tomcat) %dir %{basedir}
@@ -582,7 +609,17 @@ fi
%{appdir}/examples
%{appdir}/sample
+%files systemv
+%defattr(755,root,root,0755)
+%{_sbindir}/d%{name}
+%{_initrddir}/%{name}
+
%changelog
+* Fri Nov 11 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.22-2
+- Move tomcat-juli.jar to lib package
+- Drop %%update_maven_depmap as in tomcat6
+- Provide native systemd unit file ported from tomcat6
+
* Thu Oct 6 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.22-1
- Updated to 7.0.22
12 years, 6 months
[tomcat] Move tomcat-juli.jar to lib package
by Ivan Afonichev
commit 4b23f91d227c436208fa42df3f2222ed3fff12fb
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Thu Nov 10 22:44:19 2011 +0400
Move tomcat-juli.jar to lib package
tomcat.spec | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index 6601a0a..e568452 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -524,8 +524,6 @@ fi
%dir %{homedir}
%{bindir}/bootstrap.jar
%{bindir}/catalina-tasks.xml
-%{bindir}/tomcat-juli.jar
-%{libdir}/tomcat-juli.jar
%{homedir}/lib
%{homedir}/temp
%{homedir}/webapps
@@ -559,7 +557,7 @@ fi
%files lib
%defattr(-,root,root,-)
%{libdir}
-%exclude %{libdir}/tomcat-juli.jar
+%{bindir}/tomcat-juli.jar
%exclude %{libdir}/%{name}-el-%{elspec}-api.jar
%files servlet-%{servletspec}-api
12 years, 6 months
[maven-plugin-testing] Structuring mess cleanup (depmap fragments split, removing jar duplicities)
by Jaromír Cápík
commit d3db5bc0460f665f7424d7fc3e9aa4f78da8763f
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Thu Nov 10 13:25:50 2011 +0100
Structuring mess cleanup (depmap fragments split, removing jar duplicities)
maven-plugin-testing.spec | 44 ++++++++++++++++++++------------------------
1 files changed, 20 insertions(+), 24 deletions(-)
---
diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec
index 43c0990..38423a2 100644
--- a/maven-plugin-testing.spec
+++ b/maven-plugin-testing.spec
@@ -2,7 +2,7 @@
Name: maven-plugin-testing
Version: 2.0
-Release: 1.alpha1%{?dist}
+Release: 2.alpha1%{?dist}
Summary: Maven Plugin Testing
Group: Development/Libraries
@@ -55,7 +55,7 @@ Summary: Maven Plugin Testing Mechanism
Group: Development/Libraries
Requires: maven-plugin-testing = %{version}-%{release}
Obsoletes: maven-shared-plugin-testing-harness <= 0:1.2
-Provides: maven-shared-plugin-testing-harness = 1:%{version}-%{release}
+Provides: maven-shared-plugin-testing-harness = 1:%{version}-%{release}
%description harness
The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo.
@@ -110,22 +110,10 @@ install -pm 644 maven-test-tools/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
-#%%add_to_maven_depmap org.apache.maven.plugin-testing %{name} %{version} JPP/%{name} %{name}
-#%%add_to_maven_depmap org.apache.maven.shared %{name}-harness %{version} JPP/%{name} %{name}
-
-#%%add_to_maven_depmap org.apache.maven.plugin-testing %{name}-harness %{version} JPP/%{name} %{name}-harness
-#%%add_to_maven_depmap org.apache.maven.shared %{name}-harness %{version} JPP/%{name} %{name}-harness
-
-#%%add_to_maven_depmap org.apache.maven.plugin-testing %{name}-tools %{version} JPP/%{name} %{name}-tools
-#%%add_to_maven_depmap org.apache.maven.shared %{name}-tools %{version} JPP/%{name} %{name}-tools
-
-#%%add_to_maven_depmap org.apache.maven.plugin-testing maven-test-tools %{version} JPP/%{name} maven-test-tools
-#%%add_to_maven_depmap org.apache.maven.shared maven-test-tools %{version} JPP/%{name} maven-test-tools
-
-%add_maven_depmap -a "org.apache.maven.shared:%{name}-harness" JPP.%{name}-%{name}.pom
-%add_maven_depmap -a "org.apache.maven.shared:%{name}-harness" JPP.%{name}-%{name}-harness.pom %{name}/%{name}-harness.jar
-%add_maven_depmap -a "org.apache.maven.shared:%{name}-tools" JPP.%{name}-%{name}-tools.pom %{name}/%{name}-tools.jar
-%add_maven_depmap -a "org.apache.maven.shared:maven-test-tools" JPP.%{name}-maven-test-tools.pom %{name}/maven-test-tools.jar
+%add_maven_depmap -a "org.apache.maven.shared:%{name}" JPP.%{name}-%{name}.pom
+%add_maven_depmap -f harness -a "org.apache.maven.shared:%{name}-harness" JPP.%{name}-%{name}-harness.pom %{name}/%{name}-harness.jar
+%add_maven_depmap -f tools -a "org.apache.maven.shared:%{name}-tools" JPP.%{name}-%{name}-tools.pom %{name}/%{name}-tools.jar
+%add_maven_depmap -f maven-test-tools -a "org.apache.maven.shared:maven-test-tools" JPP.%{name}-maven-test-tools.pom %{name}/maven-test-tools.jar
%pre javadoc
# workaround for rpm bug, can be removed in F-17
@@ -133,23 +121,31 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
-%{_javadir}/%{name}
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/JPP.%{name}-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%files javadoc
%{_javadocdir}/*
%files harness
-%{_javadir}/%{name}/%{name}-harness*
+%{_javadir}/%{name}/%{name}-harness.jar
+%{_mavenpomdir}/JPP.%{name}-%{name}-harness.pom
+%{_mavendepmapfragdir}/%{name}-harness
%files tools
-%{_javadir}/%{name}/%{name}-tools*
+%{_javadir}/%{name}/%{name}-tools.jar
+%{_mavenpomdir}/JPP.%{name}-%{name}-tools.pom
+%{_mavendepmapfragdir}/%{name}-tools
%files -n maven-test-tools
-%{_javadir}/%{name}/maven-test-tools*
+%{_javadir}/%{name}/maven-test-tools.jar
+%{_mavenpomdir}/JPP.%{name}-maven-test-tools.pom
+%{_mavendepmapfragdir}/%{name}-maven-test-tools
%changelog
+* Thu Nov 10 2011 Jaromir Capik <jcapik(a)redhat.com> 2.0-2.alpha1
+- Structuring mess cleanup (depmap fragments split, removing jar duplicities)
+
* Wed Nov 09 2011 Jaromir Capik <jcapik(a)redhat.com> 2.0-1.alpha1
- Update to 2.0-alpha1
- Spec file changes according to the latest guidelines
12 years, 6 months
[maven-plugin-bundle] update to 2.3.5
by Jaromír Cápík
commit b482e02a0496ca865f9b106ff5c5b324aec9bdd3
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Thu Nov 10 12:23:33 2011 +0100
update to 2.3.5
.gitignore | 1 +
maven-bundle-plugin-exception-already-thrown.patch | 22 +++++++
maven-bundle-plugin-unbundling.patch | 15 +++++
maven-plugin-bundle.spec | 60 +++++++++++++-------
sources | 2 +-
5 files changed, 78 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 065e5ab..b3009a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-bundle-plugin-2.0.0-project.tar.gz
+/maven-bundle-plugin-2.3.5-source-release.tar.gz
diff --git a/maven-bundle-plugin-exception-already-thrown.patch b/maven-bundle-plugin-exception-already-thrown.patch
new file mode 100644
index 0000000..85fd62a
--- /dev/null
+++ b/maven-bundle-plugin-exception-already-thrown.patch
@@ -0,0 +1,22 @@
+diff -Naur maven-bundle-plugin-2.3.5.orig/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java maven-bundle-plugin-2.3.5/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
+--- maven-bundle-plugin-2.3.5.orig/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java 2011-07-05 13:56:06.000000000 +0200
++++ maven-bundle-plugin-2.3.5/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java 2011-10-26 13:11:10.904188217 +0200
+@@ -271,14 +271,14 @@
+ childProject.setDependencyArtifacts( childProject.createArtifacts( m_factory, null, null ) );
+ }
+ }
+- catch ( ProjectBuildingException e )
+- {
+- throw new MojoExecutionException( "Unable to build project object for artifact " + artifact, e );
+- }
+ catch ( InvalidDependencyVersionException e )
+ {
+ throw new MojoExecutionException( "Invalid dependency version for artifact " + artifact );
+ }
++ catch ( ProjectBuildingException e )
++ {
++ throw new MojoExecutionException( "Unable to build project object for artifact " + artifact, e );
++ }
+
+ childProject.setArtifact( artifact );
+ getLog().debug( "Child project artifact location: " + childProject.getArtifact().getFile() );
diff --git a/maven-bundle-plugin-unbundling.patch b/maven-bundle-plugin-unbundling.patch
new file mode 100644
index 0000000..2a36f58
--- /dev/null
+++ b/maven-bundle-plugin-unbundling.patch
@@ -0,0 +1,15 @@
+diff -Naur maven-bundle-plugin-2.3.5.orig/pom.xml maven-bundle-plugin-2.3.5/pom.xml
+--- maven-bundle-plugin-2.3.5.orig/pom.xml 2011-07-05 13:56:06.000000000 +0200
++++ maven-bundle-plugin-2.3.5/pom.xml 2011-10-25 17:29:47.237943990 +0200
+@@ -85,6 +85,11 @@
+ <version>1.2</version>
+ </dependency>
+ <dependency>
++ <groupId>org.apache.maven.shared</groupId>
++ <artifactId>maven-osgi</artifactId>
++ <version>0.3.0</version>
++ </dependency>
++ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>2.1</version>
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index 906b33a..e3bf9d5 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -1,13 +1,19 @@
+%global site_name maven-bundle-plugin
+
Name: maven-plugin-bundle
-Version: 2.0.0
-Release: 11%{?dist}
+Version: 2.3.5
+Release: 1%{?dist}
Summary: Maven Bundle Plugin
Group: Development/Tools
License: ASL 2.0
URL: http://felix.apache.org
-Source0: http://www.apache.org/dist/felix/maven-bundle-plugin-2.0.0-project.tar.gz
-BuildRequires: aqute-bnd >= 0.0.363
+Source0: http://apache.tradebit.com/pub/felix/%{site_name}-%{version}-source-relea...
+
+Patch0: %{site_name}-unbundling.patch
+Patch1: %{site_name}-exception-already-thrown.patch
+
+BuildRequires: aqute-bndlib >= 1.43.0
BuildRequires: plexus-utils >= 1.4.5
BuildRequires: felix-osgi-obr
BuildRequires: kxml
@@ -15,16 +21,19 @@ BuildRequires: maven
BuildRequires: maven-shared-dependency-tree >= 1.1-3
BuildRequires: maven-wagon >= 1.0-0.2.b2
BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-plugin-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin >= 2.3
BuildRequires: maven-surefire-provider-junit4 >= 2.3
BuildRequires: maven-doxia-sitetools
+BuildRequires: maven-shared-osgi
BuildRequires: felix-parent
-Requires: aqute-bnd >= 0.0.363
+BuildRequires: felix-bundlerepository
+
+Requires: aqute-bndlib >= 1.43.0
Requires: plexus-utils >= 1.4.5
Requires: felix-osgi-obr
Requires: kxml
@@ -32,9 +41,11 @@ Requires: maven
Requires: maven-archiver
Requires: maven-shared-dependency-tree
Requires: maven-wagon
+Requires: maven-shared-osgi
Requires: plexus-archiver
Requires: plexus-containers-container-default
Requires: felix-parent
+Requires: felix-bundlerepository
BuildArch: noarch
@@ -53,40 +64,47 @@ Requires: jpackage-utils
API documentation for %{name}.
%prep
-%setup -q -n maven-bundle-plugin-%{version}
+%setup -q -n %{site_name}-%{version}
-sed -i 's/<artifactId>bndlib/<artifactId>bnd/g' pom.xml
+%patch0 -p1
+%patch1 -p1
+
+# remove bundled stuff
+rm -rf src/main/java/org/apache/maven
+rm -rf src/main/java/org/apache/felix/obrplugin
%build
-mvn-rpmbuild install javadoc:javadoc
+# tests can't be built (seems like a MavenProjectStub incompatibility with MavenProject)
+mvn-rpmbuild install javadoc:aggregate -Dmaven.test.skip=true
%install
# jars
install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/maven-bundle-plugin-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-%add_to_maven_depmap org.apache.felix maven-bundle-plugin %{version} JPP %{name}
+install -m 644 target/maven-bundle-plugin-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
rm -rf target/site/api*
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%files javadoc
%{_javadocdir}/%{name}
%changelog
+* Mon Oct 24 2011 Jaromir Capik <jcapik(a)redhat.com> 2.3.5-1
+- Update to 2.3.5
+
* Tue Oct 17 2011 Jaromir Capik <jcapik(a)redhat.com> 2.0.0-11
- aqute-bndlib renamed to aqute-bnd
diff --git a/sources b/sources
index dfd42cf..fcc129f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de97b6f6b92b7ebef33000f4ed31ebb1 maven-bundle-plugin-2.0.0-project.tar.gz
+051b3096fa2a5ab98320b61b27cf38b3 maven-bundle-plugin-2.3.5-source-release.tar.gz
12 years, 6 months
[maven-plugin-testing] plexus-maven-plugin replaced with plexus-containers-component-metadata
by Jaromír Cápík
commit 8d633504ea222ebd894697b827533d6958112cd1
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Wed Nov 9 20:45:46 2011 +0100
plexus-maven-plugin replaced with plexus-containers-component-metadata
maven-plugin-testing.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec
index c774c71..43c0990 100644
--- a/maven-plugin-testing.spec
+++ b/maven-plugin-testing.spec
@@ -26,7 +26,7 @@ BuildRequires: maven-resources-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-source-plugin
BuildRequires: maven-site-plugin
-BuildRequires: plexus-maven-plugin
+BuildRequires: plexus-containers-component-metadata
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-surefire-plugin
12 years, 6 months