Commit cd29bfb113d42fc77759942155a9f8d1ba4669c4 - canl-java

+7

-0

debian/changelog less more

	0	canl-java (2.4.1-1) unstable; urgency=medium
	1
	2	* Update to version 2.4.0
	3	* Drop patch canl-java-test-fail.patch
	4
	5	-- Mattias Ellert <mattias.ellert@physics.uu.se> Sat, 10 Sep 2016 21:22:50 +0200
	6
0	7	canl-java (2.4.0-2) unstable; urgency=medium
1	8
2	9	* Disable test that fails under uneven load (Closes: #834958)

+1

-1

debian/copyright less more

0	0	Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
1	1	Upstream-Name: canl-java
2		Source: https://github.com/eu-emi/canl-java/archive/canl-2.4.0.tar.gz
	2	Source: https://github.com/eu-emi/canl-java/archive/canl-2.4.1.tar.gz
3	3
4	4	Files: *
5	5	Copyright: 2010-2012 ICM Uniwersytet Warszawski

+1

-1

debian/libcanl-java.poms less more

0		pom.xml --no-parent --java-lib --has-package-version
	0	pom.xml --java-lib --has-package-version

+1

-0

debian/maven.ignoreRules less more

2	2	org.apache.maven.plugins maven-source-plugin
3	3	org.apache.maven.wagon wagon-webdav-jackrabbit
4	4	org.codehaus.mojo javancss-maven-plugin
	5	org.sonatype.plugins nexus-staging-maven-plugin

+0

-13

~~debian/patches/canl-java-test-fail.patch~~ less more

0		diff --git a/src/test/java/eu/emi/security/authn/x509/impl/OpensslValidatorStressTest.java b/src/test/java/eu/emi/security/authn/x509/impl/OpensslValidatorStressTest.java
1		index 15af8cd..aeba4ce 100644
2		--- a/src/test/java/eu/emi/security/authn/x509/impl/OpensslValidatorStressTest.java
3		+++ b/src/test/java/eu/emi/security/authn/x509/impl/OpensslValidatorStressTest.java
4		@@ -61,7 +61,7 @@ public class OpensslValidatorStressTest
5		}
6
7
8		- @Test
9		+ // @Test
10		public void opensslValidationShouldBeParallel() throws Exception
11		{
12		final OpensslCertChainValidator validator = new OpensslCertChainValidator(

+23

-11

debian/patches/canl-java-test.patch less more

0		diff -ur canl-java-canl-2.1.1.orig/src/test/java/eu/emi/security/authn/x509/impl/CRLTest.java canl-java-canl-2.1.1/src/test/java/eu/emi/security/authn/x509/impl/CRLTest.java
1		--- canl-java-canl-2.1.1.orig/src/test/java/eu/emi/security/authn/x509/impl/CRLTest.java 2014-07-26 21:08:54.000000000 +0200
2		+++ canl-java-canl-2.1.1/src/test/java/eu/emi/security/authn/x509/impl/CRLTest.java 2015-07-11 15:25:49.496435543 +0200
3		@@ -195,7 +195,7 @@
	0	diff -ur canl-java-canl-2.4.1.orig/src/test/java/eu/emi/security/authn/x509/impl/CRLTest.java canl-java-canl-2.4.1/src/test/java/eu/emi/security/authn/x509/impl/CRLTest.java
	1	--- canl-java-canl-2.4.1.orig/src/test/java/eu/emi/security/authn/x509/impl/CRLTest.java 2016-09-04 13:05:33.000000000 +0200
	2	+++ canl-java-canl-2.4.1/src/test/java/eu/emi/security/authn/x509/impl/CRLTest.java 2016-09-11 09:23:58.723589516 +0200
	3	@@ -197,7 +197,7 @@
4	4	store.dispose();
5	5	}
6	6

9	9	public void testLoadPlain() throws Exception
10	10	{
11	11	File dir = initDir();
12		diff -ur canl-java-canl-2.1.1.orig/src/test/java/eu/emi/security/authn/x509/impl/TestSSLHelpers.java canl-java-canl-2.1.1/src/test/java/eu/emi/security/authn/x509/impl/TestSSLHelpers.java
13		--- canl-java-canl-2.1.1.orig/src/test/java/eu/emi/security/authn/x509/impl/TestSSLHelpers.java 2014-07-26 21:08:54.000000000 +0200
14		+++ canl-java-canl-2.1.1/src/test/java/eu/emi/security/authn/x509/impl/TestSSLHelpers.java 2015-07-11 15:24:16.466470241 +0200
	12	diff -ur canl-java-canl-2.4.1.orig/src/test/java/eu/emi/security/authn/x509/impl/TestSSLHelpers.java canl-java-canl-2.4.1/src/test/java/eu/emi/security/authn/x509/impl/TestSSLHelpers.java
	13	--- canl-java-canl-2.4.1.orig/src/test/java/eu/emi/security/authn/x509/impl/TestSSLHelpers.java 2016-09-04 13:05:33.000000000 +0200
	14	+++ canl-java-canl-2.4.1/src/test/java/eu/emi/security/authn/x509/impl/TestSSLHelpers.java 2016-09-11 09:23:58.750589821 +0200
15	15	@@ -35,7 +35,7 @@
16	16	"The test is invoked two times: once with valid credentials (data should be sent) " +
17	17	"and once with invalid (there should be a connection error)")

21	21	public void testCreation() throws Exception
22	22	{
23	23	System.out.println("Running func:cli-srv functional test");
24		diff -ur canl-java-canl-2.1.1.orig/src/test/java/eu/emi/security/authn/x509/proxy/ProxyGenerationTest.java canl-java-canl-2.1.1/src/test/java/eu/emi/security/authn/x509/proxy/ProxyGenerationTest.java
25		--- canl-java-canl-2.1.1.orig/src/test/java/eu/emi/security/authn/x509/proxy/ProxyGenerationTest.java 2014-07-26 21:08:54.000000000 +0200
26		+++ canl-java-canl-2.1.1/src/test/java/eu/emi/security/authn/x509/proxy/ProxyGenerationTest.java 2015-07-11 15:25:28.324215855 +0200
27		@@ -362,7 +362,7 @@
	24	diff -ur canl-java-canl-2.4.1.orig/src/test/java/eu/emi/security/authn/x509/ocsp/CacheTest.java canl-java-canl-2.4.1/src/test/java/eu/emi/security/authn/x509/ocsp/CacheTest.java
	25	--- canl-java-canl-2.4.1.orig/src/test/java/eu/emi/security/authn/x509/ocsp/CacheTest.java 2016-09-04 13:05:33.000000000 +0200
	26	+++ canl-java-canl-2.4.1/src/test/java/eu/emi/security/authn/x509/ocsp/CacheTest.java 2016-09-11 09:26:49.110513645 +0200
	27	@@ -170,7 +170,7 @@
	28	assertEquals(4, client.verifications);
	29	}
	30
	31	- @Test
	32	+ // @Test
	33	public void testErrorCaching() throws Exception
	34	{
	35	MockOCSPClient client = new MockOCSPClient();
	36	diff -ur canl-java-canl-2.4.1.orig/src/test/java/eu/emi/security/authn/x509/proxy/ProxyGenerationTest.java canl-java-canl-2.4.1/src/test/java/eu/emi/security/authn/x509/proxy/ProxyGenerationTest.java
	37	--- canl-java-canl-2.4.1.orig/src/test/java/eu/emi/security/authn/x509/proxy/ProxyGenerationTest.java 2016-09-04 13:05:33.000000000 +0200
	38	+++ canl-java-canl-2.4.1/src/test/java/eu/emi/security/authn/x509/proxy/ProxyGenerationTest.java 2016-09-11 09:23:58.751589832 +0200
	39	@@ -427,7 +427,7 @@
28	40	* "all sorts of certificates with SHA-2 digests work")
29	41	* @throws Exception
30	42	*/

+0

-3

debian/patches/series less more

0	0	# Disable tests that require network connections
1	1	canl-java-test.patch
2
3		# Disable test that fails under uneven load
4		canl-java-test-fail.patch