[Bug 810341] New: plexus-classworlds: Please update to maven 3
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: plexus-classworlds: Please update to maven 3
https://bugzilla.redhat.com/show_bug.cgi?id=810341
Summary: plexus-classworlds: Please update to maven 3
Product: Fedora
Version: rawhide
Platform: Unspecified
OS/Version: Unspecified
Status: NEW
Severity: unspecified
Priority: unspecified
Component: plexus-classworlds
AssignedTo: fnasser(a)redhat.com
ReportedBy: mizdebsk(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: fnasser(a)redhat.com, dbhole(a)redhat.com,
sochotni(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Story Points: ---
Type: Bug
Regression: ---
Mount Type: ---
Documentation: ---
Created attachment 575489
--> https://bugzilla.redhat.com/attachment.cgi?id=575489
update to maven 3
Please update from maven 2 to maven 3. The attached patch does that.
--
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
[plexus-classworlds] Remove no longer needed build.xml file.
by Alexander Kurtakov
commit fecd922fd7022ef0595abb0ee5419abcdc5866f2
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Apr 6 13:03:20 2012 +0300
Remove no longer needed build.xml file.
plexus-classworlds-1.2-build.xml | 99 --------------------------------------
1 files changed, 0 insertions(+), 99 deletions(-)
12 years
[plexus-classworlds] Update to maven 3
by Alexander Kurtakov
commit 199a5e273b07088e1f2592df797eec0ece979a4d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Apr 5 17:53:35 2012 +0200
Update to maven 3
- Remove rpm bug workaround
plexus-classworlds.spec | 35 ++++++++---------------------------
1 files changed, 8 insertions(+), 27 deletions(-)
---
diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec
index 4c3300c..93bf0ea 100644
--- a/plexus-classworlds.spec
+++ b/plexus-classworlds.spec
@@ -34,7 +34,7 @@
Name: %{parent}-%{subname}
Version: 2.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Plexus Classworlds Classloader Framework
License: ASL 2.0 and Plexus
Group: Development/Libraries
@@ -48,7 +48,7 @@ BuildArch: noarch
BuildRequires: jpackage-utils
BuildRequires: apache-commons-logging
BuildRequires: xml-commons-jaxp-1.3-apis
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
@@ -64,9 +64,6 @@ BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: plexus-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
%description
Classworlds is a framework for container developers
who require complex manipulation of Java's ClassLoaders.
@@ -95,52 +92,36 @@ done
sed -i 's:<groupId>ant</groupId>:<groupId>org.apache.ant</groupId>:' pom.xml
%build
-
-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 -e install javadoc:javadoc
%install
# jars
install -Dpm 644 target/%{name}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}.jar
-%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
# pom
install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
+%add_maven_depmap JPP.%{parent}-%{subname}.pom plexus/%{subname}.jar
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%{_javadir}/%{parent}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%doc LICENSE.txt
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE.txt
%doc %{_javadocdir}/%{name}
%changelog
+* Thu Apr 5 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.4-4
+- Update to maven 3
+- Remove rpm bug workaround
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years
[glassfish-jsp-api] Initial version of the package
by Stanislav Ochotnicky
commit b470ed4cb7c5efb38d0b0fe7568ddc255ee513c7
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Apr 5 15:20:42 2012 +0200
Initial version of the package
.gitignore | 1 +
generate_tarball.sh | 13 +++++++
glassfish-jsp-api.spec | 83 ++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 98 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..74d44e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/javax.servlet.jsp-api-2.2.1.tar.xz
diff --git a/generate_tarball.sh b/generate_tarball.sh
new file mode 100644
index 0000000..53354d2
--- /dev/null
+++ b/generate_tarball.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+baseurl="https://svn.java.net/svn/jsp~svn/tags/"
+pkgname="javax.servlet.jsp-api"
+
+version=`grep Version: *spec | sed -e 's/Version:\s*\(.*\)/\1/'`
+echo $version
+
+svn export "${baseurl}/${pkgname}-${version}"
+tar cvJf ${pkgname}-${version}.tar.xz ${pkgname}-${version}/
+
+
+
diff --git a/glassfish-jsp-api.spec b/glassfish-jsp-api.spec
new file mode 100644
index 0000000..e361ab8
--- /dev/null
+++ b/glassfish-jsp-api.spec
@@ -0,0 +1,83 @@
+%global artifactId javax.servlet.jsp-api
+%global jspspec 2.2
+
+
+Name: glassfish-jsp-api
+Version: 2.2.1
+Release: 1%{?dist}
+Summary: Glassfish J2EE JSP API specification
+
+Group: Development/Libraries
+License: CDDL and GPLv2 with exceptions
+URL: http://glassfish.org
+Source0: %{artifactId}-%{version}.tar.xz
+# no source releases, but this will generate tarball for you from an
+# SVN tag
+Source1: generate_tarball.sh
+
+BuildArch: noarch
+
+BuildRequires: maven
+BuildRequires: maven-plugin-bundle
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-source-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: jvnet-parent
+BuildRequires: mvn(javax.servlet:javax.servlet-api)
+BuildRequires: mvn(javax.el:javax.el-api)
+
+Requires: jvnet-parent
+Requires: mvn(javax.servlet:javax.servlet-api)
+Requires: mvn(javax.el:javax.el-api)
+
+%description
+This project provides a container independent specification of JSP
+2.2. Note that this package doesn't contain implementation of this
+specification. See glassfish-jsp for one of implementations
+
+%package javadoc
+Summary: API documentation for %{name}
+Group: Documentation
+Requires: jpackage-utils >= 0:1.7.5
+BuildArch: noarch
+
+%description javadoc
+%{summary}.
+
+%prep
+%setup -q -n %{artifactId}-%{version}
+
+
+%build
+mvn-rpmbuild install javadoc:javadoc
+
+
+%install
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+
+install -m 644 target/%{artifactId}-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+
+%add_maven_depmap
+
+%files
+%{_javadir}/%{name}.jar
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP-%{name}.pom
+
+%files javadoc
+%{_javadocdir}/%{name}
+
+
+%changelog
+* Wed Mar 21 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-1
+- Initial version of the package
diff --git a/sources b/sources
index e69de29..8cac028 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+146980bfb81e6fbd5a58d4cf30497f16 javax.servlet.jsp-api-2.2.1.tar.xz
12 years
[tycho] Non-bootstrap build.
by Roland Grunberg
commit 9a36347598c5b33c838493620a355a3e936ec801
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Wed Apr 4 13:26:04 2012 -0400
Non-bootstrap build.
tycho.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index 06ffd31..d0fba72 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,4 +1,4 @@
-%global bootstrap 1
+%global bootstrap 0
%if %{bootstrap}
%global snap -SNAPSHOT
@@ -8,7 +8,7 @@
Name: tycho
Version: 0.14.1
-Release: 1.1%{?dist}
+Release: 2%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -191,6 +191,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Wed Apr 4 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-2
+- Non-bootstrap build.
+
* Tue Mar 27 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-1.1
- Add missing tycho-testing-harness to be packaged.
- Use %%{_eclipse_base} from eclipse-platform.
12 years
[tycho] Revert "Remove "BuildArch: noarch"."
by Roland Grunberg
commit 0e1315053cb007c4b2dbdc97a4110ea1e02ddadd
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue Apr 3 12:58:49 2012 -0400
Revert "Remove "BuildArch: noarch"."
This reverts commit 2f0ce7b38bd78228b7a50c7b3ece2f608f75fa8e.
tycho.spec | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index 0ccc58e..06ffd31 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,5 +1,4 @@
%global bootstrap 1
-%global eclipsedir %{_libdir}/eclipse
%if %{bootstrap}
%global snap -SNAPSHOT
@@ -36,6 +35,8 @@ Patch1: %{name}-maven-surefire.patch
Patch2: %{name}-bootstrap.patch
%endif
+BuildArch: noarch
+
BuildRequires: jpackage-utils
BuildRequires: java-devel
BuildRequires: maven
@@ -122,7 +123,7 @@ popd
%build
export MAVEN_OPTS="$MAVEN_OPTS -XX:MaxPermSize=256m"
-export TYCHO_TARGET_PLATFORM=%{eclipsedir}
+export TYCHO_TARGET_PLATFORM=%{_eclipse_base}
mvn-rpmbuild -Dmaven.local.debug=true -X -Dmaven.test.skip=true \
-Dmaven.local.depmap.file=%{SOURCE2} \
-Dtycho.targetPlatform=$TYCHO_TARGET_PLATFORM install javadoc:aggregate
@@ -192,7 +193,7 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%changelog
* Tue Mar 27 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-1.1
- Add missing tycho-testing-harness to be packaged.
-- Remove "BuildArch: noarch".
+- Use %%{_eclipse_base} from eclipse-platform.
* Fri Mar 9 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-1
- Update to 0.14.1 upstream tag.
12 years