[glassfish-jsp] Build with XMvn
by Michal Srb
Summary of changes:
75c99ce... Build with XMvn (*)
(*) This commit already existed in another branch; no separate mail sent
10 years, 11 months
[glassfish-jsp/f19] Build with XMvn
by Michal Srb
commit 75c99cec8dbb20454d44573dba23dbea43c0484b
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Jun 7 10:23:17 2013 +0200
Build with XMvn
- Fix URL for CDDL license
.gitignore | 1 +
glassfish-jsp.spec | 59 ++++++++++++++-------------------------------------
sources | 2 +-
3 files changed, 18 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cfdcd7d..6a95d7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/*.src.rpm
/javax.servlet.jsp-*
/.project
+/LICENSE.txt
diff --git a/glassfish-jsp.spec b/glassfish-jsp.spec
index f5cd0e4..43b4cf7 100644
--- a/glassfish-jsp.spec
+++ b/glassfish-jsp.spec
@@ -4,7 +4,7 @@
Name: glassfish-jsp
Version: 2.2.6
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Glassfish J2EE JSP API implementation
Group: Development/Libraries
@@ -15,33 +15,18 @@ Source0: %{artifactId}-%{version}.tar.xz
# SVN tag
Source1: generate_tarball.sh
Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
-Source3: http://hub.opensolaris.org/bin/download/Main/licensing/cddllicense.txt
+Source3: https://svn.java.net/svn/glassfish~svn/tags/legal-1.1/src/main/resources/...
Patch0: %{name}-build-eclipse-compilers.patch
BuildArch: noarch
-BuildRequires: java
-BuildRequires: jpackage-utils
BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-plugin-bundle
-BuildRequires: maven-release-plugin
-BuildRequires: maven-source-plugin
-BuildRequires: glassfish-jsp-api
-BuildRequires: mvn(org.eclipse.jdt:core)
-BuildRequires: mvn(javax.servlet:javax.servlet-api)
BuildRequires: mvn(javax.el:javax.el-api)
BuildRequires: mvn(javax.servlet.jsp:javax.servlet.jsp-api)
-
-Requires: jpackage-utils
-Requires: java
-Requires: mvn(javax.servlet:javax.servlet-api)
-Requires: mvn(javax.el:javax.el-api)
-Requires: mvn(javax.servlet.jsp:javax.servlet.jsp-api)
+BuildRequires: mvn(javax.servlet:javax.servlet-api)
+BuildRequires: mvn(net.java:jvnet-parent)
+BuildRequires: mvn(org.eclipse.jdt:core)
Provides: jsp = %{jspspec}
Provides: jsp%{jspspec}
@@ -59,7 +44,6 @@ This project provides a container independent implementation of JSP
%package javadoc
Summary: API documentation for %{name}
Group: Documentation
-Requires: jpackage-utils
%description javadoc
%{summary}.
@@ -70,38 +54,27 @@ Requires: jpackage-utils
cp -p %{SOURCE2} LICENSE
cp -p %{SOURCE3} cddllicense.txt
-%build
-mvn-rpmbuild install javadoc:javadoc
+%mvn_alias : "javax.servlet:jsp-api" "org.eclipse.jetty.orbit:org.apache.jasper.glassfish"
+%build
+%mvn_build
%install
+%mvn_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 -a "javax.servlet:jsp-api,org.eclipse.jetty.orbit:org.apache.jasper.glassfish"
-
-%files
+%files -f .mfiles
+%dir %{_javadir}/%{name}
%doc LICENSE cddllicense.txt
-%{_javadir}/%{name}.jar
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP-%{name}.pom
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE cddllicense.txt
-%{_javadocdir}/%{name}
%changelog
+* Fri Jun 07 2013 Michal Srb <msrb(a)redhat.com> - 2.2.6-8
+- Build with XMvn
+- Fix URL for CDDL license
+
* Mon Mar 4 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2.6-7
- Add depmap for org.eclipse.jetty.orbit
- Resolves: rhbz#917623
diff --git a/sources b/sources
index b515cff..7bcc4fd 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
f5cb9c16d3de1d7c548d52dc2c8a8c78 javax.servlet.jsp-2.2.6.tar.xz
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
-edd10f4fe16aeb62cf8aee5a0c7e54e1 cddllicense.txt
+750f58ec5aa643312ec92473fe229fe5 LICENSE.txt
10 years, 11 months
[Bug 966352] New: jetty-websocket is not obsoleted
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=966352
Bug ID: 966352
Summary: jetty-websocket is not obsoleted
Product: Fedora
Version: rawhide
Component: jetty
Severity: unspecified
Priority: unspecified
Assignee: sochotni(a)redhat.com
Reporter: akurtako(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
kdaniel(a)redhat.com, mizdebsk(a)redhat.com,
msrb(a)redhat.com, overholt(a)gmail.com,
sochotni(a)redhat.com, tradej(a)redhat.com
After updating to F19 jetty-websocket-8.1.5-6.fc18.noarch remains on the
system. The reason for that is that there are multiple jetty-websocket-*
packages but none of them obsoletes jetty-websocket.
--
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=CKPOhfGvvg&a=cc_unsubscribe
10 years, 11 months
[Bug 968161] New: The %description of jetty-util package is empty
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=968161
Bug ID: 968161
Summary: The %description of jetty-util package is empty
Product: Fedora
Version: 19
Component: jetty
Severity: low
Priority: unspecified
Assignee: sochotni(a)redhat.com
Reporter: zpavlas(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
kdaniel(a)redhat.com, mizdebsk(a)redhat.com,
msrb(a)redhat.com, overholt(a)gmail.com,
sochotni(a)redhat.com, tradej(a)redhat.com
Description of problem:
Not sure it's a bug, maybe it's legitimate. But it's the only such package in
F19, all other packages provide some description in .spec file. F17 and F18
were clean, too. It was breaking my XML metadata parser, due to a bug in
Python bingings (empty strings are sometimes returned as None). I've fixed
this, but someone might take a look at this, too.
Version-Release number of selected component (if applicable):
How reproducible:
$ grep -B1 '<description><' *.xml
fedora-19-x86_64.xml- <summary>util module for Jetty</summary>
fedora-19-x86_64.xml: <description></description>
--
updates-testing-19-x86_64.xml- <summary>util module for Jetty</summary>
updates-testing-19-x86_64.xml: <description></description>
--
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=LJrlmDHDW9&a=cc_unsubscribe
10 years, 11 months
[tycho] Add Requires on plugins present in Maven super POM
by Roland Grunberg
commit 6b397f648d4954d8f76bdea96dd5f59c8e5c5821
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Jun 6 10:58:08 2013 +0200
Add Requires on plugins present in Maven super POM
- Resolves: rhbz#971301
tycho.spec | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index 3a57460..e0e4ce9 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.18.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -55,6 +55,8 @@ BuildRequires: maven-local
BuildRequires: maven-clean-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-dependency-plugin
+# Temporarily added to avoid bootstrap build
+BuildRequires: maven-deploy-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
@@ -68,6 +70,7 @@ BuildRequires: maven-surefire-provider-junit4
BuildRequires: objectweb-asm4
BuildRequires: plexus-containers-component-metadata
BuildRequires: decentxml
+BuildRequires: easymock3
BuildRequires: ecj
%if ! %{bootstrap}
BuildRequires: osgi(org.eclipse.jdt)
@@ -88,6 +91,19 @@ Requires: ecj
Requires: osgi(org.eclipse.platform)
%endif
+# Tycho always tries to resolve all build plugins, even if they are
+# not needed during Maven lifecycle. This means that Tycho will try
+# to resolve plugins like clean, deploy or site, which aren't normally
+# used during package build. See rhbz#971301
+Requires: maven-clean-plugin
+Requires: maven-compiler-plugin
+Requires: maven-deploy-plugin
+Requires: maven-install-plugin
+Requires: maven-jar-plugin
+Requires: maven-resources-plugin
+Requires: maven-site-plugin
+Requires: maven-surefire-plugin
+
%description
Tycho is a set of Maven plugins and extensions for building Eclipse
@@ -268,6 +284,10 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
%{_javadocdir}/%{name}
%changelog
+* Thu Jun 6 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.18.0-2
+- Add Requires on plugins present in Maven super POM
+- Resolves: rhbz#971301
+
* Tue May 28 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.18.0-1
- Update to 0.18.0 Release.
10 years, 11 months