[plexus-ant-factory] Fix the changelog
by Stanislav Ochotnicky
commit 738bab93c4e4c79bcfeb8bbc3eccd5cbfd14abdf
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Dec 10 17:29:59 2012 +0100
Fix the changelog
plexus-ant-factory.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/plexus-ant-factory.spec b/plexus-ant-factory.spec
index 0384480..da2f0da 100644
--- a/plexus-ant-factory.spec
+++ b/plexus-ant-factory.spec
@@ -124,7 +124,7 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%changelog
-* Mon Dec 10 2012 Michal Srb <msrb(a)redhat.com> - 0:1.0-0.9.a2.1.4
+* Mon Dec 10 2012 Michal Srb <msrb(a)redhat.com> - 0:1.0-0.9.a2.1
- migrated to plexus-containers-container-default (#878580)
- using global is preferred over define when defining macros
- removed not used custom depmap file and its occurrence in spec file
11 years, 5 months
[plexus-ant-factory] migrated to plexus-containers-container-default (#878580)
by Stanislav Ochotnicky
commit e913e15ee8a0b583c0cbc70c29e5c66d194510ca
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Dec 10 15:09:28 2012 +0100
migrated to plexus-containers-container-default (#878580)
- using global is preferred over define when defining macros
- removed not used custom depmap file and its occurrence in spec file
- removed unused Ant buildfile
- fixed release number
Signed-off-by: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
plexus-ant-factory-build.xml | 76 ----------------------------------
plexus-ant-factory-jpp-depmap.xml | 81 -------------------------------------
plexus-ant-factory.spec | 22 ++++++----
3 files changed, 14 insertions(+), 165 deletions(-)
---
diff --git a/plexus-ant-factory.spec b/plexus-ant-factory.spec
index 3ac0d49..0384480 100644
--- a/plexus-ant-factory.spec
+++ b/plexus-ant-factory.spec
@@ -28,12 +28,12 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define parent plexus
-%define subname ant-factory
+%global parent plexus
+%global subname ant-factory
Name: %{parent}-%{subname}
Version: 1.0
-Release: 0.8.a2.1.4%{?dist}
+Release: 0.9.a2.1%{?dist}
Epoch: 0
Summary: Plexus Ant component factory
# Email from copyright holder confirms license.
@@ -44,8 +44,7 @@ URL: http://plexus.codehaus.org/
Source0: %{name}-src.tar.bz2
# svn export http://svn.codehaus.org/plexus/tags/plexus-ant-factory-1.0-alpha-2.1/ plexus-ant-factory/
# tar cjf plexus-ant-factory-src.tar.bz2 plexus-ant-factory/
-Source1: %{name}-jpp-depmap.xml
-Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
+Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildArch: noarch
@@ -63,12 +62,12 @@ BuildRequires: maven2-common-poms >= 1.0-2
BuildRequires: ant
BuildRequires: classworlds
-BuildRequires: plexus-container-default
+BuildRequires: plexus-containers-container-default
BuildRequires: plexus-utils
Requires: ant
Requires: classworlds
-Requires: plexus-container-default
+Requires: plexus-containers-container-default
Requires: plexus-utils
%description
@@ -84,7 +83,7 @@ Javadoc for %{name}.
%prep
%setup -q -n %{name}
-cp %{SOURCE2} LICENSE
+cp %{SOURCE1} LICENSE
%build
@@ -125,6 +124,13 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%changelog
+* Mon Dec 10 2012 Michal Srb <msrb(a)redhat.com> - 0:1.0-0.9.a2.1.4
+- migrated to plexus-containers-container-default (#878580)
+- using global is preferred over define when defining macros
+- removed not used custom depmap file and its occurrence in spec file
+- removed unused Ant buildfile
+- fixed release number
+
* Mon Nov 12 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.0-0.8.a2.1.4
- Add LICENSE-2.0.txt to sources
11 years, 5 months
[Bug 879380] New: maven-install-plugin: NOTICE file not installed with javadoc package
by Red Hat Bugzilla
Product: Fedora
https://bugzilla.redhat.com/show_bug.cgi?id=879380
Bug ID: 879380
Summary: maven-install-plugin: NOTICE file not installed with
javadoc package
Product: Fedora
Version: 18
Component: maven-install-plugin
Severity: unspecified
Priority: unspecified
Reporter: mizdebsk(a)redhat.com
Description of problem:
NOTICE file must be installed to comply with upstream licensing terms (point 4d
of ASL 2.0)
Version-Release number of selected component (if applicable):
2.3.1-6
Additional info:
see lixcensing guidelines
--
You are receiving this mail because:
You are on the CC list for the bug.
11 years, 5 months
Broken dependencies: maven-one-plugin
by Fedora Koji Build System
maven-one-plugin has broken dependencies in the rawhide tree:
On x86_64:
maven-one-plugin-1.2-9.fc18.noarch requires maven-shared-model-converter
On i386:
maven-one-plugin-1.2-9.fc18.noarch requires maven-shared-model-converter
Please resolve this as soon as possible.
11 years, 5 months
[maven-install-plugin] (3 commits) ...Merge branch 'master' into f18
by Stanislav Ochotnicky
Summary of changes:
96203a6... * Mon Dec 10 2012 Weinan Li <weli(a)redhat.com> 2.3.1-7 - Ins (*)
432d6be... remove patches for maven3 (*)
792b31e... Merge branch 'master' into f18
(*) This commit already existed in another branch; no separate mail sent
11 years, 5 months
[javapackages] Add support for pre- and post-goals in mvn-build script
by Mikolaj Izdebski
commit a14b5f5717ee00ac2b7d1650fb30f15c459e3c8e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Dec 10 13:52:52 2012 +0100
Add support for pre- and post-goals in mvn-build script
scripts/mvn-build | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/scripts/mvn-build b/scripts/mvn-build
index d71afa2..d1be9d2 100755
--- a/scripts/mvn-build
+++ b/scripts/mvn-build
@@ -60,6 +60,10 @@ Available options:
Use local depmap file.
-f, --force, --skip-tests
Skip test compilation and execution.
+ -g, --goal-before, --pre <GOAL>
+ Run Maven goal before default XMvn goals.
+ -G, --goal-after, --post <GOAL>
+ Run Maven goal after default XMvn goals.
-h, --help
Display this usage information and exit.
-i, --skip-install
@@ -85,6 +89,8 @@ install_goal=org.fedoraproject.xmvn:xmvn-mojo:install
javadoc_goal=org.apache.maven.plugins:maven-javadoc-plugin:aggregate
add_depmaps=
singleton=test
+pre_goals=
+post_goals=
if [ -n "$RPM_PACKAGE_NAME" ]; then
export XMVN_INSTALL_NAME="$RPM_PACKAGE_NAME"
@@ -114,6 +120,16 @@ while [ $# -gt 0 ]; do
base_goal=package
skip_tests=-Dmaven.test.skip=true
;;
+ -g|--goal-before|--pre)
+ need_arg "$@"
+ pre_goals="${pre_goals} $2"
+ shift
+ ;;
+ -G|--goal-after|--post)
+ need_arg "$@"
+ post_goals="${post_goals} $2"
+ shift
+ ;;
-h|--help)
usage
exit 0
@@ -159,7 +175,9 @@ xmvn \
--batch-mode \
$debug \
$skip_tests \
+ "${@}" \
+ $pre_goals \
$base_goal \
$install_goal \
$javadoc_goal \
- "${@}"
+ $post_goals
11 years, 5 months
[javapackages-tools] Update to upstream version 0.9.1
by Mikolaj Izdebski
commit 532db9637f6655c1adaf0744abe6bbbbf8fb4cb7
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Dec 10 11:25:35 2012 +0100
Update to upstream version 0.9.1
- Resolves: rhbz#885636
.gitignore | 1 +
javapackages-tools.spec | 6 +++++-
sources | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 60f867d..5dbebd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
/javapackages-0.8.2.tar.xz
/javapackages-0.8.3.tar.xz
/javapackages-0.9.0.tar.xz
+/javapackages-0.9.1.tar.xz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 5c68656..f698fbc 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,5 +1,5 @@
Name: javapackages-tools
-Version: 0.9.0
+Version: 0.9.1
Release: 1%{?dist}
Summary: Macros and scripts for Java packaging support
@@ -104,6 +104,10 @@ install -p -m 755 scripts/mvn-build $RPM_BUILD_ROOT%{_bindir}
%changelog
+* Mon Dec 10 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.9.1-1
+- Update to upstream version 0.9.1
+- Resolves: rhbz#885636
+
* Thu Dec 6 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.9.0-1
- Update to latest upstream version
- Enable maven requires generator for xmvn packages
diff --git a/sources b/sources
index 75e50f3..0608f24 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ee37ccdec3c43cb025a62dbbee7696a8 javapackages-0.9.0.tar.xz
+2c0c94e01aa3b74118a2ea6650a90a2c javapackages-0.9.1.tar.xz
11 years, 5 months