January 2015 - java-sig-commits - Fedora Mailing-Lists

[javapackages] Add Emacs mode local variables

by Mikolaj Izdebski

commit f75f1910eba626fe9c989b324bed668277b0e545 Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Fri Jan 2 11:27:56 2015 +0100 Add Emacs mode local variables Weird shebang confuses Emacs, lets force correct mode. depgenerators/javadoc.req | 5 +++++ depgenerators/maven.prov | 5 +++++ depgenerators/maven.req | 5 +++++ depgenerators/osgi.prov | 5 +++++ depgenerators/osgi.req | 5 +++++ 5 files changed, 25 insertions(+), 0 deletions(-) --- diff --git a/depgenerators/javadoc.req b/depgenerators/javadoc.req index 9c85a95..abc858d 100755 --- a/depgenerators/javadoc.req +++ b/depgenerators/javadoc.req @@ -42,3 +42,8 @@ if config: always_generate = javadoc_config.get("always_generate", set()) for pkg in always_generate: print(pkg) + + +# Local Variables: +# mode: Python +# End: diff --git a/depgenerators/maven.prov b/depgenerators/maven.prov index 4f20a1f..120aeea 100755 --- a/depgenerators/maven.prov +++ b/depgenerators/maven.prov @@ -76,3 +76,8 @@ if __name__ == "__main__": except Exception: traceback.print_exc(file=sys.stderr) kill_parent_process(rpmconf) + + +# Local Variables: +# mode: Python +# End: diff --git a/depgenerators/maven.req b/depgenerators/maven.req index 9711965..ffe900c 100755 --- a/depgenerators/maven.req +++ b/depgenerators/maven.req @@ -360,3 +360,8 @@ if __name__ == "__main__": except Exception: traceback.print_exc(file=sys.stderr) kill_parent_process(rpmconf) + + +# Local Variables: +# mode: Python +# End: diff --git a/depgenerators/osgi.prov b/depgenerators/osgi.prov index a1ca7f1..22c89c5 100755 --- a/depgenerators/osgi.prov +++ b/depgenerators/osgi.prov @@ -79,3 +79,8 @@ if __name__ == "__main__": except Exception: traceback.print_exc(file=sys.stderr) kill_parent_process(rpmconf) + + +# Local Variables: +# mode: Python +# End: diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req index 308059b..2169d13 100755 --- a/depgenerators/osgi.req +++ b/depgenerators/osgi.req @@ -94,3 +94,8 @@ if __name__ == "__main__": except Exception: traceback.print_exc(file=sys.stderr) kill_parent_process(rpmconf) + + +# Local Variables: +# mode: Python +# End:

9 years, 3 months

1
0
0 / 0

[javapackages] Add --rpm-pid option to depgenerators

by Mikolaj Izdebski

commit 7bc55d9f2fc55556bff6898e19eec6bbaff14ac9 Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Fri Jan 2 08:13:25 2015 +0100 Add --rpm-pid option to depgenerators depgenerators/fileattrs/maven.attr | 4 ++-- depgenerators/fileattrs/osgi.attr | 4 ++-- depgenerators/maven.prov | 5 +++-- depgenerators/maven.req | 5 +++-- depgenerators/osgi.prov | 5 +++-- depgenerators/osgi.req | 5 +++-- python/javapackages/cache/cache.py | 13 +++++++------ python/javapackages/cache/metadata.py | 5 ++--- python/javapackages/cache/osgi.py | 7 +++---- python/javapackages/common/util.py | 9 +++++++-- 10 files changed, 35 insertions(+), 27 deletions(-) --- diff --git a/depgenerators/fileattrs/maven.attr b/depgenerators/fileattrs/maven.attr index 65c504d..5bead99 100644 --- a/depgenerators/fileattrs/maven.attr +++ b/depgenerators/fileattrs/maven.attr @@ -1,5 +1,5 @@ %__maven_provides %{_rpmconfigdir}/maven.prov -%__maven_provides_opts --cachedir %{_builddir}/%{?buildsubdir} %{?scl:--scl %{?scl}} +%__maven_provides_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(posix.getprocessid("pid"))} %{?scl:--scl %{?scl}} %__maven_requires %{_rpmconfigdir}/maven.req -%__maven_requires_opts --cachedir %{_builddir}/%{?buildsubdir} %{?scl:--scl %{?scl}} +%__maven_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(posix.getprocessid("pid"))} %{?scl:--scl %{?scl}} %__maven_path ^%{_datadir}/maven-metadata/.* diff --git a/depgenerators/fileattrs/osgi.attr b/depgenerators/fileattrs/osgi.attr index f2b3342..73a8b00 100644 --- a/depgenerators/fileattrs/osgi.attr +++ b/depgenerators/fileattrs/osgi.attr @@ -1,5 +1,5 @@ %__osgi_provides %{_rpmconfigdir}/osgi.prov -%__osgi_provides_opts --cachedir %{_builddir}/%{?buildsubdir} %{?scl:--scl %{?scl}} +%__osgi_provides_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(posix.getprocessid("pid"))} %{?scl:--scl %{?scl}} %__osgi_requires %{!?scl:%{_rpmconfigdir}/osgi.req}%{?scl:%{_root_bindir}/true} -%__osgi_requires_opts --cachedir %{_builddir}/%{?buildsubdir} %{?scl:--scl %{?scl}} +%__osgi_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(posix.getprocessid("pid"))} %{?scl:--scl %{?scl}} %__osgi_path ^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$ diff --git a/depgenerators/maven.prov b/depgenerators/maven.prov index 4887605..4f20a1f 100755 --- a/depgenerators/maven.prov +++ b/depgenerators/maven.prov @@ -51,7 +51,7 @@ class TagBuilder: paths = [line.rstrip() for line in filelist.readlines()] _log.info("input: {fl}".format(fl=paths)) - cache = MetadataCache(rpmconf.cachedir, rpmconf.scl) + cache = MetadataCache(rpmconf) for path in paths: metadata = cache.get_metadata_for_path(path) @@ -69,9 +69,10 @@ class TagBuilder: if __name__ == "__main__": + rpmconf = None try: rpmconf = init_rpmgen(sys.argv) builder = TagBuilder() except Exception: traceback.print_exc(file=sys.stderr) - kill_parent_process() + kill_parent_process(rpmconf) diff --git a/depgenerators/maven.req b/depgenerators/maven.req index 408d23b..9711965 100755 --- a/depgenerators/maven.req +++ b/depgenerators/maven.req @@ -61,7 +61,7 @@ class TagBuilder(object): _log.info("input: {fl}".format(fl=paths)) self.config = self._get_config() - cache = MetadataCache(rpmconf.cachedir, rpmconf.scl) + cache = MetadataCache(rpmconf) self.provided_artifacts = cache.get_provided_artifacts() self.skipped_artifacts = cache.get_skipped_artifacts() self.provided_osgi = cache.get_provided_osgi() @@ -353,9 +353,10 @@ class TagBuilder(object): if __name__ == "__main__": + rpmconf = None try: rpmconf = init_rpmgen(sys.argv) builder = TagBuilder() except Exception: traceback.print_exc(file=sys.stderr) - kill_parent_process() + kill_parent_process(rpmconf) diff --git a/depgenerators/osgi.prov b/depgenerators/osgi.prov index 72b1ecd..a1ca7f1 100755 --- a/depgenerators/osgi.prov +++ b/depgenerators/osgi.prov @@ -48,7 +48,7 @@ class TagBuilder(object): paths = [x.rstrip() for x in filelist.readlines()] _log.info("input: {fl}".format(fl=paths)) - cache = OSGiCache(rpmconf.cachedir, scl=rpmconf.scl) + cache = OSGiCache(rpmconf) provides = [] for path in paths: @@ -72,9 +72,10 @@ class TagBuilder(object): if __name__ == "__main__": + rpmconf = None try: rpmconf = init_rpmgen(sys.argv) builder = TagBuilder() except Exception: traceback.print_exc(file=sys.stderr) - kill_parent_process() + kill_parent_process(rpmconf) diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req index 0557807..308059b 100755 --- a/depgenerators/osgi.req +++ b/depgenerators/osgi.req @@ -50,7 +50,7 @@ class TagBuilder(object): paths = [x.rstrip() for x in filelist.readlines()] _log.info("input: {fl}".format(fl=paths)) - cache = OSGiCache(rpmconf.cachedir, scl=rpmconf.scl) + cache = OSGiCache(rpmconf) requires = [] for path in paths: @@ -80,6 +80,7 @@ class TagBuilder(object): if __name__ == "__main__": + rpmconf = None try: rpmconf = init_rpmgen(sys.argv) @@ -92,4 +93,4 @@ if __name__ == "__main__": builder = TagBuilder() except Exception: traceback.print_exc(file=sys.stderr) - kill_parent_process() + kill_parent_process(rpmconf) diff --git a/python/javapackages/cache/cache.py b/python/javapackages/cache/cache.py index 85f8200..d50f9ba 100644 --- a/python/javapackages/cache/cache.py +++ b/python/javapackages/cache/cache.py @@ -38,9 +38,10 @@ import javapackages.common.config as config class Cache(object): - def __init__(self, cachedir, scl=None): - self._cachedir = cachedir - self._scl = scl + def __init__(self, rpmconf): + self._cachedir = rpmconf.cachedir + self._rpm_pid = rpmconf.rpm_pid + self._scl = rpmconf.scl def _process_buildroot(self): cache = {} @@ -65,10 +66,10 @@ class Cache(object): try: cachepath = os.path.join(self._cachedir, self._config_name) cachefile = open(cachepath, 'rb') - ppid, cache = pickle.load(cachefile) + cached_pid, cache = pickle.load(cachefile) cachefile.close() # check if the cache was most likely created during current build - if ppid != os.getppid(): + if cached_pid != self._rpm_pid: logging.warning("Cache in {path} is outdated, skipping" .format(path=cachepath)) return None @@ -80,7 +81,7 @@ class Cache(object): try: cachefile = open(os.path.join(self._cachedir, self._config_name), 'wb') - content = (os.getppid(), cache) + content = (self._rpm_pid, cache) pickle.dump(content, cachefile) cachefile.close() except IOError: diff --git a/python/javapackages/cache/metadata.py b/python/javapackages/cache/metadata.py index 64bb0b5..89e7f1c 100644 --- a/python/javapackages/cache/metadata.py +++ b/python/javapackages/cache/metadata.py @@ -37,9 +37,8 @@ from javapackages.cache.cache import Cache class MetadataCache(Cache): - def __init__(self, cachedir, scl=None): - self._cachedir = cachedir - self._scl = scl + def __init__(self, rpmconf): + super(MetadataCache, self).__init__(rpmconf) self._config_name = config.metadata_cache_f self._cache = self._read_cache() diff --git a/python/javapackages/cache/osgi.py b/python/javapackages/cache/osgi.py index 9936bb4..c5832f3 100644 --- a/python/javapackages/cache/osgi.py +++ b/python/javapackages/cache/osgi.py @@ -42,12 +42,11 @@ from javapackages.cache.metadata import MetadataCache class OSGiCache(Cache): - def __init__(self, cachedir, scl=None): - self._cachedir = cachedir - self._scl = scl + def __init__(self, rpmconf): + super(OSGiCache, self).__init__(rpmconf) self._config_name = config.osgi_cache_f self._cache = self._read_cache() - self._metadata_cache = MetadataCache(cachedir, scl) + self._metadata_cache = MetadataCache(rpmconf) if self._cache is None: self._cache = self._process_buildroot() diff --git a/python/javapackages/common/util.py b/python/javapackages/common/util.py index 9d259f7..7a9ff21 100644 --- a/python/javapackages/common/util.py +++ b/python/javapackages/common/util.py @@ -40,7 +40,9 @@ import logging from optparse import OptionParser -def kill_parent_process(): +def kill_parent_process(rpmconf): + if not rpmconf: + return # mock may kill us immediately after rpmbuild dies, before output # is flushed. To avoid this race condiditon we must explicitly # flush any pending output before trying to kill parent. @@ -48,7 +50,7 @@ def kill_parent_process(): sys.stderr.flush() # rpmbuild ignores non-zero exit codes, but this is bad. Make sure # the build fails and doesn't silently ignore problems - os.kill(os.getppid(), signal.SIGTERM) + os.kill(rpmconf.rpm_pid, signal.SIGTERM) def args_to_unicode(args): @@ -87,6 +89,7 @@ def _init_rpmgen_logging(): def _parse_argv(argv): parser = OptionParser() parser.add_option("--cachedir", dest="cachedir") + parser.add_option("--rpm-pid", type="int", dest="rpm_pid") parser.add_option("--scl", dest="scl", default=None) return parser.parse_args() @@ -98,6 +101,8 @@ def _parse_rpmgen_args(argv): if not options.cachedir: raise Exception("Missing option: --cachedir") options.cachedir = _get_cachedir(options.cachedir) + if not options.rpm_pid: + raise Exception("Missing option: --rpm-pid") return options

9 years, 3 months

1
0
0 / 0

[javapackages] Get rid of wrapper.py script

by Mikolaj Izdebski

commit 661769a411b8ecf82de17554030ad5869b386dc7 Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Fri Jan 2 10:38:15 2015 +0100 Get rid of wrapper.py script test/test_common.py | 13 +++++-------- test/wrapper.py | 18 ------------------ 2 files changed, 5 insertions(+), 26 deletions(-) --- diff --git a/test/test_common.py b/test/test_common.py index cb1fe6c..3478b2d 100644 --- a/test/test_common.py +++ b/test/test_common.py @@ -16,13 +16,10 @@ SCRIPT_ENV = {'PATH':'{mock}:{real}'.format(mock=DIRPATH, 'PYTHONPATH':os.environ['PYTHONPATH']} -def call_script(name, args, stdin=None, wrapped=False, extra_env={}, config_path=''): +def call_script(name, args, stdin=None, extra_env={}): with open("tmpout", 'w') as outfile: with open("tmperr", 'w') as errfile: - procargs = [sys.executable, - path.join(DIRPATH, 'wrapper.py'), - name, - config_path] + procargs = [sys.executable, name] env = SCRIPT_ENV.copy() env.update(extra_env) proc = subprocess.Popen(procargs + args, shell=False, @@ -146,8 +143,8 @@ def call_rpmgen(rpmgen_name, filelist_prefix, filelist, env=None, except OSError: pass for line in stdin: - ret = call_script(scriptpath, ["--cachedir", "/tmp"], stdin=line, - wrapped=True, extra_env=env, config_path=config) + ret = call_script(scriptpath, ["--cachedir", "/tmp"], + stdin=line, extra_env=env) try: shutil.rmtree("/tmp/.javapackages_cache/") except OSError: @@ -255,7 +252,7 @@ def mvn_depmap(pom, jar=None, fnargs=None): if jar: args.append(path.join(os.getcwd(), jar)) args.extend(fnargs or []) - (stdout, stderr, return_value) = call_script(scriptpath, args, extra_env = env) + (stdout, stderr, return_value) = call_script(scriptpath, args, extra_env=env) frag = None if return_value == 0: with open('.fragment_data','r') as frag_file:

9 years, 3 months

1
0
0 / 0

[javapackages] Assume that JAVACONFDIRS is always defined in SCL environment

by Mikolaj Izdebski

commit 93f97262de844a6095469b94a4313fc0e45fb9f2 Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Fri Jan 2 10:31:41 2015 +0100 Assume that JAVACONFDIRS is always defined in SCL environment depgenerators/javadoc.req | 2 +- depgenerators/maven.req | 2 +- python/javapackages/common/config.py | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) --- diff --git a/depgenerators/javadoc.req b/depgenerators/javadoc.req index 1e91e7d..9c85a95 100755 --- a/depgenerators/javadoc.req +++ b/depgenerators/javadoc.req @@ -36,7 +36,7 @@ import json from javapackages.common.config import get_config -config = get_config(["%{javaconfdir}"]) +config = get_config() if config: javadoc_config = config.get("javadoc.req", {}) always_generate = javadoc_config.get("always_generate", set()) diff --git a/depgenerators/maven.req b/depgenerators/maven.req index d14b233..408d23b 100755 --- a/depgenerators/maven.req +++ b/depgenerators/maven.req @@ -228,7 +228,7 @@ class TagBuilder(object): return "{0}.{1}".format(major, minor) def _get_config(self): - config = get_config(['%{javaconfdir}']) + config = get_config() return config.get('maven.req', {}) if config else {} def _check_pom_deps(self): diff --git a/python/javapackages/common/config.py b/python/javapackages/common/config.py index 9f57776..e37c617 100644 --- a/python/javapackages/common/config.py +++ b/python/javapackages/common/config.py @@ -38,14 +38,12 @@ metadata_cache_f = "metadata.cache" osgi_cache_f = "osgi.cache" -def get_config(cfg_paths=None): +def get_config(): """ Returns list of dictionaries which represent configuration files. """ if 'JAVACONFDIRS' in os.environ: config_paths = os.environ['JAVACONFDIRS'].split(os.pathsep) - elif cfg_paths: - config_paths = cfg_paths else: config_paths = ['/etc/java/']

9 years, 3 months

1
0
0 / 0

[javapackages] Remove --sclroot option from depgenerators

by Mikolaj Izdebski

commit 9c08e390a46112c3b9e8991fae57e71a7985af45 Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Fri Jan 2 07:58:22 2015 +0100 Remove --sclroot option from depgenerators depgenerators/fileattrs/javadoc.attr | 2 +- depgenerators/fileattrs/maven.attr | 4 ++-- depgenerators/fileattrs/osgi.attr | 4 ++-- python/javapackages/common/util.py | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) --- diff --git a/depgenerators/fileattrs/javadoc.attr b/depgenerators/fileattrs/javadoc.attr index f85d364..a13e6f6 100644 --- a/depgenerators/fileattrs/javadoc.attr +++ b/depgenerators/fileattrs/javadoc.attr @@ -1,3 +1,3 @@ %__javadoc_requires %{_rpmconfigdir}/javadoc.req -%__javadoc_requires_opts %{?scl:--scl %{?scl} --sclroot %{?_scl_root}} +%__javadoc_requires_opts %{?scl:--scl %{?scl}} %__javadoc_path ^%{_javadocdir}/.[^/]*$ diff --git a/depgenerators/fileattrs/maven.attr b/depgenerators/fileattrs/maven.attr index 9fcdfeb..65c504d 100644 --- a/depgenerators/fileattrs/maven.attr +++ b/depgenerators/fileattrs/maven.attr @@ -1,5 +1,5 @@ %__maven_provides %{_rpmconfigdir}/maven.prov -%__maven_provides_opts --cachedir %{_builddir}/%{?buildsubdir} %{?scl:--scl %{?scl} --sclroot %{?_scl_root}} +%__maven_provides_opts --cachedir %{_builddir}/%{?buildsubdir} %{?scl:--scl %{?scl}} %__maven_requires %{_rpmconfigdir}/maven.req -%__maven_requires_opts --cachedir %{_builddir}/%{?buildsubdir} %{?scl:--scl %{?scl} --sclroot %{?_scl_root}} +%__maven_requires_opts --cachedir %{_builddir}/%{?buildsubdir} %{?scl:--scl %{?scl}} %__maven_path ^%{_datadir}/maven-metadata/.* diff --git a/depgenerators/fileattrs/osgi.attr b/depgenerators/fileattrs/osgi.attr index 8ebcc20..f2b3342 100644 --- a/depgenerators/fileattrs/osgi.attr +++ b/depgenerators/fileattrs/osgi.attr @@ -1,5 +1,5 @@ %__osgi_provides %{_rpmconfigdir}/osgi.prov -%__osgi_provides_opts --cachedir %{_builddir}/%{?buildsubdir} %{?scl:--scl %{?scl} --sclroot %{?_scl_root}} +%__osgi_provides_opts --cachedir %{_builddir}/%{?buildsubdir} %{?scl:--scl %{?scl}} %__osgi_requires %{!?scl:%{_rpmconfigdir}/osgi.req}%{?scl:%{_root_bindir}/true} -%__osgi_requires_opts --cachedir %{_builddir}/%{?buildsubdir} %{?scl:--scl %{?scl} --sclroot %{?_scl_root}} +%__osgi_requires_opts --cachedir %{_builddir}/%{?buildsubdir} %{?scl:--scl %{?scl}} %__osgi_path ^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$ diff --git a/python/javapackages/common/util.py b/python/javapackages/common/util.py index af38440..9d259f7 100644 --- a/python/javapackages/common/util.py +++ b/python/javapackages/common/util.py @@ -88,7 +88,6 @@ def _parse_argv(argv): parser = OptionParser() parser.add_option("--cachedir", dest="cachedir") parser.add_option("--scl", dest="scl", default=None) - parser.add_option("--sclroot", dest="sclroot", default=None) return parser.parse_args()

9 years, 3 months

1
0
0 / 0

[smack] update to 4.0.6

by gil

commit 058716f67d9c8f0244bd4d189505acef180c8860 Author: gil <puntogil(a)libero.it> Date: Thu Jan 1 21:59:25 2015 +0100 update to 4.0.6 smack.spec | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) --- diff --git a/smack.spec b/smack.spec index 5881c89..51aa146 100644 --- a/smack.spec +++ b/smack.spec @@ -25,7 +25,6 @@ Source12: smack-pom.xml BuildRequires: mvn(com.jamesmurty.utils:java-xmlbuilder) BuildRequires: mvn(com.jcraft:jzlib) -BuildRequires: mvn(dnsjava:dnsjava) # https://bugzilla.redhat.com/show_bug.cgi?id=1177451 BuildRequires: mvn(de.measite.minidns:minidns) BuildRequires: mvn(dnsjava:dnsjava)

9 years, 3 months

1
0
0 / 0

[smack] update to 4.0.6

by gil

commit a2003a634e5cd20b427d168c6d7ba7fe208f8aeb Author: gil <puntogil(a)libero.it> Date: Thu Jan 1 21:58:30 2015 +0100 update to 4.0.6 smack.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/smack.spec b/smack.spec index 4591422..5881c89 100644 --- a/smack.spec +++ b/smack.spec @@ -59,7 +59,7 @@ Summary: Javadoc for %{name} This package contains javadoc for %{name}. %prep -%setup -q -n %{name}-%{version} +%setup -q -n Smack-%{version} # cleanup find . -name "*.class" -print -delete find . -name "*.dll" -print -delete

9 years, 3 months

1
0
0 / 0

[smack] update to 4.0.6

by gil

commit bb85ab8b9d9df0dc6db6f861371c9c0964edfca8 Author: gil <gil(a)localhost.localdomain> Date: Thu Jan 1 21:39:23 2015 +0100 update to 4.0.6 .gitignore | 1 + smack-3.2.2-CVE-2014-0363.patch | 505 --------------------------------- smack-3.2.2-CVE-2014-5075.patch | 118 -------- smack-3.2.2-build.patch | 169 ----------- smack-3.2.2-test-config-test-case.xml | 16 - smack-3.2.2.pom | 55 ---- smack-bosh-4.0.6.pom | 56 ++++ smack-compression-jzlib-4.0.6.pom | 56 ++++ smack-core-4.0.6.pom | 79 +++++ smack-debug-4.0.6.pom | 50 ++++ smack-experimental-4.0.6.pom | 58 ++++ smack-extensions-4.0.6.pom | 51 ++++ smack-legacy-4.0.6.pom | 57 ++++ smack-pom.xml | 58 ++++ smack-resolver-dnsjava-4.0.6.pom | 57 ++++ smack-resolver-javax-4.0.6.pom | 51 ++++ smack-resolver-minidns-4.0.6.pom | 63 ++++ smack-tcp-4.0.6.pom | 49 ++++ smack.spec | 236 +++++++++++----- smackx-3.2.2.pom | 54 ---- smackx-debug-3.2.2.pom | 50 ---- sources | 2 +- 22 files changed, 846 insertions(+), 1045 deletions(-) --- diff --git a/.gitignore b/.gitignore index ca01ce9..81d38d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /smack_src_3_2_2.tar.gz +/4.0.6.tar.gz diff --git a/smack-bosh-4.0.6.pom b/smack-bosh-4.0.6.pom new file mode 100644 index 0000000..9f33fc4 --- /dev/null +++ b/smack-bosh-4.0.6.pom @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-bosh</artifactId> + <version>4.0.6</version> + <name>Smack</name> + <description>Smack BOSH API. +This API is considered beta quality.</description> + <url>http://www.igniterealtime.org/projects/smack/</url> + <inceptionYear>2003</inceptionYear> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <developers> + <developer> + <id>flow</id> + <name>Florian Schmaus</name> + <email>flow(a)igniterealtime.org</email> + </developer> + </developers> + <issueManagement> + <system>JIRA</system> + <url>https://igniterealtime.org/issues/browse/SMACK</url> + </issueManagement> + <scm> + <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection> + <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection> + <url>https://github.com/igniterealtime/Smack</url> + </scm> + <distributionManagement> + <snapshotRepository> + <id>smack.snapshot</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> + </snapshotRepository> + </distributionManagement> + <dependencies> + <dependency> + <groupId>org.igniterealtime.jbosh</groupId> + <artifactId>jbosh</artifactId> + <version>0.8.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-core</artifactId> + <version>4.0.6</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> diff --git a/smack-compression-jzlib-4.0.6.pom b/smack-compression-jzlib-4.0.6.pom new file mode 100644 index 0000000..0f5d2d3 --- /dev/null +++ b/smack-compression-jzlib-4.0.6.pom @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-compression-jzlib</artifactId> + <version>4.0.6</version> + <name>Smack</name> + <description>Compression with jzlib +Allow to compress the XMPP stream with help of jzlib.</description> + <url>http://www.igniterealtime.org/projects/smack/</url> + <inceptionYear>2003</inceptionYear> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <developers> + <developer> + <id>flow</id> + <name>Florian Schmaus</name> + <email>flow(a)igniterealtime.org</email> + </developer> + </developers> + <issueManagement> + <system>JIRA</system> + <url>https://igniterealtime.org/issues/browse/SMACK</url> + </issueManagement> + <scm> + <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection> + <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection> + <url>https://github.com/igniterealtime/Smack</url> + </scm> + <distributionManagement> + <snapshotRepository> + <id>smack.snapshot</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> + </snapshotRepository> + </distributionManagement> + <dependencies> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jzlib</artifactId> + <version>1.1.3</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-core</artifactId> + <version>4.0.6</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> diff --git a/smack-core-4.0.6.pom b/smack-core-4.0.6.pom new file mode 100644 index 0000000..d0922b0 --- /dev/null +++ b/smack-core-4.0.6.pom @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-core</artifactId> + <version>4.0.6</version> + <name>Smack</name> + <description>Smack core components.</description> + <url>http://www.igniterealtime.org/projects/smack/</url> + <inceptionYear>2003</inceptionYear> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <developers> + <developer> + <id>flow</id> + <name>Florian Schmaus</name> + <email>flow(a)igniterealtime.org</email> + </developer> + </developers> + <issueManagement> + <system>JIRA</system> + <url>https://igniterealtime.org/issues/browse/SMACK</url> + </issueManagement> + <scm> + <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection> + <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection> + <url>https://github.com/igniterealtime/Smack</url> + </scm> + <distributionManagement> + <snapshotRepository> + <id>smack.snapshot</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> + </snapshotRepository> + </distributionManagement> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.+</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.jamesmurty.utils</groupId> + <artifactId>java-xmlbuilder</artifactId> + <version>0.6+</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <version>1.5</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <version>1.5.+</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito</artifactId> + <version>1.5.+</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.4c</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> diff --git a/smack-debug-4.0.6.pom b/smack-debug-4.0.6.pom new file mode 100644 index 0000000..20d4d7e --- /dev/null +++ b/smack-debug-4.0.6.pom @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-debug</artifactId> + <version>4.0.6</version> + <name>Smack</name> + <description>Smack GUI debugger. +Inspect the exchanged XMPP stanzas.</description> + <url>http://www.igniterealtime.org/projects/smack/</url> + <inceptionYear>2003</inceptionYear> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <developers> + <developer> + <id>flow</id> + <name>Florian Schmaus</name> + <email>flow(a)igniterealtime.org</email> + </developer> + </developers> + <issueManagement> + <system>JIRA</system> + <url>https://igniterealtime.org/issues/browse/SMACK</url> + </issueManagement> + <scm> + <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection> + <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection> + <url>https://github.com/igniterealtime/Smack</url> + </scm> + <distributionManagement> + <snapshotRepository> + <id>smack.snapshot</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> + </snapshotRepository> + </distributionManagement> + <dependencies> + <dependency> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-core</artifactId> + <version>4.0.6</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> diff --git a/smack-experimental-4.0.6.pom b/smack-experimental-4.0.6.pom new file mode 100644 index 0000000..258c49d --- /dev/null +++ b/smack-experimental-4.0.6.pom @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-experimental</artifactId> + <version>4.0.6</version> + <name>Smack</name> + <description>Smack experimental extensions. +Classes and methods for XEPs that are in status 'experimental' or that should +otherwise carefully considered for deployment. The API may change even +between patch versions.</description> + <url>http://www.igniterealtime.org/projects/smack/</url> + <inceptionYear>2003</inceptionYear> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <developers> + <developer> + <id>flow</id> + <name>Florian Schmaus</name> + <email>flow(a)igniterealtime.org</email> + </developer> + </developers> + <issueManagement> + <system>JIRA</system> + <url>https://igniterealtime.org/issues/browse/SMACK</url> + </issueManagement> + <scm> + <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection> + <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection> + <url>https://github.com/igniterealtime/Smack</url> + </scm> + <distributionManagement> + <snapshotRepository> + <id>smack.snapshot</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> + </snapshotRepository> + </distributionManagement> + <dependencies> + <dependency> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-extensions</artifactId> + <version>4.0.6</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-core</artifactId> + <version>4.0.6</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> diff --git a/smack-extensions-4.0.6.pom b/smack-extensions-4.0.6.pom new file mode 100644 index 0000000..88831fb --- /dev/null +++ b/smack-extensions-4.0.6.pom @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-extensions</artifactId> + <version>4.0.6</version> + <name>Smack</name> + <description>Smack extensions. +Classes and methods that implement support for the various XMPP XEPs +(Multi-User Chat, PubSub, …) and other XMPP extensions.</description> + <url>http://www.igniterealtime.org/projects/smack/</url> + <inceptionYear>2003</inceptionYear> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <developers> + <developer> + <id>flow</id> + <name>Florian Schmaus</name> + <email>flow(a)igniterealtime.org</email> + </developer> + </developers> + <issueManagement> + <system>JIRA</system> + <url>https://igniterealtime.org/issues/browse/SMACK</url> + </issueManagement> + <scm> + <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection> + <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection> + <url>https://github.com/igniterealtime/Smack</url> + </scm> + <distributionManagement> + <snapshotRepository> + <id>smack.snapshot</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> + </snapshotRepository> + </distributionManagement> + <dependencies> + <dependency> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-core</artifactId> + <version>4.0.6</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> diff --git a/smack-legacy-4.0.6.pom b/smack-legacy-4.0.6.pom new file mode 100644 index 0000000..ceaa037 --- /dev/null +++ b/smack-legacy-4.0.6.pom @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-legacy</artifactId> + <version>4.0.6</version> + <name>Smack</name> + <description>Smack legacy extensions. +Usually XEPs in the state 'retracted', 'rejected', 'deprecated', +'obsolete' or in a long standing 'deferred' state.</description> + <url>http://www.igniterealtime.org/projects/smack/</url> + <inceptionYear>2003</inceptionYear> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <developers> + <developer> + <id>flow</id> + <name>Florian Schmaus</name> + <email>flow(a)igniterealtime.org</email> + </developer> + </developers> + <issueManagement> + <system>JIRA</system> + <url>https://igniterealtime.org/issues/browse/SMACK</url> + </issueManagement> + <scm> + <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection> + <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection> + <url>https://github.com/igniterealtime/Smack</url> + </scm> + <distributionManagement> + <snapshotRepository> + <id>smack.snapshot</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> + </snapshotRepository> + </distributionManagement> + <dependencies> + <dependency> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-extensions</artifactId> + <version>4.0.6</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-core</artifactId> + <version>4.0.6</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> diff --git a/smack-pom.xml b/smack-pom.xml new file mode 100644 index 0000000..7a09070 --- /dev/null +++ b/smack-pom.xml @@ -0,0 +1,58 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-parent</artifactId> + <packaging>pom</packaging> + <name>smack parent</name> + <version>@VERSION@</version> + <description>Smack is an Open Source XMPP (Jabber) client library for instant messaging and presence. This library provides the client side functionality as specified in the core XMPP specifications as related to the client side of said specifications.</description> + + <organization> + <name>Ignite Realtime</name> + <url>http://www.igniterealtime.org</url> + </organization> + <url>http://www.igniterealtime.org/projects/smack/</url> + <developers> + <developer> + <name>Robin Collier</name> + <timezone>-5</timezone> + <roles> + <role>Project Lead</role> + </roles> + </developer> + </developers> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> + <distribution>repo</distribution> + </license> + </licenses> + <issueManagement> + <system>jira</system> + <url>http://www.igniterealtime.org/issues/browse/SMACK</url> + </issueManagement> + <scm> + <connection>scm:svn:http://svn.igniterealtime.org/svn/repos/smack</connection> + <developerConnection>scm:svn:https://svn.igniterealtime.org/svn/repos/smack</developerConnection> + <url>http://svn.igniterealtime.org/svn/repos/smack</url> + </scm> + + <modules> +  + <module>smack-bosh</module> + <module>smack-core</module> + <module>smack-compression-jzlib</module> + <module>smack-debug</module> + <module>smack-experimental</module> + <module>smack-extensions</module> +  + <module>smack-legacy</module> + <module>smack-resolver-dnsjava</module> + <module>smack-resolver-javax</module> + <module>smack-resolver-minidns</module> + <module>smack-tcp</module> + </modules> + +</project> diff --git a/smack-resolver-dnsjava-4.0.6.pom b/smack-resolver-dnsjava-4.0.6.pom new file mode 100644 index 0000000..dfa11ed --- /dev/null +++ b/smack-resolver-dnsjava-4.0.6.pom @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-resolver-dnsjava</artifactId> + <version>4.0.6</version> + <name>Smack</name> + <description>DNS SRV with dnsjava +Use dnsjava for DNS SRV lookups. For platforms that don't provide the +javax.naming API (e.g. Android).</description> + <url>http://www.igniterealtime.org/projects/smack/</url> + <inceptionYear>2003</inceptionYear> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <developers> + <developer> + <id>flow</id> + <name>Florian Schmaus</name> + <email>flow(a)igniterealtime.org</email> + </developer> + </developers> + <issueManagement> + <system>JIRA</system> + <url>https://igniterealtime.org/issues/browse/SMACK</url> + </issueManagement> + <scm> + <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection> + <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection> + <url>https://github.com/igniterealtime/Smack</url> + </scm> + <distributionManagement> + <snapshotRepository> + <id>smack.snapshot</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> + </snapshotRepository> + </distributionManagement> + <dependencies> + <dependency> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-core</artifactId> + <version>4.0.6</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>dnsjava</groupId> + <artifactId>dnsjava</artifactId> + <version>2.1.+</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> diff --git a/smack-resolver-javax-4.0.6.pom b/smack-resolver-javax-4.0.6.pom new file mode 100644 index 0000000..4cc7ca8 --- /dev/null +++ b/smack-resolver-javax-4.0.6.pom @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-resolver-javax</artifactId> + <version>4.0.6</version> + <name>Smack</name> + <description>DNS SRV with Java7 +Use javax.naming for DNS SRV lookups. The javax.naming API is availabe in JavaSE +since Java7.</description> + <url>http://www.igniterealtime.org/projects/smack/</url> + <inceptionYear>2003</inceptionYear> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <developers> + <developer> + <id>flow</id> + <name>Florian Schmaus</name> + <email>flow(a)igniterealtime.org</email> + </developer> + </developers> + <issueManagement> + <system>JIRA</system> + <url>https://igniterealtime.org/issues/browse/SMACK</url> + </issueManagement> + <scm> + <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection> + <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection> + <url>https://github.com/igniterealtime/Smack</url> + </scm> + <distributionManagement> + <snapshotRepository> + <id>smack.snapshot</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> + </snapshotRepository> + </distributionManagement> + <dependencies> + <dependency> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-core</artifactId> + <version>4.0.6</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> diff --git a/smack-resolver-minidns-4.0.6.pom b/smack-resolver-minidns-4.0.6.pom new file mode 100644 index 0000000..045da64 --- /dev/null +++ b/smack-resolver-minidns-4.0.6.pom @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-resolver-minidns</artifactId> + <version>4.0.6</version> + <name>Smack</name> + <description>DNS SRV with minidns +Use minidns for DNS SRV lookups. For platforms that don't provide the +javax.naming API (e.g. Android).</description> + <url>http://www.igniterealtime.org/projects/smack/</url> + <inceptionYear>2003</inceptionYear> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <developers> + <developer> + <id>flow</id> + <name>Florian Schmaus</name> + <email>flow(a)igniterealtime.org</email> + </developer> + </developers> + <issueManagement> + <system>JIRA</system> + <url>https://igniterealtime.org/issues/browse/SMACK</url> + </issueManagement> + <scm> + <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection> + <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection> + <url>https://github.com/igniterealtime/Smack</url> + </scm> + <distributionManagement> + <snapshotRepository> + <id>smack.snapshot</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> + </snapshotRepository> + </distributionManagement> + <dependencies> + <dependency> + <groupId>org.igniterealtime.jxmpp</groupId> + <artifactId>jxmpp-util-cache</artifactId> + <version>0.1.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-core</artifactId> + <version>4.0.6</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>de.measite.minidns</groupId> + <artifactId>minidns</artifactId> + <version>0.1.1</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> diff --git a/smack-tcp-4.0.6.pom b/smack-tcp-4.0.6.pom new file mode 100644 index 0000000..9072cdd --- /dev/null +++ b/smack-tcp-4.0.6.pom @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-tcp</artifactId> + <version>4.0.6</version> + <name>Smack</name> + <description>Smack for standard XMPP connections over TCP.</description> + <url>http://www.igniterealtime.org/projects/smack/</url> + <inceptionYear>2003</inceptionYear> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <developers> + <developer> + <id>flow</id> + <name>Florian Schmaus</name> + <email>flow(a)igniterealtime.org</email> + </developer> + </developers> + <issueManagement> + <system>JIRA</system> + <url>https://igniterealtime.org/issues/browse/SMACK</url> + </issueManagement> + <scm> + <connection>scm:git:https://github.com/igniterealtime/Smack.git</connection> + <developerConnection>scm:git:https://github.com/igniterealtime/Smack.git</developerConnection> + <url>https://github.com/igniterealtime/Smack</url> + </scm> + <distributionManagement> + <snapshotRepository> + <id>smack.snapshot</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> + </snapshotRepository> + </distributionManagement> + <dependencies> + <dependency> + <groupId>org.igniterealtime.smack</groupId> + <artifactId>smack-core</artifactId> + <version>4.0.6</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> diff --git a/smack.spec b/smack.spec index 4b4dba0..4591422 100644 --- a/smack.spec +++ b/smack.spec @@ -1,49 +1,47 @@ -%global pkg_version %(echo %version | tr . _) Name: smack -Version: 3.2.2 -Release: 8%{?dist} +Version: 4.0.6 +Release: 1%{?dist} Summary: Open Source XMPP (Jabber) client library License: ASL 2.0 URL: http://www.igniterealtime.org/projects/smack/index.jsp -# http://svn.igniterealtime.org/svn/repos/smack/tags/ -Source0: http://download.igniterealtime.org/smack/%{name}_src_%{pkg_version}.tar.gz -# originally taken from http://repo1.maven.org/maven2/org/igniterealtime/smack/ -# change version -# add xpp3 -Source1: %{name}-%{version}.pom -# add jzlib as system deps -Source2: %{name}x-%{version}.pom -Source3: %{name}x-debug-%{version}.pom -# unavailable test resources -# wget -O smack-3.2.2-test-config-test-case.xml http://svn.igniterealtime.org/svn/repos/smack/tags/smack_3_2_2/test/confi... -Source4: %{name}-%{version}-test-config-test-case.xml -# use system libraries -# disable jzlib and xpp3 repackage -# disable smack jingle extension. cause: unavailable deps -# remove classpath from manifest files -# fix javadoc link -# fix build/javadoc/tests classpath -Patch0: %{name}-%{version}-build.patch - -Patch1: %{name}-3.2.2-CVE-2014-5075.patch -Patch2: %{name}-3.2.2-CVE-2014-0363.patch - -BuildRequires: java-javadoc -BuildRequires: javapackages-local - -BuildRequires: ant -BuildRequires: ant-contrib -BuildRequires: ant-junit -BuildRequires: aqute-bnd -BuildRequires: junit -BuildRequires: jzlib -BuildRequires: xmlunit -BuildRequires: xpp3 -%if %{?fedora} > 20 +Source0: https://github.com/igniterealtime/Smack/archive/%{version}.tar.gz +Source1: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-core/%{versi... +Source2: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-compression-... +Source3: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-debug/%{vers... +Source4: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-experimental... +Source5: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-extensions/%... +Source6: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-legacy/%{ver... +Source7: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-resolver-dns... +Source8: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-resolver-jav... +Source9: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-tcp/%{versio... +Source10: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-bosh/%{versi... +Source11: http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-resolver-min... + +# http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-jingle/4.0.0... +# javax.media:jmf:2.1.1e + +# Default use gradle +Source12: smack-pom.xml + +BuildRequires: mvn(com.jamesmurty.utils:java-xmlbuilder) +BuildRequires: mvn(com.jcraft:jzlib) +BuildRequires: mvn(dnsjava:dnsjava) +# https://bugzilla.redhat.com/show_bug.cgi?id=1177451 +BuildRequires: mvn(de.measite.minidns:minidns) +BuildRequires: mvn(dnsjava:dnsjava) +BuildRequires: mvn(junit:junit) +# https://bugzilla.redhat.com/show_bug.cgi?id=1177442 +BuildRequires: mvn(org.igniterealtime.jbosh:jbosh) +# https://bugzilla.redhat.com/show_bug.cgi?id=1177453 +BuildRequires: mvn(org.igniterealtime.jxmpp:jxmpp-util-cache) +BuildRequires: mvn(org.mockito:mockito-core) +BuildRequires: mvn(org.powermock:powermock-api-mockito) +BuildRequires: mvn(org.powermock:powermock-module-junit4) +BuildRequires: mvn(org.powermock:powermock-reflect) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) -%else -BuildRequires: mvn(org.sonatype.oss:oss-parent) -%endif +BuildRequires: mvn(xmlunit:xmlunit) +BuildRequires: mvn(xpp3:xpp3) +BuildRequires: maven-local BuildArch: noarch @@ -61,7 +59,7 @@ Summary: Javadoc for %{name} This package contains javadoc for %{name}. %prep -%setup -q -n %{name}_src_%{pkg_version} +%setup -q -n %{name}-%{version} # cleanup find . -name "*.class" -print -delete find . -name "*.dll" -print -delete @@ -70,53 +68,137 @@ find . -name "*.jar" -print -delete # remove prebuilt documentation rm -rf javadoc/* documentation/* -%patch0 -p0 -%if %{?fedora} > 21 -sed -i.ant-contrib "s|%{_javadir}/ant/ant-contrib.jar|%{_javadir}/ant-contrib/ant-contrib.jar|" build/build.xml -%endif -%patch1 -p1 -%patch2 -p1 - -mkdir -p test/config -cp -p %{SOURCE4} test/config/test-case.xml -# tests problem: -# caused by: java.net.ConnectException: Connection refused -# remove this file unavailable class, in this release isn't available. error: cannot find symbol -# [javac] import org.jivesoftware.smackx.bytestreams.socks5.Socks5PacketUtils; -rm -r test/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java -# these tests fails -rm -r test/org/jivesoftware/smack/ChatTest.java \ - test/org/jivesoftware/smack/FloodTest.java \ - test/org/jivesoftware/smack/IQTest.java \ - test/org/jivesoftware/smack/LoginTest.java \ - test/org/jivesoftware/smack/MessageTest.java \ - test/org/jivesoftware/smack/PacketReaderTest.java \ - test/org/jivesoftware/smack/PresenceTest.java \ - test/org/jivesoftware/smack/ReconnectionTest.java \ - test/org/jivesoftware/smack/RosterListenerTest.java \ - test/org/jivesoftware/smack/RosterSmackTest.java \ - test/org/jivesoftware/smack/RosterInitializedBeforeConnectTest.java \ - test/org/jivesoftware/smack/packet/PrivacyTest.java +cp -p %{SOURCE1} %{name}-core/pom.xml +cp -p %{SOURCE2} %{name}-compression-jzlib/pom.xml +cp -p %{SOURCE3} %{name}-debug/pom.xml +cp -p %{SOURCE4} %{name}-experimental/pom.xml +cp -p %{SOURCE5} %{name}-extensions/pom.xml +cp -p %{SOURCE6} %{name}-legacy/pom.xml +cp -p %{SOURCE7} %{name}-resolver-dnsjava/pom.xml +cp -p %{SOURCE8} %{name}-resolver-javax/pom.xml +cp -p %{SOURCE9} %{name}-tcp/pom.xml +cp -p %{SOURCE10} %{name}-bosh/pom.xml +cp -p %{SOURCE11} %{name}-resolver-minidns/pom.xml + +cp -p %{SOURCE12} pom.xml +sed -i "s|@VERSION@|%{version}|" pom.xml + +for m in core compression-jzlib debug experimental extensions legacy resolver-dnsjava resolver-javax tcp bosh resolver-minidns; do + +%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin %{name}-${m} " +<configuration> + <archive> + <manifestFile>\${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + </manifest> + </archive> +</configuration>" + +%pom_add_plugin org.apache.felix:maven-bundle-plugin %{name}-${m} " +<extensions>true</extensions> +<configuration> + <supportedProjectTypes> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>jar</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>\${project.artifactId}</Bundle-Name> + <Bundle-Version>\${project.version}</Bundle-Version> + </instructions> +</configuration> +<executions> + <execution> + <id>bundle-manifest</id> + <phase>process-classes</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> +</executions>" + +%pom_add_plugin org.apache.maven.plugins:maven-compiler-plugin %{name}-${m} " +<configuration> + <source>1.7</source> + <target>1.7</target> +</configuration>" + +sed -i "s|name>Smack|name>Smack ${m}|" %{name}-${m}/pom.xml + +done + +# Fix test deps +%pom_add_dep junit:junit::test %{name}-extensions +#%%pom_add_dep org.hamcrest:hamcrest-all::test %%{name}-extensions +%pom_add_dep com.jamesmurty.utils:java-xmlbuilder::test %{name}-extensions +%pom_add_dep org.mockito:mockito-core::test %{name}-extensions +%pom_add_dep org.powermock:powermock-reflect::test %{name}-extensions +# org.powermock:powermock-api-mockito +%pom_add_dep xmlunit:xmlunit::test %{name}-extensions +%pom_add_dep junit:junit::test %{name}-experimental +%pom_add_dep junit:junit::test %{name}-legacy +%pom_add_dep junit:junit::test %{name}-tcp + +# package org.jivesoftware.smack.test.util does not exist +rm -r %{name}-extensions/src/test/java/org/jivesoftware/smackx/iqlast/LastActivityTest.java \ + %{name}-extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java \ + %{name}-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java \ + %{name}-extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java \ + %{name}-extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java \ + %{name}-extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesExtensionTest.java \ + %{name}-extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/PrivacyProviderTest.java \ + %{name}-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java \ + %{name}-extensions/src/test/java/org/jivesoftware/smackx/iqversion/VersionTest.java \ + %{name}-extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java \ + %{name}-extensions/src/test/java/org/jivesoftware/smackx/time/packet/TimeTest.java \ + %{name}-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java \ + %{name}-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java \ + %{name}-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProviderTest.java \ + %{name}-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProviderTest.java \ + %{name}-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java \ + %{name}-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProviderTest.java + +# org.junit.ComparisonFailure +rm -r %{name}-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java + +# expected null, but was:<en> +rm -r %{name}-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java + +# fix non ASCII chars +for s in %{name}-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java \ + %{name}-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java \ + %{name}-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java \ + %{name}-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java \ + %{name}-extensions/src/main/java/org/jivesoftware/smackx/caps/packet/CapsExtension.java \ + %{name}-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java \ + %{name}-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java \ + %{name}-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/EntityCapsPersistentCache.java;do + native2ascii -encoding UTF8 ${s} ${s} +done %build -%ant -f build/build.xml jar javadoc test +%mvn_package :%{name}-parent __noinstall +%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 %install -%mvn_artifact %{SOURCE1} target/%{name}.jar -%mvn_artifact %{SOURCE2} target/%{name}x.jar -%mvn_artifact %{SOURCE3} target/%{name}x-debug.jar -%mvn_alias : jivesoftware: -%mvn_install -J target/javadoc +%mvn_install %files -f .mfiles %dir %{_javadir}/%{name} -%doc README.html changelog.html +%doc README.md resources/releasedocs/README.html resources/releasedocs/changelog.html %files javadoc -f .mfiles-javadoc -%doc README.html +%doc resources/releasedocs/README.html resources/releasedocs/changelog.html %changelog +* Wed Dec 24 2014 gil cattaneo <puntogil(a)libero.it> 4.0.6-1 +- update to 4.0.6 + +* Thu Dec 04 2014 gil cattaneo <puntogil(a)libero.it> 4.0.0-1 +- update to 4.0.0 + * Thu Dec 04 2014 gil cattaneo <puntogil(a)libero.it> 3.2.2-8 - fix for CVE-2014-0363 (rhbz#1093274) - remove jzlib systemPath in smackx pom diff --git a/sources b/sources index e32b80b..dda0246 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c9ac5d70711fabb404eb12d28fc1071 smack_src_3_2_2.tar.gz +a426619d7a4960d3e8bb7323baece0be 4.0.6.tar.gz

9 years, 3 months

1
0
0 / 0

File 4.0.6.tar.gz uploaded to lookaside cache by gil

by gil

A file has been added to the lookaside cache for smack: a426619d7a4960d3e8bb7323baece0be 4.0.6.tar.gz

9 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits January 2015