[Bug 660834] New: FTBFS maven-scm-1.4-2.fc15
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: FTBFS maven-scm-1.4-2.fc15
https://bugzilla.redhat.com/show_bug.cgi?id=660834
Summary: FTBFS maven-scm-1.4-2.fc15
Product: Fedora
Version: rawhide
Platform: All
URL: http://linux.dell.com/files/fedora/FixBuildRequires/mo
ck-results/
OS/Version: Linux
Status: NEW
Keywords: Triaged
Severity: high
Priority: high
Component: maven-scm
AssignedTo: guido.grazioli(a)gmail.com
ReportedBy: ftbfs(a)fedoraproject.org
QAContact: extras-qa(a)fedoraproject.org
CC: akurtako(a)redhat.com, guido.grazioli(a)gmail.com,
sochotni(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Blocks: 659965
Classification: Fedora
maven-scm-1.4-2.fc15.src.rpm Failed To Build From Source against the rawhide
tree. See http://fedoraproject.org/wiki/FTBFS for more information.
If you believe this is actually a bug in another package, do NOT change the
component in this bug or close this bug. Instead, add the appropriate bug
number from the other package to the "Depends on" line in this bug. If the
other package does not yet have a bug created that you think matches, please
create one. Doing so helps us properly track bugs and their dependencies, just
as we track package dependencies. (If you close this bug, and the other
package is not fixed before the next FTBFS run, a new bug will get created.
Please follow the above advice to avoid such duplication.)
--
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, 11 months
[Bug 660742] New: FTBFS maven-timestamp-plugin-1.0-3.fc14
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: FTBFS maven-timestamp-plugin-1.0-3.fc14
https://bugzilla.redhat.com/show_bug.cgi?id=660742
Summary: FTBFS maven-timestamp-plugin-1.0-3.fc14
Product: Fedora
Version: rawhide
Platform: All
URL: http://linux.dell.com/files/fedora/FixBuildRequires/mo
ck-results/
OS/Version: Linux
Status: NEW
Keywords: Triaged
Severity: high
Priority: high
Component: maven-timestamp-plugin
AssignedTo: guido.grazioli(a)gmail.com
ReportedBy: ftbfs(a)fedoraproject.org
QAContact: extras-qa(a)fedoraproject.org
CC: guido.grazioli(a)gmail.com,
java-sig-commits(a)lists.fedoraproject.org
Blocks: 659965
Classification: Fedora
maven-timestamp-plugin-1.0-3.fc14.src.rpm Failed To Build From Source against
the rawhide tree. See http://fedoraproject.org/wiki/FTBFS for more
information.
If you believe this is actually a bug in another package, do NOT change the
component in this bug or close this bug. Instead, add the appropriate bug
number from the other package to the "Depends on" line in this bug. If the
other package does not yet have a bug created that you think matches, please
create one. Doing so helps us properly track bugs and their dependencies, just
as we track package dependencies. (If you close this bug, and the other
package is not fixed before the next FTBFS run, a new bug will get created.
Please follow the above advice to avoid such duplication.)
--
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, 11 months
[Bug 711861] New: Packaged jar missing OSGi missing data
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: Packaged jar missing OSGi missing data
https://bugzilla.redhat.com/show_bug.cgi?id=711861
Summary: Packaged jar missing OSGi missing data
Product: Fedora
Version: rawhide
Platform: All
OS/Version: All
Status: NEW
Severity: medium
Priority: unspecified
Component: args4j
AssignedTo: jcapik(a)redhat.com
ReportedBy: abhatnag(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
jcapik(a)redhat.com
Classification: Fedora
Story Points: ---
Description of problem:
The manifest of the rpm located at
http://kojipkgs.fedoraproject.org/packages/args4j/2.0.16/3.fc16/noarch/ar...
does not contain any OSGi metadata.
Version-Release number of selected component (if applicable):
How reproducible:
Steps to Reproduce:
1. Download
http://kojipkgs.fedoraproject.org/packages/args4j/2.0.16/3.fc16/noarch/ar...
2. Install rpm
3. locate rpm: rpm -ql args4j | grep jar
4. unpackage jar: jar xf /usr/share/java/args4j.jar
5. look into manifest: cat META-INF/MANIFEST.MF
Actual results:
Manifest-Version: 1.0
Archiver-Version: Plexus Archiver
Created-By: Apache Maven
Built-By: mockbuild
Build-Jdk: 1.6.0_22
Expected results:
OSGi metadata
Additional info:
--
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, 11 months
[Bug 710448] New: Add help output to mvn-rpmbuild and mvn-local
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: Add help output to mvn-rpmbuild and mvn-local
https://bugzilla.redhat.com/show_bug.cgi?id=710448
Summary: Add help output to mvn-rpmbuild and mvn-local
Product: Fedora
Version: rawhide
Platform: Unspecified
OS/Version: Unspecified
Status: NEW
Severity: unspecified
Priority: unspecified
Component: maven
AssignedTo: sochotni(a)redhat.com
ReportedBy: akurtako(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: akurtako(a)redhat.com, sochotni(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Story Points: ---
It would be really helpful if mvn-rpmbuild and mvn-local contain some kind of
help output extending the current one coming from mvn and explaining different
environmental variables set e.g. maven.local.depmap.file and etc.
--
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, 11 months
[args4j] OSGi metadata generated
by Jaromír Cápík
commit 3a48ab23df90acddfda19cce9dd81105613a80a3
Author: Jaromír Cápík <jcapik(a)redhat.com>
Date: Mon Jun 13 19:02:37 2011 +0200
OSGi metadata generated
args4j-osgi.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
args4j.spec | 7 ++++++-
2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/args4j-osgi.patch b/args4j-osgi.patch
new file mode 100644
index 0000000..cc39382
--- /dev/null
+++ b/args4j-osgi.patch
@@ -0,0 +1,50 @@
+diff -Naur args4j-2.0.16.orig/args4j/pom.xml args4j-2.0.16/args4j/pom.xml
+--- args4j-2.0.16.orig/args4j/pom.xml 2009-09-04 02:27:09.000000000 +0200
++++ args4j-2.0.16/args4j/pom.xml 2011-06-13 18:51:15.000000000 +0200
+@@ -8,7 +8,8 @@
+ </parent>
+ <artifactId>args4j</artifactId>
+ <name>args4j</name>
+-
++ <packaging>bundle</packaging>
++
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>test</testSourceDirectory>
+@@ -29,6 +30,13 @@
+ </includes>
+ </testResource>
+ </testResources>
++ <plugins>
++ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <extensions>true</extensions>
++ </plugin>
++ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+diff -Naur args4j-2.0.16.orig/args4j-tools/pom.xml args4j-2.0.16/args4j-tools/pom.xml
+--- args4j-2.0.16.orig/args4j-tools/pom.xml 2011-06-13 18:53:04.000000000 +0200
++++ args4j-2.0.16/args4j-tools/pom.xml 2011-06-13 18:52:27.000000000 +0200
+@@ -10,6 +10,7 @@
+ <artifactId>args4j-tools</artifactId>
+ <name>args4j-tools</name>
+ <description>development-time tool for generating additional artifacits</description>
++ <packaging>bundle</packaging>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+@@ -35,6 +36,11 @@
+ </archive>
+ </configuration>
+ </plugin>
++ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <extensions>true</extensions>
++ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
diff --git a/args4j.spec b/args4j.spec
index 9cd0217..33073d4 100644
--- a/args4j.spec
+++ b/args4j.spec
@@ -6,7 +6,7 @@ Name: args4j
%global site_name %{name}-site
Version: 2.0.16
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Small Java lib that makes it easy to parse command line options/args in CUI apps
License: MIT and BSD
Group: Development/Libraries
@@ -19,6 +19,7 @@ Source0: %{name}-%{version}.tar.xz
Patch0: %{name}-wagon-svn-removal.patch
Patch1: %{name}-ant-removal.patch
+Patch2: %{name}-osgi.patch
BuildArch: noarch
@@ -57,6 +58,7 @@ This package contains the API documentation for %{name}.
%patch0 -p1
%patch1 -p1
+%patch2 -p1
# removing classpath addition
sed -i 's/<addClasspath>true/<addClasspath>false/g' %{tools_name}/pom.xml
@@ -109,6 +111,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Mon Jun 13 2011 Jaromir Capik <jcapik(a)redhat.com> - 2.0.16-4
+- OSGi metadata generated
+
* Mon May 30 2011 Jaromir Capik <jcapik(a)redhat.com> - 2.0.16-3
- Removal of bundled stuff in args4j/lib
12 years, 11 months
[plexus-mail-sender] Add javax.mail:javamail depmap.
by Alexander Kurtakov
commit c06be23a35e6d3536332375ac375ad10394db012
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Sun Jun 12 15:19:45 2011 +0300
Add javax.mail:javamail depmap.
plexus-mail-sender-jpp-depmap.xml | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/plexus-mail-sender-jpp-depmap.xml b/plexus-mail-sender-jpp-depmap.xml
index 389d404..dd80578 100644
--- a/plexus-mail-sender-jpp-depmap.xml
+++ b/plexus-mail-sender-jpp-depmap.xml
@@ -6,4 +6,15 @@
<version>1.0.2</version>
</maven>
</dependency>
+ <dependency>
+ <maven>
+ <groupId>javax.mail</groupId>
+ <artifactId>javamail</artifactId>
+ <version>1.4.3</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/javamail</groupId>
+ <artifactId>mail</artifactId>
+ </jpp>
+</dependency>
</dependencies>
12 years, 11 months
[plexus-naming] Build with maven 3.x
by Alexander Kurtakov
commit a850db3ae55d157423a2a8ea97effc102f9cac56
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Sun Jun 12 15:15:51 2011 +0300
Build with maven 3.x
plexus-naming-1.0-jpp-depmap.xml | 170 ++------------------------------------
1 files changed, 6 insertions(+), 164 deletions(-)
---
diff --git a/plexus-naming-1.0-jpp-depmap.xml b/plexus-naming-1.0-jpp-depmap.xml
index 1bd8df1..80c053d 100644
--- a/plexus-naming-1.0-jpp-depmap.xml
+++ b/plexus-naming-1.0-jpp-depmap.xml
@@ -1,172 +1,14 @@
<dependencies>
<dependency>
- <maven>
- <groupId>directory-naming</groupId>
- <artifactId>naming-java</artifactId>
- <version>0.8</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>directory-naming-java</artifactId>
- <version>0.8</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>directory-naming</groupId>
- <artifactId>naming-config</artifactId>
- <version>0.8</version>
- </maven>
- <jpp>
- <groupId>JPP/directory-naming</groupId>
- <artifactId>naming-config</artifactId>
- <version>0.8</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>directory-naming</groupId>
- <artifactId>naming-factory</artifactId>
- <version>0.8</version>
- </maven>
- <jpp>
- <groupId>JPP/directory-naming</groupId>
- <artifactId>naming-factory</artifactId>
- <version>0.8</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>directory-naming</groupId>
- <artifactId>naming-core</artifactId>
- <version>0.8</version>
- </maven>
- <jpp>
- <groupId>JPP/directory-naming</groupId>
- <artifactId>naming-core</artifactId>
- <version>0.8</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>directory-naming</groupId>
- <artifactId>naming-java</artifactId>
- <version>0.8</version>
- </maven>
- <jpp>
- <groupId>JPP/directory-naming</groupId>
- <artifactId>naming-java</artifactId>
- <version>0.8</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.2</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.2</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.4.1</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.7</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.7.1</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.7.1</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-javamail</artifactId>
- <version>1.3.1-rc1</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>geronimo-javamail-1.3.1-api</artifactId>
- <version>1.3.1</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
+ <maven>
<groupId>javax.mail</groupId>
<artifactId>javamail</artifactId>
- <version>1.3.1-rc1</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>javamail</artifactId>
- <version>1.3.1</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.3.1-rc1</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>jaf</artifactId>
- <version>1.3.1</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-impl</artifactId>
- <version>2.0.4</version>
+ <version>1.4.3</version>
</maven>
<jpp>
- <groupId>JPP/maven-shared</groupId>
- <artifactId>reporting-impl</artifactId>
- <version>2.0.4</version>
+ <groupId>JPP/javamail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.3</version>
</jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.0-alpha-3</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>jakarta-commons-dbcp</artifactId>
- <version>1.2.3</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- <version>4.1.3</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>avalon-framework</artifactId>
- <version>4.3.1</version>
- </jpp>
- </dependency>
-
-
+</dependency>
</dependencies>
12 years, 11 months
[plexus-naming] Build with maven 3.x
by Alexander Kurtakov
commit f3f84a73f026c4982fb436d0ad7686aecc626a72
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Sun Jun 12 15:15:42 2011 +0300
Build with maven 3.x
plexus-naming-1.0-build.xml | 164 ------------------------------------------
plexus-naming-1.0-pom.patch | 15 ----
plexus-naming-components.xml | 13 ----
plexus-naming.spec | 108 ++++++++--------------------
4 files changed, 30 insertions(+), 270 deletions(-)
---
diff --git a/plexus-naming.spec b/plexus-naming.spec
index 9548374..4641c2f 100644
--- a/plexus-naming.spec
+++ b/plexus-naming.spec
@@ -28,16 +28,14 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define with_maven 0
+%global namedversion 1.0-alpha-3
-%define namedversion 1.0-alpha-3
-
-%define parent plexus
-%define subname naming
+%global parent plexus
+%global subname naming
Name: plexus-naming
Version: 1.0
-Release: 0.6.a3%{?dist}
+Release: 0.7.a3%{?dist}
Epoch: 0
Summary: Plexus Naming Component
License: ASL 2.0
@@ -48,60 +46,51 @@ URL: http://plexus.codehaus.org/
# http://svn.codehaus.org/plexus/plexus-components/tags/plexus-naming-1.0-a...
# tar czf plexus-naming-1.0-alpha-3-src.tar.gz plexus-naming-1.0-alpha-3
Source0: %{name}-%{namedversion}-src.tar.gz
-Source1: plexus-naming-1.0-build.xml
Source3: plexus-naming-1.0-jpp-depmap.xml
-Source4: plexus-naming-components.xml
-Patch0: plexus-naming-1.0-pom.patch
# Some license headers were missing from the .java files. They have
# been added in SVN trunk and we've back-ported that fix.
# http://jira.codehaus.org/browse/PLXCOMP-144
# http://jira.codehaus.org/secure/attachment/44043/plexus-naming-addlicense...
Patch1: %{name}-addlicenseheaders.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.3
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant >= 0:1.6.5
BuildRequires: junit
BuildRequires: hsqldb
-BuildRequires: jakarta-commons-logging
-%if %{with_maven}
-BuildRequires: maven2
-BuildRequires: maven2-common-poms
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-release
-BuildRequires: maven2-plugin-surefire = 2.3
-BuildRequires: maven-surefire-provider-junit = 2.3
+BuildRequires: apache-commons-logging
+BuildRequires: maven
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-release-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-provider-junit
BuildRequires: plexus-maven-plugin >= 1.3.5
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
BuildRequires: plexus-maven-plugin >= 1.3.5
BuildRequires: qdox >= 1.5
-BuildRequires: tomcat5
-BuildRequires: tomcat5-servlet-2.4-api
+BuildRequires: servlet25
BuildRequires: avalon-logkit
BuildRequires: avalon-framework
-%endif
BuildRequires: directory-naming
BuildRequires: avalon-framework
-BuildRequires: jakarta-commons-collections
-BuildRequires: jakarta-commons-dbcp
-BuildRequires: jakarta-commons-digester
-BuildRequires: jakarta-commons-pool
+BuildRequires: apache-commons-collections
+BuildRequires: apache-commons-dbcp
+BuildRequires: apache-commons-digester
+BuildRequires: apache-commons-pool
BuildRequires: plexus-cdc
BuildRequires: plexus-classworlds
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-utils >= 1.4.5
Requires: directory-naming
-Requires: jakarta-commons-pool
+Requires: apache-commons-pool
Requires: plexus-classworlds
Requires: plexus-container-default
Requires: plexus-utils >= 1.4.5
@@ -122,70 +111,34 @@ is like a J2EE application server, without all the baggage.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
+Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
%prep
%setup -q -n %{name}-%{namedversion}
-cp %{SOURCE1} build.xml
-mkdir -p target/classes/META-INF/plexus/
-cp %{SOURCE4} target/classes/META-INF/plexus/components.xml
-%patch0 -b .sav0
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-%if %{with_maven}
- mvn-jpp \
- -Dmaven.test.failure.ignore=true \
- -Dmaven2.jpp.depmap.file=%{SOURCE3} \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ mvn-rpmbuild \
+ -Dmaven.local.depmap.file=%{SOURCE3} \
install javadoc:javadoc
-%else
-export CLASSPATH=$(build-classpath \
-commons-collections \
-commons-logging \
-commons-dbcp \
-commons-pool \
-directory-naming/naming-config \
-directory-naming/naming-core \
-directory-naming/naming-factory \
-directory-naming/naming-java \
-hsqldb \
-plexus/classworlds \
-plexus/containers-container-default \
-plexus/utils \
-)
-CLASSPATH=$CLASSPATH:target/classes:target/test-classes
-ant -Dbuild.sysclasspath=only jar javadoc
-%endif
-
%install
-rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/%{name}-%{namedversion}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}.jar
%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
-(cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; do \
- ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
# poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-ln -s %{name} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
@@ -194,17 +147,17 @@ rm -rf $RPM_BUILD_ROOT
%update_maven_depmap
%files
-%defattr(-,root,root,-)
%{_javadir}/%{parent}/*
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
%{_mavendepmapfragdir}
%files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%changelog
+* Sun Jun 12 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.0-0.7.a3
+- Build with maven 3.x
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.0-0.6.a3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -233,4 +186,3 @@ rm -rf $RPM_BUILD_ROOT
* Fri Nov 30 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a3.1jpp
- First JPP release
-
12 years, 11 months
[plexus-mail-sender] Build with maven 3.x
by Alexander Kurtakov
commit 50502027e05e2bd67dc30fa569af17e179723dd2
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Sun Jun 12 15:07:38 2011 +0300
Build with maven 3.x
maven2-settings.xml | 36 -----
plexus-mail-sender-mapdeps.xsl | 328 ----------------------------------------
plexus-mail-sender.spec | 24 +--
3 files changed, 9 insertions(+), 379 deletions(-)
---
diff --git a/plexus-mail-sender.spec b/plexus-mail-sender.spec
index b087c1c..004a22d 100644
--- a/plexus-mail-sender.spec
+++ b/plexus-mail-sender.spec
@@ -32,7 +32,7 @@
Name: plexus-mail-sender
Version: 1.0
-Release: 0.a2.18%{?dist}.1
+Release: 0.a2.19%{?dist}
Epoch: 0
Summary: Plexus Mail Sender
License: MIT and ASL 1.1
@@ -44,16 +44,14 @@ URL: http://plexus.codehaus.org/
# tar czf plexus-mail-sender-1.0-a2-src.tar.gz plexus-mail-sender-1.0-a2
Source0: plexus-mail-sender-%{version}-a2-src.tar.gz
-Source1: %{name}-mapdeps.xsl
Source2: %{name}-jpp-depmap.xml
-Source3: maven2-settings.xml
# http://jira.codehaus.org/browse/PLX-417
# http://fisheye.codehaus.org/rdiff/plexus?csid=8336&u&N
Patch0: %{name}-clarifylicense.patch
BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: maven2 >= 0:2.0.4
+BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
@@ -102,13 +100,8 @@ find . -name release-pom.xml -exec \
sed -i 's:<groupId>plexus</groupId>:<groupId>org.codehaus.plexus</groupId>:' \{\} \;
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
- -e \
- -Dmaven2.jpp.depmap.file="%{SOURCE2}" \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
+ -Dmaven.local.depmap.file="%{SOURCE2}" \
-Dmaven.test.skip=true \
install javadoc:aggregate
@@ -119,7 +112,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
pushd plexus-mail-senders
for mod in javamail simple test;do
pushd %{name}-$mod
- install -pm 644 target/%{name}-$mod-%{namedversion}-SNAPSHOT.jar \
+ install -pm 644 target/%{name}-$mod-%{namedversion}.jar \
$RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-$mod.jar
install -pm 644 release-pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.plexus-mail-sender-$mod.pom
%add_to_maven_depmap org.codehaus.plexus %{name}-$mod %{version} JPP/plexus mail-sender-$mod
@@ -129,7 +122,7 @@ done
popd
install -pm 644 \
- %{name}-api/target/%{name}-api-%{namedversion}-SNAPSHOT.jar \
+ %{name}-api/target/%{name}-api-%{namedversion}.jar \
$RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-api.jar
install -pm 644 %{name}-api/release-pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.plexus-mail-sender-api.pom
%add_to_maven_depmap org.codehaus.plexus %{name}-api %{version} JPP/plexus mail-sender-api
@@ -149,16 +142,17 @@ cp -pr target/site/apidocs/* \
%files
-%defattr(-,root,root,-)
%{_mavendepmapfragdir}/%{name}
%{_mavenpomdir}/*pom
%{_javadir}/*
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/*
%changelog
+* Sun Jun 12 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.0-0.a2.19
+- Build with maven 3.x
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.0-0.a2.18.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 11 months
[plexus-digest] Build with maven 3.x
by Alexander Kurtakov
commit 695298205694d5a6eba15d5e0702e31fb8fd27be
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Sun Jun 12 14:47:32 2011 +0300
Build with maven 3.x
plexus-digest.spec | 41 +++++++++++++----------------------------
1 files changed, 13 insertions(+), 28 deletions(-)
---
diff --git a/plexus-digest.spec b/plexus-digest.spec
index e26f90b..a580205 100644
--- a/plexus-digest.spec
+++ b/plexus-digest.spec
@@ -33,7 +33,7 @@
Name: plexus-digest
Version: 1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 0
Summary: Plexus Digest / Hashcode Components
License: ASL 2.0
@@ -47,15 +47,14 @@ BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant >= 0:1.6
-BuildRequires: maven2 >= 2.0.4-9
+BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven2-common-poms >= 1.0
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
BuildRequires: qdox >= 1.5
@@ -87,19 +86,9 @@ Javadoc for %{name}.
%setup -q -n %{name}
%build
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
-
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
- -e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
%install
-rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/*.jar \
@@ -107,17 +96,13 @@ install -pm 644 target/*.jar \
%add_to_maven_depmap org.codehaus.plexus %{name} 1.0 JPP/%{parent} %{subname}
# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-cp -pr target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@@ -126,16 +111,17 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%update_maven_depmap
%files
-%defattr(-,root,root,-)
%{_javadir}/plexus/*
-%{_mavenpomdir}
-%{_mavendepmapfragdir}
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
%doc %{_javadocdir}/*
%changelog
+* Sun Jun 12 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.1-4
+- Build with maven 3.x
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -184,4 +170,3 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
* Wed Nov 14 2007 Ralph Apel <r.apel @ r-apel.de> - 0:1.0-1jpp
- Initial build
-
12 years, 11 months