[javapackages] Refresh metadata
by Mikolaj Izdebski
commit 0745f28754815d568f1f94a7c983fa836e0e6744
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Oct 2 01:42:07 2013 +0200
Refresh metadata
metadata/metadata-org-apache-maven-plugins.xml | 5 +++++
metadata/metadata-org-codehaus-mojo.xml | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/metadata/metadata-org-apache-maven-plugins.xml b/metadata/metadata-org-apache-maven-plugins.xml
index 905faa5..659dec8 100644
--- a/metadata/metadata-org-apache-maven-plugins.xml
+++ b/metadata/metadata-org-apache-maven-plugins.xml
@@ -87,6 +87,11 @@
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
<plugin>
+ <name>Apache Maven Deploy Plugin</name>
+ <prefix>deploy</prefix>
+ <artifactId>maven-deploy-plugin</artifactId>
+ </plugin>
+ <plugin>
<name>Maven DOAP Plugin</name>
<prefix>doap</prefix>
<artifactId>maven-doap-plugin</artifactId>
diff --git a/metadata/metadata-org-codehaus-mojo.xml b/metadata/metadata-org-codehaus-mojo.xml
index ff7f403..c83a616 100644
--- a/metadata/metadata-org-codehaus-mojo.xml
+++ b/metadata/metadata-org-codehaus-mojo.xml
@@ -107,7 +107,7 @@
<artifactId>chronos-surefire-maven-plugin</artifactId>
</plugin>
<plugin>
- <name>Maven Clirr Plugin</name>
+ <name>Clirr Maven Plugin</name>
<prefix>clirr</prefix>
<artifactId>clirr-maven-plugin</artifactId>
</plugin>
10 years, 6 months
[javapackages] Revert "Modify installation of mvn_ scripts"
by Mikolaj Izdebski
commit d2dc92efff031a5fca9f82c32776591e7781df8e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Oct 2 01:15:32 2013 +0200
Revert "Modify installation of mvn_ scripts"
This reverts commit 027878e03db0dc1ae03a7c7313bce610b376e97a.
install | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/install b/install
index 6c870a7..611c5db 100755
--- a/install
+++ b/install
@@ -118,14 +118,6 @@ inst_config etc/font.properties "${javaconfdir}"
inst_config target/java.conf "${javaconfdir}"
inst_data target/java-functions "${javadir}-utils"
-inst_exec java-utils/builddep.py "${javadir}-utils"
-inst_exec java-utils/mvn_alias.py "${javadir}-utils"
-inst_exec java-utils/mvn_artifact.py "${javadir}-utils"
-inst_exec java-utils/mvn_build.py "${javadir}-utils"
-inst_exec java-utils/mvn_compat_version.py "${javadir}-utils"
-inst_exec java-utils/mvn_config.py "${javadir}-utils"
-inst_exec java-utils/mvn_file.py "${javadir}-utils"
-inst_exec java-utils/mvn_package.py "${javadir}-utils"
inst_data java-utils/maven_depmap.py "${javadir}-utils"
inst_data java-utils/pom_editor.sh "${javadir}-utils"
@@ -170,11 +162,20 @@ dir "${m2home}"
inst_data etc/macros.xmvn "${sysconfdir}/rpm"
+inst_data java-utils/builddep.py "${javadir}-utils"
+inst_data java-utils/mvn_alias.py "${javadir}-utils"
+inst_data java-utils/mvn_artifact.py "${javadir}-utils"
+inst_data java-utils/mvn_build.py "${javadir}-utils"
+inst_data java-utils/mvn_compat_version.py "${javadir}-utils"
+inst_data java-utils/mvn_config.py "${javadir}-utils"
+inst_data java-utils/mvn_file.py "${javadir}-utils"
+inst_data java-utils/mvn_package.py "${javadir}-utils"
+
inst_data target/mvn_alias.7 "${mandir}/man7"
inst_data target/mvn_artifact.7 "${mandir}/man7"
inst_data target/mvn_build.7 "${mandir}/man7"
-inst_data target/mvn_config.7 "${mandir}/man7"
inst_data target/mvn_compat_version.7 "${mandir}/man7"
+inst_data target/mvn_config.7 "${mandir}/man7"
inst_data target/mvn_file.7 "${mandir}/man7"
inst_data target/mvn_install.7 "${mandir}/man7"
inst_data target/mvn_package.7 "${mandir}/man7"
10 years, 6 months
[javapackages] Update manpage for mvn_config
by Mikolaj Izdebski
commit d5b506226eee14f21340c16627951defeb1353c8
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Oct 2 00:53:02 2013 +0200
Update manpage for mvn_config
man/mvn_config.txt | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/man/mvn_config.txt b/man/mvn_config.txt
index ca31380..e9b21dd 100644
--- a/man/mvn_config.txt
+++ b/man/mvn_config.txt
@@ -22,10 +22,13 @@ OPERANDS
*key*::
Configuration option key (unique name). This is XPath-like
address of XML configuration node - list of XML nodes delimited by
- /. For list of available keys see XMvn Configuration Reference.
+ '/'. If unknown key is given, behavior is unspecified. For list
+ of available keys see XMvn Configuration Reference.
*value*::
- XML content to be added to specified node. Can be just text, XML node or multiple nodes.
+ Value of specified option. Must be either plain text or XML
+ content. If value format is inappropriate for particular option,
+ behavior is unspecified.
AUTHOR
------
10 years, 6 months
[javapackages] Rewrite manpage for mvn_artifact
by Mikolaj Izdebski
commit d813aa66719f447d9c828b1369146e22e9ccb600
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Oct 2 00:29:38 2013 +0200
Rewrite manpage for mvn_artifact
build | 1 +
install | 1 +
man/mvn_artifact.txt | 49 ++++++++++++++++++++++++++-----------------------
3 files changed, 28 insertions(+), 23 deletions(-)
---
diff --git a/build b/build
index 5f3c896..d2713fb 100755
--- a/build
+++ b/build
@@ -85,6 +85,7 @@ expand java-utils/java-functions
manpage abs2rel
manpage find-jar
manpage mvn_alias
+manpage mvn_artifact
manpage mvn_build
manpage mvn_config
manpage mvn_compat_version
diff --git a/install b/install
index 61e4e44..6c870a7 100755
--- a/install
+++ b/install
@@ -171,6 +171,7 @@ dir "${m2home}"
inst_data etc/macros.xmvn "${sysconfdir}/rpm"
inst_data target/mvn_alias.7 "${mandir}/man7"
+inst_data target/mvn_artifact.7 "${mandir}/man7"
inst_data target/mvn_build.7 "${mandir}/man7"
inst_data target/mvn_config.7 "${mandir}/man7"
inst_data target/mvn_compat_version.7 "${mandir}/man7"
diff --git a/man/mvn_artifact.txt b/man/mvn_artifact.txt
index fb959c0..f7be103 100644
--- a/man/mvn_artifact.txt
+++ b/man/mvn_artifact.txt
@@ -1,51 +1,54 @@
mvn_artifact(7)
-==============
+===============
:doctype: manpage
:man source: JAVAPACKAGES
:man manual: Java Packages Tools
NAME
----
-mvn_artifact - create configuration for installing Maven artifact
+mvn_artifact - request installation of Maven artifact
SYNOPSIS
--------
-*%mvn_package* artifact-coordinates|POM-path [JAR-path]
+*%mvn_artifact* model [artifact-file]
+*%mvn_artifact* artifact-coordinates artifact-file
DESCRIPTION
-----------
-*mvn_artifact* macro generates configuration for installing specified
-Maven artifact. Resulting configuration is later used by *mvn_install*
-which performs actual installation of Maven artifacts.
+*mvn_artifact* macro marks specified Maven artifact to be installed by
+further call to *mvn_install*. Multiple calls to *mvn_artifact*
+and/or *mvn_build* can be made to request installation of multiple
+artifacts.
OPERANDS
--------
-*artifact-coordinates*::
- Artifact coordinates specify Maven artifact and are in following
- format *groupId:artifactId[:extension[:classifier]][:version]*.
- JAR-path is mandatory and must be specified together with
- artifact-coordinates.
+*model*::
+ Path to raw project object model (POM) file to be associated and
+ installed with artifact.
-*POM path*::
- Path where POM file is located.
+*artifact-file*::
+ Path to file to be used as artifact file. If omitted then no
+ artifact file is installed.
-*JAR path*::
- Path where JAR file is located.
+*artifact-coordinates*::
+ Artifact coordinates specify artifact to be installed. If
+ specified then no model file is installed with artifact.
+ Coordinates are in format
+ *groupId:artifactId[:extension[:classifier]]:version*. If version
+ is omitted then "jar" is used. If classifier is omitted then
+ empty classifier is used. For more information see XMvn
+ Configuration Reference.
AUTHOR
------
- Written by Michal Srb.
+Written by Michal Srb.
REPORTING BUGS
--------------
-Bugs should be reported through Red Hat Bugzilla at http://bugzilla.redhat.com/.
+Bugs should be reported through Red Hat Bugzilla at
+http://bugzilla.redhat.com/.
SEE ALSO
--------
-*mvn_install*(7),
-*mvn_alias*(7),
*mvn_build*(7),
-*mvn_compat_version*(7),
-*mvn_config*(7),
-*mvn_file*(7),
-*xmvn*(1).
+*mvn_install*(7).
10 years, 6 months
[jspc] - convert to mvn_build macro for rawhide (#1013615) - add antlr3-tool BR - pom duplication fix by re
by Peter MacKinnon
commit 612b3a997f37a6702caa701062116bc2172d2e7f
Author: Peter MacKinnon <pmackinn(a)redhat.com>
Date: Tue Oct 1 13:41:51 2013 -0400
- convert to mvn_build macro for rawhide (#1013615)
- add antlr3-tool BR
- pom duplication fix by removing subpackaging (#1013603)
jspc.spec | 55 +++++++++----------------------------------------------
1 files changed, 9 insertions(+), 46 deletions(-)
---
diff --git a/jspc.spec b/jspc.spec
index 1629435..66f1134 100644
--- a/jspc.spec
+++ b/jspc.spec
@@ -4,7 +4,7 @@
Name: jspc
Version: 2.0
-Release: 0.7%{dotreltag}%{?dist}
+Release: 0.8%{dotreltag}%{?dist}
Summary: Compile JSPs under Maven
Group: Development/Libraries
License: ASL 2.0
@@ -20,6 +20,7 @@ BuildRequires: maven-local
BuildRequires: apache-resource-bundles
BuildRequires: ant
+BuildRequires: antlr3-tool
BuildRequires: fusesource-pom
BuildRequires: mvn(commons-lang:commons-lang)
BuildRequires: mvn(org.apache.maven.shared:file-management)
@@ -47,33 +48,6 @@ your WAR file. Version 2 of the JSP compilation support includes a
pluggable JSP compiler implementation, which currently allows different
versions of the Tomcat Jasper compiler to be used as needed.
-%package compilers
-Group: Development/Libraries
-Summary: JSPC Compilers
-Requires: %{name} = %{version}-%{release}
-
-%description compilers
-%{summary}.
-
-%package compiler-tomcat6
-Group: Development/Libraries
-Summary: JSPC Compiler for Tomcat6
-Requires: tomcat
-Requires: %{name}-compilers = %{version}-%{release}
-
-%description compiler-tomcat6
-%{summary}.
-
-%package -n jspc-maven-plugin
-Group: Development/Libraries
-Summary: JSPC Maven Plugin
-Requires: %{name}-compiler-tomcat6 = %{version}-%{release}
-Requires: mvn(commons-lang:commons-lang)
-Requires: mvn(org.apache.maven.shared:file-management)
-
-%description -n jspc-maven-plugin
-%{summary}.
-
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
@@ -155,15 +129,14 @@ sed -i 's|<artifactId>jasper-jdt</artifactId>|<artifactId>tomcat-jasper-jdt</art
# get rid of gmaven...
%pom_remove_dep org.codehaus.groovy.maven:gmaven-mojo pom.xml
%pom_remove_plugin org.codehaus.groovy.maven:gmaven-plugin pom.xml
-%pom_add_dep org.apache.ant:ant jspc-compilers/jspc-compiler-tomcat6/pom.xml
+%pom_add_dep org.apache.ant:ant jspc-compilers/jspc-compiler-tomcat6/pom.xml
#...replace with ant groovyc task
# have to patch due to some $ substitution problems
%patch0 -p2
%build
-
-mvn-build
+%mvn_build
# http://jira.codehaus.org/browse/GMAVEN-68
# gmaven-runtime 1.8 doesn't generate plugin descriptor
@@ -205,24 +178,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%{_javadir}/%{name}/%{name}-compiler-api.jar
%{_mavenpomdir}/JPP.%{name}-%{name}.pom
%{_mavenpomdir}/JPP.%{name}-%{name}-compiler-api.pom
-%{_mavendepmapfragdir}/%{name}
-%doc LICENSE.txt
-
-%files compilers
-%dir %{_javadir}/%{name}
%{_mavenpomdir}/JPP.%{name}-%{name}-compilers.pom
-%{_mavendepmapfragdir}/%{name}
-%doc LICENSE.txt
-
-%files compiler-tomcat6
-%dir %{_javadir}/%{name}
%{_javadir}/%{name}/%{name}-compiler-tomcat6.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-compiler-tomcat6.pom
-%{_mavendepmapfragdir}/%{name}
-%doc LICENSE.txt
-
-%files maven-plugin
-%dir %{_javadir}/%{name}
%{_javadir}/%{name}/%{name}-maven-plugin.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-maven-plugin.pom
%{_mavendepmapfragdir}/%{name}
@@ -233,6 +191,11 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc LICENSE.txt
%changelog
+* Mon Sep 30 2013 Peter MacKinnon <pmackinn(a)redhat.com> 2.0-0.8.alpha.3
+- convert to mvn_build macro for rawhide (#1013615)
+- add antlr3-tool BR
+- pom duplication fix by removing subpackaging (#1013603)
+
* Wed Aug 07 2013 Peter MacKinnon <pmackinn(a)redhat.com> 2.0-0.7.alpha.3
- Replaced gmaven with ant+groovyc
- plexus-containers-container-default update
10 years, 6 months
[Bug 912333] New: mvn-rpmbuild if F19 does not export M2_HOME
by Red Hat Bugzilla
Product: Fedora
https://bugzilla.redhat.com/show_bug.cgi?id=912333
Bug ID: 912333
Summary: mvn-rpmbuild if F19 does not export M2_HOME
Product: Fedora
Version: rawhide
Component: javapackages-tools
Severity: unspecified
Priority: unspecified
Reporter: mattias.ellert(a)fysast.uu.se
Description of problem:
mvn-rpmbuild on Fedora 19 does not export M2_HOME
Version-Release number of selected component (if applicable):
javapackages-tools.noarch 0:0.12.0-1.fc19
How reproducible:
Packages in the f19 rebuild failed due to M2_HOME not set. See e.g.
https://koji.fedoraproject.org/koji/taskinfo?taskID=4996219
Error message is:
"Maven application directory was not specified, and ${maven.home} is not
provided in the system properties. Please specify at least on of these."
The code generating this error message is:
if ( ( mavenHome == null ) && ( System.getProperty( "maven.home" ) == null ) )
{
if ( !getSystemEnvVars().containsKey( "M2_HOME" ) )
{
throw new IllegalStateException( "Maven application directory was
+ "specified, and ${maven.home} is not provided in the system "
+ "properties. Please specify at least on of these." );
}
}
I.e. if M2_HOME is set (like in mvn-rpmbuild for Fedora 18 and earlier) the
exception is not thrown.
Actual results:
Failed builds due to M2_HOME not set
Expected results:
Working build
Additional info:
mvn-rpmbuild on Fedora 17 contains the line
export M2_HOME=/usr/share/maven
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=U9jVwfslmC&a=cc_unsubscribe
10 years, 6 months