[javapackages-tools] Update to upstream version 0.12.6
by Mikolaj Izdebski
commit 3501be573964bfebe30102db96722edba5485e8d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Mar 4 14:16:32 2013 +0100
Update to upstream version 0.12.6
- Resolves: rhbz#917618 (remove jetty orbit provides)
- Resolves: rhbz#917647 (system.bundle into autogenerated deps)
.gitignore | 1 +
javapackages-tools.spec | 24 ++++++------------------
sources | 2 +-
3 files changed, 8 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a0c9058..ac2ef65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
/javapackages-0.12.3.tar.xz
/javapackages-0.12.4.tar.xz
/javapackages-0.12.5.tar.xz
+/javapackages-0.12.6.tar.xz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 4193200..04820d6 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,5 +1,5 @@
Name: javapackages-tools
-Version: 0.12.5
+Version: 0.12.6
Release: 1%{?dist}
Summary: Macros and scripts for Java packaging support
@@ -85,23 +85,6 @@ install -p -m 755 scripts/mvn-* $RPM_BUILD_ROOT%{_bindir}
rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
%endif
-# Ugly as hell, but Eclipse relocated various artifacts under
-# their own groupId. We need to fix this globally.
-# FIXME: this should be moved to respective packages
-%add_to_maven_depmap org.eclipse.jetty.orbit javax.servlet any JPP tomcat-servlet-3.0-api
-%add_to_maven_depmap org.eclipse.jetty.orbit javax.security.auth.message any JPP geronimo-jaspic-spec
-%add_to_maven_depmap org.eclipse.jetty.orbit javax.mail.glassfish any JPP/javamail mail
-%add_to_maven_depmap org.eclipse.jetty.orbit javax.transaction any JPP geronimo-jta
-%add_to_maven_depmap org.eclipse.jetty.orbit javax.annotation any JPP geronimo-annotation
-%add_to_maven_depmap org.eclipse.jetty.orbit org.objectweb.asm any JPP/objectweb-asm asm-all
-%add_to_maven_depmap org.eclipse.jetty.orbit javax.servlet.jsp any JPP tomcat-jsp-api
-%add_to_maven_depmap org.eclipse.jetty.orbit org.apache.jasper.glassfish any JPP glassfish-jsp
-%add_to_maven_depmap org.eclipse.jetty.orbit javax.servlet.jsp.jstl any JPP taglibs-core
-%add_to_maven_depmap org.eclipse.jetty.orbit org.apache.taglibs.standard.glassfish any JPP taglibs-standard
-%add_to_maven_depmap org.eclipse.jetty.orbit javax.el any JPP tomcat-el-2.2-api
-%add_to_maven_depmap org.eclipse.jetty.orbit com.sun.el any JPP tomcat-el-2.2-api
-%add_to_maven_depmap org.eclipse.jetty.orbit org.eclipse.jdt.core any JPP/eclipse jdt.core
-
%files
%doc LICENSE
@@ -123,6 +106,11 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
%changelog
+* Mon Mar 4 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.12.6-1
+- Update to upstream version 0.12.6
+- Resolves: rhbz#917618 (remove jetty orbit provides)
+- Resolves: rhbz#917647 (system.bundle into autogenerated deps)
+
* Fri Mar 1 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.12.5-1
- Update to upstream version 0.12.5
- Resolves problems with compat package provides and automatic requires
diff --git a/sources b/sources
index 8cf8c2d..a2c2d95 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e98c9fe09b2b14dad0a70d2095ee428e javapackages-0.12.5.tar.xz
+d427676361b553a08bcac3e78528667a javapackages-0.12.6.tar.xz
11 years, 2 months
[javapackages] Created tag 0.12.6
by Mikolaj Izdebski
The lightweight tag '0.12.6' was created pointing to:
f1440c7... Don't create OSGi auto-requires on system.bundle
11 years, 2 months
[glassfish-jsp] Add depmap for org.eclipse.jetty.orbit
by Stanislav Ochotnicky
commit 6a419b5855e18e95337471a11c8bc48c5874773f
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Mar 4 13:28:21 2013 +0100
Add depmap for org.eclipse.jetty.orbit
- Resolves: rhbz#917623
Signed-off-by: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
glassfish-jsp.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/glassfish-jsp.spec b/glassfish-jsp.spec
index 01be4a6..f5cd0e4 100644
--- a/glassfish-jsp.spec
+++ b/glassfish-jsp.spec
@@ -4,7 +4,7 @@
Name: glassfish-jsp
Version: 2.2.6
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Glassfish J2EE JSP API implementation
Group: Development/Libraries
@@ -88,7 +88,7 @@ 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"
+%add_maven_depmap -a "javax.servlet:jsp-api,org.eclipse.jetty.orbit:org.apache.jasper.glassfish"
%files
%doc LICENSE cddllicense.txt
@@ -102,6 +102,10 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
%changelog
+* Mon Mar 4 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2.6-7
+- Add depmap for org.eclipse.jetty.orbit
+- Resolves: rhbz#917623
+
* Tue Feb 26 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2.6-6
- Change scope of Eclipse JDT dependency from compile to provided
- Fix eclipse patch
11 years, 2 months
[javapackages] Don't create OSGi auto-requires on system.bundle
by Mikolaj Izdebski
commit f1440c791d8f2acb2906574b013cc3377228ddae
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Mar 4 13:52:18 2013 +0100
Don't create OSGi auto-requires on system.bundle
If a bundle requires system.bundle - either Eclipse or OSGi is
installed. This should not be the case, as system.bundle is a valid
requirement if and only if the OSGi environment is present. If someone
wants to use a bundle without OSGi - he's welcome to do so.
depgenerators/osgi.req | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
index 602989c..be10cb1 100755
--- a/depgenerators/osgi.req
+++ b/depgenerators/osgi.req
@@ -93,7 +93,8 @@ class TagBuilder:
headers = self.parse_manifest(manifest)
if headers.get("Require-Bundle"):
for bundle in self.split_bundle_name(headers.get("Require-Bundle")):
- print "osgi(%s)" %(bundle)
+ if bundle != "system.bundle":
+ print "osgi(%s)" %(bundle)
if __name__ == "__main__":
builder = TagBuilder ()
11 years, 2 months
[geronimo-jaspic-spec] Add depmap for org.eclipse.jetty.orbit
by Stanislav Ochotnicky
commit ad0de004c1c81ab8c6fe6f15068424d86b158769
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Mar 4 13:26:00 2013 +0100
Add depmap for org.eclipse.jetty.orbit
- Resolves: rhbz#917621
Signed-off-by: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
geronimo-jaspic-spec.spec | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/geronimo-jaspic-spec.spec b/geronimo-jaspic-spec.spec
index 94d2a86..a46f553 100644
--- a/geronimo-jaspic-spec.spec
+++ b/geronimo-jaspic-spec.spec
@@ -2,7 +2,7 @@
%define pkg_name geronimo-jaspic_%{api_version}_spec
Name: geronimo-jaspic-spec
Version: 1.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Java Authentication SPI for Containers
License: ASL 2.0 and W3C
Group: Development/Libraries
@@ -48,6 +48,7 @@ done
%build
%mvn_file : %{name}
+%mvn_alias : org.eclipse.jetty.orbit:javax.security.auth.message
%mvn_build
%install
@@ -60,6 +61,10 @@ done
%doc LICENSE NOTICE
%changelog
+* Mon Mar 4 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.1-7
+- Add depmap for org.eclipse.jetty.orbit
+- Resolves: rhbz#917621
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
11 years, 2 months