[jetty] Add missing requires jetty-start
by Michael Šimáček
commit c1e26b248a34f71db3cb7744c1bcf103dd37b6f0
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Fri Oct 10 14:40:57 2014 +0200
Add missing requires jetty-start
jetty.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 81854cd..a497e4a 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -55,7 +55,7 @@
Name: jetty
Version: 9.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java Webserver and Servlet Container
# Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -143,6 +143,7 @@ Requires: jetty-security = %{version}-%{release}
Requires: jetty-server = %{version}-%{release}
Requires: jetty-servlet = %{version}-%{release}
Requires: jetty-servlets = %{version}-%{release}
+Requires: jetty-start = %{version}-%{release}
Requires: jetty-util = %{version}-%{release}
Requires: jetty-webapp = %{version}-%{release}
Requires: jetty-websocket-api = %{version}-%{release}
@@ -890,6 +891,9 @@ exit 0
%doc NOTICE.txt LICENSE*
%changelog
+* Fri Oct 10 2014 Michael Simacek <msimacek(a)redhat.com> - 9.2.3-2
+- Add missing requires jetty-start
+
* Wed Sep 10 2014 Michael Simacek <msimacek(a)redhat.com> - 9.2.3-1
- Update to upstream version 9.2.3
9 years, 7 months
[javapackages] [osgi.req] Print debug information
by Michal Srb
commit b5ec08dc9ae622aabf6c34f56659b2fcf79820f8
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Oct 10 14:51:02 2014 +0200
[osgi.req] Print debug information
depgenerators/osgi.req | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
index 424ccc9..34d5013 100755
--- a/depgenerators/osgi.req
+++ b/depgenerators/osgi.req
@@ -31,14 +31,18 @@
# Authors: Alexander Kurtakov <akurtako(a)redhat.com>
# Michal Srb <msrb(a)redhat.com>
-import javapackages.common.osgi as osgi
-import javapackages.common.config as config
-from javapackages.common.util import kill_parent_process, get_cachedir
-from javapackages.common.logging import init_logging
import sys
import pickle
import os
import traceback
+import logging
+import javapackages.common.osgi as osgi
+import javapackages.common.config as config
+from javapackages.common.util import kill_parent_process, get_cachedir
+from javapackages.common.logging import init_logging
+
+logging.basicConfig(level=logging.DEBUG)
+_log = logging.getLogger("osgi.req")
class TagBuilder(object):
@@ -66,6 +70,7 @@ class TagBuilder(object):
rpm_requires.add("osgi({0}) = {1}".format(req, provided[req]))
else:
rpm_requires.add("osgi({0})".format(req))
+ _log.debug("OSGi requires for {0}: {1}", path, ", ".join(rpm_requires))
if rpm_requires:
print("\n".join(rpm_requires))
9 years, 7 months
[javapackages] [osgi.req] Refactoring
by Michal Srb
commit d22a9b21bfbd48c28e459dd016118fd44646f6af
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Oct 10 14:38:49 2014 +0200
[osgi.req] Refactoring
depgenerators/osgi.req | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
index 4ef20e6..424ccc9 100755
--- a/depgenerators/osgi.req
+++ b/depgenerators/osgi.req
@@ -29,6 +29,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# Authors: Alexander Kurtakov <akurtako(a)redhat.com>
+# Michal Srb <msrb(a)redhat.com>
import javapackages.common.osgi as osgi
import javapackages.common.config as config
@@ -39,6 +40,7 @@ import pickle
import os
import traceback
+
class TagBuilder(object):
def __init__(self, filelist=None, cachedir=None):
@@ -49,18 +51,23 @@ class TagBuilder(object):
provided = None
for path in paths:
- # check if OSGi requires for this path were handled by metadata
- if osgi.check_path_in_metadata(path, self.cachedir):
- continue
+ # symlinks are not interesting, skip them
if not os.path.islink(path):
+ # check if OSGi requires for this path were handled by metadata
+ # if so, move on
+ if osgi.check_path_in_metadata(path, self.cachedir):
+ continue
reqs = osgi.get_requires(path)
if provided is None:
provided = self.get_provided_bundles()
+ rpm_requires = set()
for req in reqs:
if req in provided:
- print("osgi(%s) = %s" % (req, provided[req]))
+ rpm_requires.add("osgi({0}) = {1}".format(req, provided[req]))
else:
- print("osgi(%s)" % (req))
+ rpm_requires.add("osgi({0})".format(req))
+ if rpm_requires:
+ print("\n".join(rpm_requires))
def get_provided_bundles(self):
9 years, 7 months
[javapackages] [maven.req] Print debug info about POM dependencies
by Michal Srb
commit 065fa63d85ad868718ff48f526a9354c0ea98cd9
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Oct 10 14:16:40 2014 +0200
[maven.req] Print debug info about POM dependencies
depgenerators/maven.req | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index db2f818..e82244d 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -306,22 +306,23 @@ class TagBuilder(object):
for d in deps:
reqs.append(ResolutionRequest(d.groupId, d.artifactId, version=d.version))
results = XMvnResolve.process_raw_request(reqs)
+ pom_requires = set()
for i, r in enumerate(results):
dep = MetadataDependency(deps[i].groupId, deps[i].artifactId,
requestedVersion=deps[i].version)
dver = dep.is_provided_by(self.provided_artifacts)[1]
if dver is not None:
if not dep.is_provided_by(pkg_arts)[0]:
- print(dep.get_rpm_str(pkgver=dver, namespace=pom_artifact.namespace))
+ pom_requires.add(dep.get_rpm_str(pkgver=dver, namespace=pom_artifact.namespace))
elif r:
if r.compatVersion != "SYSTEM":
dep.resolvedVersion = r.compatVersion
if r.namespace:
dep.namespace = r.namespace
if dver is not None:
- print(dep.get_rpm_str(pkgver=dver))
+ pom_requires.add(dep.get_rpm_str(pkgver=dver))
continue
- print(dep.get_rpm_str())
+ pom_requires.add(dep.get_rpm_str())
else:
unresolvable.append(dep)
continue
@@ -338,16 +339,20 @@ class TagBuilder(object):
dver = dep.is_provided_by(self.provided_artifacts)[1]
if dver is not None:
if not dep.is_provided_by(pkg_arts)[0]:
- print(dep.get_rpm_str(pkgver=dver, namespace=pom_artifact.namespace))
+ pom_requires.add(dep.get_rpm_str(pkgver=dver, namespace=pom_artifact.namespace))
elif r:
if r.compatVersion != "SYSTEM":
dep.resolvedVersion = r.compatVersion
if r.namespace:
dep.namespace = r.namespace
- print(dep.get_rpm_str())
+ pom_requires.add(dep.get_rpm_str())
else:
unresolvable.append(dep)
+ _log.debug("POM requires: %s", ", ".join(pom_requires))
+ if pom_requires:
+ print("\n".join(pom_requires))
+
if unresolvable:
raise Exception("Unable to generate requires on unresolvable artifacts: {}"
.format(", ".join([x.get_mvn_str() for x in unresolvable])))
9 years, 7 months
[javapackages] Print some debug information in maven req/prov generators
by Michal Srb
commit 7385d59eb9b1829a421e908f1795d42b1f0119d4
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Oct 10 13:52:00 2014 +0200
Print some debug information in maven req/prov generators
depgenerators/maven.prov | 14 +++++++++++---
depgenerators/maven.req | 5 +++++
2 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/depgenerators/maven.prov b/depgenerators/maven.prov
index a942b68..a5eb095 100755
--- a/depgenerators/maven.prov
+++ b/depgenerators/maven.prov
@@ -36,10 +36,14 @@ import os
import signal
import sys
import traceback
+import logging
from javapackages.metadata.metadata import Metadata
from javapackages.common.util import kill_parent_process
from javapackages.common.logging import init_logging
+logging.basicConfig(level=logging.DEBUG)
+_log = logging.getLogger("maven.prov")
+
class TagBuilder:
def __init__ (self, filelist=None):
@@ -49,14 +53,18 @@ class TagBuilder:
for path in paths:
mdata = Metadata(path)
+ provides = set()
for artifact in mdata.get_provided_artifacts():
- print(artifact.get_rpm_str(namespace=artifact.namespace,
- pkgver=artifact.version))
+ provides.add(artifact.get_rpm_str(namespace=artifact.namespace,
+ pkgver=artifact.version))
# print OSGi provides from metadata
osgi_provides = mdata.get_osgi_provides()
for p in osgi_provides:
- print("osgi({osgi_id}) = {version}".format(osgi_id=p,
+ privides.add("osgi({osgi_id}) = {version}".format(osgi_id=p,
version=osgi_provides[p]))
+ _log.debug("metadata provides: %s", ", ".join(provides))
+ if provides:
+ print('\n'.join(provides))
if __name__ == "__main__":
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index fffd9e7..db2f818 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -49,6 +49,9 @@ from javapackages.metadata.metadata import Metadata
from javapackages.metadata.dependency import MetadataDependency
from javapackages.xmvn.xmvn_resolve import XMvnResolve, ResolutionRequest
+logging.basicConfig(level=logging.DEBUG)
+_log = logging.getLogger("maven.req")
+
class TagBuilder(object):
def __init__(self, filelist=None, cachedir=None):
@@ -195,6 +198,8 @@ class TagBuilder(object):
elif req not in osgi_provs:
requires.add("osgi({osgi_id}) = {version}".format(osgi_id=req, version=self.provided_osgi[req]))
+ _log.debug("metadata requires: %s", ", ".join(requires))
+
# print resulting requires!
print('\n'.join(requires))
9 years, 7 months
[stapler] Update to upstream version 1.231
by Michal Srb
commit a702327a17a5c94bac6497e08b5876f9cc42817d
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Oct 10 09:14:24 2014 +0200
Update to upstream version 1.231
.gitignore | 1 +
sources | 2 +-
stapler.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 278ac31..dbbe7db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/stapler-1.228-clean.tar.gz
/stapler-1.229-clean.tar.gz
/stapler-1.230-clean.tar.gz
+/stapler-1.231-clean.tar.gz
diff --git a/sources b/sources
index a7ef294..4529bcc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
-a8aee68952d03f46ea2f3070d60a8669 stapler-1.230-clean.tar.gz
+772bb35bf67580e798afd3b138d1c6af stapler-1.231-clean.tar.gz
diff --git a/stapler.spec b/stapler.spec
index af8332e..26e1c3e 100644
--- a/stapler.spec
+++ b/stapler.spec
@@ -1,5 +1,5 @@
Name: stapler
-Version: 1.230
+Version: 1.231
Release: 1%{?dist}
Summary: Stapler Java web framework
@@ -171,6 +171,9 @@ sed -i 's/org.kohsuke.asm5/org.objectweb.asm/' core/src/main/java/org/kohsuke/st
%changelog
+* Fri Oct 10 2014 Michal Srb <msrb(a)redhat.com> - 1.231-1
+- Update to upstream version 1.231
+
* Mon Sep 29 2014 Michal Srb <msrb(a)redhat.com> - 1.230-1
- Update to upstream version 1.230
9 years, 7 months
[jenkins-remoting] Update to upstream version 2.46
by Michal Srb
commit b084ebde41e70e37a77e220d2e75abf4f1b72ec5
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Oct 10 09:00:05 2014 +0200
Update to upstream version 2.46
.gitignore | 1 +
jenkins-remoting.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 29f7022..5a80610 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/remoting-2.43.tar.gz
/remoting-2.44.tar.gz
/remoting-2.45.tar.gz
+/remoting-2.46.tar.gz
diff --git a/jenkins-remoting.spec b/jenkins-remoting.spec
index ffd7a08..14f6a46 100644
--- a/jenkins-remoting.spec
+++ b/jenkins-remoting.spec
@@ -1,7 +1,7 @@
%global shortname remoting
Name: jenkins-remoting
-Version: 2.45
+Version: 2.46
Release: 1%{?dist}
Summary: Jenkins remoting module
@@ -88,6 +88,9 @@ cp %{SOURCE2} .
%doc LICENSE-MIT LICENSE-ASL
%changelog
+* Fri Oct 10 2014 Michal Srb <msrb(a)redhat.com> - 2.46-1
+- Update to upstream version 2.46
+
* Mon Sep 08 2014 Michal Srb <msrb(a)redhat.com> - 2.45-1
- Update to upstream version 2.45
diff --git a/sources b/sources
index c8744a4..07e2213 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
-7caf367d2ca7b9cd377c671cf92005b3 remoting-2.45.tar.gz
+6276011c6372b3328d9f79657f38a431 remoting-2.46.tar.gz
9 years, 7 months