[curator] Initial import
by tstclair
Summary of changes:
b0f827c... Initial import (*)
(*) This commit already existed in another branch; no separate mail sent
9 years, 5 months
[curator/f20] Initial import
by tstclair
commit b0f827c6abc82a8fae4e990275e5921a2caabb50
Author: Timothy St. Clair <tstclair(a)redhat.com>
Date: Fri Nov 1 11:42:38 2013 -0500
Initial import
.gitignore | 1 +
curator-2.2.0-commons-math3.patch | 52 ++++++++++++++++
curator-2.2.0-jetty9.patch | 123 +++++++++++++++++++++++++++++++++++++
curator.spec | 93 ++++++++++++++++++++++++++++
sources | 1 +
5 files changed, 270 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..c16c773 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/apache-curator-2.2.0-incubating-source-release.zip
diff --git a/curator-2.2.0-commons-math3.patch b/curator-2.2.0-commons-math3.patch
new file mode 100644
index 0000000..4ecc433
--- /dev/null
+++ b/curator-2.2.0-commons-math3.patch
@@ -0,0 +1,52 @@
+diff -Nru apache-curator-2.2.0-incubating/curator-recipes/src/test/java/org/apache/curator/framework/recipes/atomic/TestDistributedAtomicLong.java apache-curator-2.2.0-incubating-gil/curator-recipes/src/test/java/org/apache/curator/framework/recipes/atomic/TestDistributedAtomicLong.java
+--- apache-curator-2.2.0-incubating/curator-recipes/src/test/java/org/apache/curator/framework/recipes/atomic/TestDistributedAtomicLong.java 2013-07-04 18:09:10.000000000 +0200
++++ apache-curator-2.2.0-incubating-gil/curator-recipes/src/test/java/org/apache/curator/framework/recipes/atomic/TestDistributedAtomicLong.java 2013-10-11 01:37:05.486241243 +0200
+@@ -24,8 +24,8 @@
+ import org.apache.curator.framework.recipes.BaseClassForTests;
+ import org.apache.curator.retry.ExponentialBackoffRetry;
+ import org.apache.curator.retry.RetryOneTime;
+-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
+-import org.apache.commons.math.stat.descriptive.SynchronizedSummaryStatistics;
++import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
++import org.apache.commons.math3.stat.descriptive.SynchronizedSummaryStatistics;
+ import org.testng.Assert;
+ import org.testng.annotations.Test;
+ import org.testng.collections.Lists;
+diff -Nru apache-curator-2.2.0-incubating/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java apache-curator-2.2.0-incubating-gil/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java
+--- apache-curator-2.2.0-incubating/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java 2013-06-29 19:58:12.000000000 +0200
++++ apache-curator-2.2.0-incubating-gil/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java 2013-10-11 01:37:05.487241183 +0200
+@@ -28,7 +28,7 @@
+ import org.apache.curator.retry.RetryOneTime;
+ import org.apache.curator.test.Timing;
+ import junit.framework.Assert;
+-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
++import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
+ import org.testng.annotations.Test;
+ import java.util.Set;
+ import java.util.concurrent.CountDownLatch;
+diff -Nru apache-curator-2.2.0-incubating/curator-test/pom.xml apache-curator-2.2.0-incubating-gil/curator-test/pom.xml
+--- apache-curator-2.2.0-incubating/curator-test/pom.xml 2013-07-31 19:12:34.000000000 +0200
++++ apache-curator-2.2.0-incubating-gil/curator-test/pom.xml 2013-10-11 01:38:07.609478250 +0200
+@@ -44,8 +44,8 @@
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+- <artifactId>commons-math</artifactId>
+- <version>2.2</version>
++ <artifactId>commons-math3</artifactId>
++ <version>3.2</version>
+ </dependency>
+ </dependencies>
+ </project>
+diff -Nru apache-curator-2.2.0-incubating/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestStrategies.java apache-curator-2.2.0-incubating-gil/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestStrategies.java
+--- apache-curator-2.2.0-incubating/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestStrategies.java 2013-06-29 19:58:12.000000000 +0200
++++ apache-curator-2.2.0-incubating-gil/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestStrategies.java 2013-10-11 01:37:05.488241122 +0200
+@@ -23,7 +23,7 @@
+ import org.apache.curator.x.discovery.strategies.RandomStrategy;
+ import org.apache.curator.x.discovery.strategies.RoundRobinStrategy;
+ import org.apache.curator.x.discovery.strategies.StickyStrategy;
+-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
++import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
+ import org.testng.Assert;
+ import org.testng.annotations.Test;
+ import java.util.List;
diff --git a/curator-2.2.0-jetty9.patch b/curator-2.2.0-jetty9.patch
new file mode 100644
index 0000000..576d765
--- /dev/null
+++ b/curator-2.2.0-jetty9.patch
@@ -0,0 +1,123 @@
+diff -Nru apache-curator-2.2.0-incubating/curator-x-discovery-server/pom.xml apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/pom.xml
+--- apache-curator-2.2.0-incubating/curator-x-discovery-server/pom.xml 2013-07-31 19:12:34.000000000 +0200
++++ apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/pom.xml 2013-10-11 00:50:27.293103260 +0200
+@@ -100,9 +100,16 @@
+ </dependency>
+
+ <dependency>
+- <groupId>org.mortbay.jetty</groupId>
+- <artifactId>jetty</artifactId>
+- <version>6.1.22</version>
++ <groupId>org.eclipse.jetty</groupId>
++ <artifactId>jetty-server</artifactId>
++ <version>9.0.3</version>
++ <scope>test</scope>
++ </dependency>
++
++ <dependency>
++ <groupId>org.eclipse.jetty</groupId>
++ <artifactId>jetty-servlet</artifactId>
++ <version>9.0.3</version>
+ <scope>test</scope>
+ </dependency>
+
+diff -Nru apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java
+--- apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java 2013-06-29 19:58:12.000000000 +0200
++++ apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java 2013-10-11 01:31:17.896361960 +0200
+@@ -40,9 +40,9 @@
+ import org.apache.curator.x.discovery.server.entity.ServiceNames;
+ import org.apache.curator.x.discovery.server.mocks.MockServiceDiscovery;
+ import org.apache.curator.x.discovery.strategies.RandomStrategy;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.servlet.Context;
+-import org.mortbay.jetty.servlet.ServletHolder;
++import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.servlet.ServletContextHandler;
++import org.eclipse.jetty.servlet.ServletHolder;
+ import org.testng.annotations.AfterMethod;
+ import org.testng.annotations.BeforeMethod;
+ import org.testng.annotations.Test;
+@@ -93,7 +93,7 @@
+
+ port = InstanceSpec.getRandomPort();
+ server = new Server(port);
+- Context root = new Context(server, "/", Context.SESSIONS);
++ ServletContextHandler root = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS);
+ root.addServlet(new ServletHolder(container), "/*");
+ server.start();
+ }
+diff -Nru apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java
+--- apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java 2013-06-29 19:58:12.000000000 +0200
++++ apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java 2013-10-11 01:31:45.104703519 +0200
+@@ -26,9 +26,9 @@
+ import junit.framework.Assert;
+
+ import org.apache.curator.test.InstanceSpec;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.servlet.Context;
+-import org.mortbay.jetty.servlet.ServletHolder;
++import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.servlet.ServletContextHandler;
++import org.eclipse.jetty.servlet.ServletHolder;
+
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Sets;
+@@ -94,7 +94,7 @@
+
+ port = InstanceSpec.getRandomPort();
+ server = new Server(port);
+- Context root = new Context(server, "/", Context.SESSIONS);
++ ServletContextHandler root = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS);
+ root.addServlet(new ServletHolder(container), "/*");
+ server.start();
+ }
+diff -Nru apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java
+--- apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java 2013-06-29 19:58:12.000000000 +0200
++++ apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java 2013-10-11 01:03:11.767769021 +0200
+@@ -39,9 +39,9 @@
+ import com.sun.jersey.api.core.DefaultResourceConfig;
+ import com.sun.jersey.spi.container.servlet.ServletContainer;
+ import junit.framework.Assert;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.servlet.Context;
+-import org.mortbay.jetty.servlet.ServletHolder;
++import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.servlet.ServletContextHandler;
++import org.eclipse.jetty.servlet.ServletHolder;
+ import org.testng.annotations.AfterMethod;
+ import org.testng.annotations.BeforeMethod;
+ import org.testng.annotations.Test;
+@@ -91,7 +91,7 @@
+
+ port = InstanceSpec.getRandomPort();
+ server = new Server(port);
+- Context root = new Context(server, "/", Context.SESSIONS);
++ ServletContextHandler root = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS);
+ root.addServlet(new ServletHolder(container), "/*");
+ server.start();
+ }
+diff -Nru apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
+--- apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java 2013-06-29 19:58:12.000000000 +0200
++++ apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java 2013-10-11 01:04:35.885692654 +0200
+@@ -30,9 +30,9 @@
+ import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
+ import org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap;
+ import org.jboss.resteasy.spi.ResteasyProviderFactory;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.servlet.Context;
+-import org.mortbay.jetty.servlet.ServletHolder;
++import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.servlet.ServletContextHandler;
++import org.eclipse.jetty.servlet.ServletHolder;
+ import org.testng.annotations.AfterMethod;
+ import org.testng.annotations.BeforeMethod;
+ import org.testng.annotations.Test;
+@@ -64,7 +64,7 @@
+
+ port = InstanceSpec.getRandomPort();
+ server = new Server(port);
+- Context root = new Context(server, "/", Context.SESSIONS);
++ ServletContextHandler root = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS);
+ root.getInitParams().put("javax.ws.rs.Application", RestEasyApplication.class.getName());
+ root.addServlet(new ServletHolder(dispatcher), "/*");
+ root.addEventListener(new ResteasyBootstrap());
diff --git a/curator.spec b/curator.spec
new file mode 100644
index 0000000..2298219
--- /dev/null
+++ b/curator.spec
@@ -0,0 +1,93 @@
+%global namedreltag -incubating
+%global namedversion %{version}%{?namedreltag}
+Name: curator
+Version: 2.2.0
+Release: 1%{?dist}
+Summary: A set of Java libraries that make using Apache ZooKeeper much easier
+License: ASL 2.0
+URL: http://curator.incubator.apache.org/
+Source0: http://www.apache.org/dist/incubator/%{name}/%{namedversion}/apache-%{nam...
+# Fix test deps
+Patch0: %{name}-2.2.0-jetty9.patch
+Patch1: %{name}-2.2.0-commons-math3.patch
+
+BuildRequires: java-devel
+# guava 14.0.1
+BuildRequires: mvn(com.google.guava:guava)
+BuildRequires: mvn(com.google.inject:guice)
+BuildRequires: mvn(javax.ws.rs:jsr311-api)
+BuildRequires: mvn(org.apache.commons:commons-math3)
+BuildRequires: mvn(org.apache.zookeeper:zookeeper)
+BuildRequires: mvn(org.codehaus.jackson:jackson-mapper-asl)
+BuildRequires: mvn(org.javassist:javassist)
+BuildRequires: mvn(org.slf4j:slf4j-api)
+
+# Test depsle
+BuildRequires: mvn(com.sun.jersey:jersey-client)
+BuildRequires: mvn(com.sun.jersey:jersey-core)
+BuildRequires: mvn(com.sun.jersey:jersey-server)
+BuildRequires: mvn(com.sun.jersey:jersey-servlet)
+BuildRequires: mvn(log4j:log4j)
+BuildRequires: mvn(org.eclipse.jetty:jetty-server)
+BuildRequires: mvn(org.eclipse.jetty:jetty-servlet)
+# resteasy 2.3.0.GA
+BuildRequires: mvn(org.jboss.resteasy:resteasy-jaxrs)
+BuildRequires: mvn(org.mockito:mockito-core)
+BuildRequires: mvn(org.scannotation:scannotation)
+BuildRequires: mvn(org.testng:testng)
+
+BuildRequires: maven-local
+BuildRequires: maven-doxia-module-confluence
+BuildRequires: maven-plugin-bundle
+BuildRequires: maven-remote-resources-plugin
+BuildRequires: maven-site-plugin
+
+BuildArch: noarch
+
+%description
+Curator is a set of Java libraries that
+make using Apache ZooKeeper much easier.
+
+%package javadoc
+Summary: Javadoc for %{name}
+
+%description javadoc
+This package contains javadoc for %{name}
+
+%prep
+%setup -q -n apache-%{name}-%{namedversion}
+find -name '*.class' -print -delete
+find -name '*.jar' -print -delete
+
+%patch0 -p1
+%patch1 -p1
+
+# disable cause build failure
+%pom_remove_plugin :maven-license-plugin
+
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'scannotation' ]/pom:groupId" org.scannotation %{name}-x-discovery-server
+
+# remove flakey tests
+rm -f curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestDistributedQueue.java
+rm -f curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestBoundedDistributedQueue.java
+rm -f curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java
+rm -f curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
+
+
+%build
+
+%mvn_build
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%dir %{_javadir}/%{name}
+%doc DISCLAIMER LICENSE NOTICE README
+
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
+
+%changelog
+* Thu Oct 10 2013 gil cattaneo <puntogil(a)libero.it> 2.2.0-1
+- initial rpm
diff --git a/sources b/sources
index e69de29..a6df5ea 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+15b28f4b7cd9c4f8ba6a74c8c8857e51 apache-curator-2.2.0-incubating-source-release.zip
9 years, 5 months
[javapackages] [maven.req] Handle dependecies with "UNKNOWN" version from XMvn
by Stanislav Ochotnicky
commit 56299685f637422f2e0a36725cd9985200f3e993
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Nov 1 17:15:19 2013 +0100
[maven.req] Handle dependecies with "UNKNOWN" version from XMvn
XMvn can generate dependency with UNKNOWN version in some cases. The package can
build but it's impossible to figure out what requires should be generated
because we don't know the origin of given dependency. It could be ordinary
package, compat package or a package with some namespace.
In that case we fail the build and enforce packager to decide if the dependency
should be removed completely or a proper BuildRequires added.
depgenerators/maven.req | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index 6475ad2..5bd6c34 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -95,7 +95,12 @@ class TagBuilder:
base_package_requires.add("jpackage-utils")
for basereq in base_package_requires:
print basereq
+
+ unknown_deps = []
for dependency in depmap.get_required_artifacts():
+ if dependency.version == "UNKNOWN":
+ unknown_deps.append(dependency)
+ continue
for skipped in self.skipped_artifacts:
if (skipped.groupId == dependency.groupId and
skipped.artifactId == dependency.artifactId and
@@ -132,6 +137,16 @@ class TagBuilder:
dependency.extension = ""
print(dependency.get_rpm_str(dependency.version))
+ if unknown_deps:
+ unknown_msg = "Following dependencies were not resolved and " \
+ "requires cannot be generated. Either remove the " \
+ "dependency from pom.xml or add proper packages to " \
+ "BuildRequires:\n"
+ for unknown in unknown_deps:
+ unknown_msg = unknown_msg + \
+ "{art}\n".format(art=unknown)
+ raise Exception(unknown_msg)
+
if skipped_but_required:
skipped_msg = "Following artifacts were built " \
"but are not being installed however other " \
9 years, 5 months
[javapackages] [test] Test parsing Ivy modules
by Mikolaj Izdebski
commit 050e321a377f9ec118645c4c26180e126f190c2a
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Nov 1 15:56:30 2013 +0100
[test] Test parsing Ivy modules
python/test/data/ivy-simple.xml | 8 ++++++++
python/test/pom_test.py | 7 +++++++
2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/python/test/data/ivy-simple.xml b/python/test/data/ivy-simple.xml
new file mode 100644
index 0000000..42cfce9
--- /dev/null
+++ b/python/test/data/ivy-simple.xml
@@ -0,0 +1,8 @@
+<ivy-module version="2.0">
+ <info organisation="org.apache" module="hello-ivy" revision="1.2.3"/>
+ <dependencies>
+ <dependency org="junit" name="junit" rev="4.8.1">
+ <exclude org="org.hamcrest" module="hamcrest-core"/>
+ </dependency>
+ </dependencies>
+</ivy-module>
diff --git a/python/test/pom_test.py b/python/test/pom_test.py
index 7f7b41e..c98decd 100644
--- a/python/test/pom_test.py
+++ b/python/test/pom_test.py
@@ -75,6 +75,13 @@ class TestPOM(unittest.TestCase):
self.assertEqual(p.artifactId, "junit")
self.assertEqual(p.version, "4.11")
+ @pomfile("ivy-simple.xml")
+ def test_ivy_module(self, p):
+ self.assertEqual(p.packaging, "ivy")
+ self.assertEqual(p.groupId, "org.apache")
+ self.assertEqual(p.artifactId, "hello-ivy")
+ self.assertEqual(p.version, "1.2.3")
+
if __name__ == '__main__':
unittest.main()
9 years, 5 months
[javapackages] Add support for parsing Ivy modules
by Mikolaj Izdebski
commit 34d7022dd07017a5d25bcf563306c7875f5152af
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Nov 1 15:56:13 2013 +0100
Add support for parsing Ivy modules
python/javapackages/pom.py | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/python/javapackages/pom.py b/python/javapackages/pom.py
index 87a4f4d..b6e2448 100644
--- a/python/javapackages/pom.py
+++ b/python/javapackages/pom.py
@@ -69,6 +69,14 @@ class POM(object):
gId = self.__find('./pom:groupId')
if gId is None:
gId = self.__find('./pom:parent/pom:groupId')
+ if gId is None:
+ gId = self.__find('/ivy-module/info')
+ if gId is not None:
+ gId = gId.attrib["organisation"]
+ if gId is not None:
+ return gId
+ if gId is None:
+ raise PomLoadingException("Unable to determine groupId")
if len(gId) != 0:
raise PomLoadingException("Unexpected child nodes under groupId")
return gId.text.strip()
@@ -79,6 +87,14 @@ class POM(object):
Effective artifactId of the pom Artifact
"""
aId = self.__find('./pom:artifactId')
+ if aId is None:
+ aId = self.__find('/ivy-module/info')
+ if aId is not None:
+ aId = aId.attrib["module"]
+ if aId is not None:
+ return aId
+ if aId is None:
+ raise PomLoadingException("Unable to determine artifactID")
if len(aId) != 0:
raise PomLoadingException("Unexpected child nodes under artifactId")
return aId.text.strip()
@@ -92,7 +108,14 @@ class POM(object):
version = self.__find('./pom:version')
if version is None:
version = self.__find('./pom:parent/pom:version')
- assert version is not None
+ if version is None:
+ version = self.__find('/ivy-module/info')
+ if version is not None:
+ version = version.attrib["revision"]
+ if version is not None:
+ return version
+ if version is None:
+ raise PomLoadingException("Unable to determine artifact version")
if len(version) != 0:
raise PomLoadingException("Unexpected child nodes under version")
return version.text.strip()
@@ -107,4 +130,7 @@ class POM(object):
if len(p) != 0:
raise PomLoadingException("Unexpected child nodes under packaging")
return p.text.strip()
+ p = self.__find('/ivy-module/info')
+ if p is not None:
+ return 'ivy'
return None
9 years, 5 months
[Bug 1025614] New: Wake up from hibernate on timeout
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1025614
Bug ID: 1025614
Summary: Wake up from hibernate on timeout
Product: Fedora
Version: 19
Component: hibernate
Assignee: puntogil(a)libero.it
Reporter: denis(a)speran.info
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
puntogil(a)libero.it
Description of problem:
I seted up hibernation by timeout in Gnome Shell properties. And after waking
up I've got very strange situation. Seems that workable only X-server I can
open and close windows, but no reaction on command insertion in terminal- it
hungs up after pressing enter and no reaction to clicking on buttons "Power
off" or "Restart" just closing dialog windows. But most strange thing is if I
type pm-suspend or pm-hibernate in system in normal state (after hard reset)
I've got normal suspending to RAM or disk and normal waking up.
Version-Release number of selected component (if applicable):
3.11.6-200.fc19.i686.PAE
gnome-shell-3.8.4-2.fc19.i686
kmod-nvidia-3.11.6-200.fc19.i686-325.15-1.fc19.5.i686
xorg-x11-drv-nvidia-325.15-1.fc19.i686
akmod-nvidia-325.15-1.fc19.1.i686
xorg-x11-drv-nvidia-libs-325.15-1.fc19.i686
kmod-nvidia-3.11.6-200.fc19.i686.PAE-325.15-1.fc19.R.1.i686
How reproducible:
every time
Steps to Reproduce:
1. set up hibernate by timeot in gnome system settings
2. wait
3. try to wake up system
4. issue
Additional info:
bash-4.2$ lspci|grep VGA
03:00.0 VGA compatible controller: NVIDIA Corporation GT218 [ION] (rev a2)
I don't know what logs you need. Please tell me about it.
Regards, Dennis.
--
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=N2CnU67jvP&a=cc_unsubscribe
9 years, 5 months
[javapackages] [doc] Common errors - work in progress
by Michal Srb
commit e02a6c5e523996acc5517e2823d08520016bd9bf
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Nov 1 08:31:12 2013 +0100
[doc] Common errors - work in progress
doc/common_errors.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/doc/common_errors.txt b/doc/common_errors.txt
index dda1fef..5711fe9 100644
--- a/doc/common_errors.txt
+++ b/doc/common_errors.txt
@@ -1,4 +1,4 @@
Examples of common errors encountered during packaging, their explanations and
possible solutions and/or workarounds
-TODO - write content
+WORK IN PROGRESS - msrb
9 years, 5 months
[Bug 1022971] New: groovy18 should depend on jline1 in rawhide
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1022971
Bug ID: 1022971
Summary: groovy18 should depend on jline1 in rawhide
Product: Fedora
Version: rawhide
Component: groovy18
Assignee: puntogil(a)libero.it
Reporter: sgehwolf(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
msrb(a)redhat.com, puntogil(a)libero.it
This bug is filed because groovy18 in rawhide lists jline as R/BR in its spec
file. Please see bug 1022897 for more info. Note that jline will become version
2.x. It would be strongly preferred if your package could be made to work with
jline 2.x. If this is not possible please change the R/BR to jline1 (see bug
1022908).
Thanks for your cooperation!
--
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=nFa5C1GaDr&a=cc_unsubscribe
9 years, 5 months
[groovy18] Switch to jline1 (Resolves: rhbz#1022971)
by Michal Srb
commit e36dac5ac166cc04d2c2f25b8dd8df00a955e14e
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Nov 1 08:00:18 2013 +0100
Switch to jline1 (Resolves: rhbz#1022971)
groovy18.spec | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/groovy18.spec b/groovy18.spec
index 763a3e1..dc6492e 100644
--- a/groovy18.spec
+++ b/groovy18.spec
@@ -4,7 +4,7 @@
%global majorversion 1.8
Name: groovy18
Version: 1.8.9
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Dynamic language for the Java Platform
Group: Development/Languages
# Some of the files are licensed under BSD and CPL terms, but the CPL has been superceded
@@ -34,7 +34,7 @@ BuildRequires: apache-ivy
BuildRequires: bsf
BuildRequires: ecj
BuildRequires: jansi
-BuildRequires: jline
+BuildRequires: jline1
BuildRequires: junit
BuildRequires: tomcat-jsp-2.2-api
BuildRequires: tomcat-servlet-3.0-api
@@ -49,7 +49,7 @@ Requires: apache-commons-logging
Requires: apache-ivy
Requires: bsf
Requires: jansi
-Requires: jline
+Requires: jline1
Requires: junit
Requires: objectweb-asm
Requires: tomcat-jsp-2.2-api
@@ -113,7 +113,7 @@ build-jar-repository target/lib/compile servlet jsp \
objectweb-asm/asm-tree objectweb-asm/asm \
objectweb-asm/asm-util objectweb-asm/asm-analysis \
antlr ant/ant-antlr antlr \
- bsf jline xstream ant junit ivy commons-cli \
+ bsf jline1/jline-1 xstream ant junit ivy commons-cli \
jansi
# thanks to Mikolaj Izdebski
@@ -175,6 +175,9 @@ install -p -m644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
%doc LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt
%changelog
+* Fri Nov 01 2013 Michal Srb <msrb(a)redhat.com> - 1.8.9-5
+- Switch to jline1 (Resolves: rhbz#1022971)
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.8.9-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
9 years, 5 months