[bnd] 02/07: Refreshed the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Dec 17 08:58:09 UTC 2015 

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository bnd.

commit 97032ac2684e5ecc0380f3e1e8fefc8736347ac3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 16 16:49:28 2015 +0100

    Refreshed the patches
---
 debian/changelog                                   |   3 +-
 debian/patches/display_bsn_on_missing_bundle.patch |   2 +-
 debian/patches/embedded-repo.patch                 |   4 +-
 debian/patches/gradle-compatibility.patch          |  15 ---
 debian/patches/implement-missing-methods.patch     |   2 +-
 debian/patches/java8-compatibility.patch           |  46 ++++----
 debian/patches/no-ee.j2se.patch                    | 119 ++++++++++++++-------
 debian/patches/no-osgi.r5.patch                    |  14 +--
 debian/patches/no_ee_minimum.patch                 |  21 +++-
 debian/patches/series                              |   1 -
 10 files changed, 131 insertions(+), 96 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a6139d0..a4cc338 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
-bnd (2.3.0-1) UNRELEASED; urgency=medium
+bnd (2.4.0-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
     - Refreshed the patches
-    - Fixed a build failure with Gradle 2.x
     - Updated the Maven poms
     - Build with Gradle instead of Ant
     - Refreshed debian/copyright
diff --git a/debian/patches/display_bsn_on_missing_bundle.patch b/debian/patches/display_bsn_on_missing_bundle.patch
index d351eac..22100c6 100644
--- a/debian/patches/display_bsn_on_missing_bundle.patch
+++ b/debian/patches/display_bsn_on_missing_bundle.patch
@@ -12,7 +12,7 @@ Forwarded: no
 
 --- a/biz.aQute.bndlib/src/aQute/bnd/build/Project.java
 +++ b/biz.aQute.bndlib/src/aQute/bnd/build/Project.java
-@@ -950,8 +950,11 @@
+@@ -964,8 +964,11 @@
  						File file = plugin.get(bsn, version, attrs, blocker);
  						// and the entry must exist
  						// if it does, return this as a result
diff --git a/debian/patches/embedded-repo.patch b/debian/patches/embedded-repo.patch
index e09436a..edddb59 100644
--- a/debian/patches/embedded-repo.patch
+++ b/debian/patches/embedded-repo.patch
@@ -6,10 +6,10 @@ The embedded-repo.jar is not built. To avoid a FTBFS the error is commented
 out.
 --- a/biz.aQute.bndlib/src/aQute/bnd/build/Workspace.java
 +++ b/biz.aQute.bndlib/src/aQute/bnd/build/Workspace.java
-@@ -349,7 +349,7 @@
+@@ -401,7 +401,7 @@
  							return true;
  						}
- 							
+ 
 -						error("Couldn't find embedded-repo.jar in bundle ");
 +						//error("Couldn't find embedded-repo.jar in bundle ");
  					}
diff --git a/debian/patches/gradle-compatibility.patch b/debian/patches/gradle-compatibility.patch
deleted file mode 100644
index f48ca2d..0000000
--- a/debian/patches/gradle-compatibility.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cnf/gradle/template/clean.gradle
-+++ b/cnf/gradle/template/clean.gradle
-@@ -44,10 +44,12 @@
-   }
- 
-   /* regular gradle project dependencies */
-+/*
-   dependsOnProjects.each {
-     cleanNeeded.dependsOn       += [":" + it.name + ":cleanNeeded"    ]
-     distcleanNeeded.dependsOn   += [":" + it.name + ":distcleanNeeded"]
-   }
-+*/
- 
-   /* bnd project dependencies */
-   if (hasProperty("bnd_project")) {
diff --git a/debian/patches/implement-missing-methods.patch b/debian/patches/implement-missing-methods.patch
index c8f23de..7c538c6 100644
--- a/debian/patches/implement-missing-methods.patch
+++ b/debian/patches/implement-missing-methods.patch
@@ -9,7 +9,7 @@ R6.
 Forwarded: no
 --- a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
 +++ b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
-@@ -368,4 +368,11 @@
+@@ -370,4 +370,11 @@
  		// TODO Auto-generated method stub
  		return null;
  	}
diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch
index a08c794..de4c41e 100644
--- a/debian/patches/java8-compatibility.patch
+++ b/debian/patches/java8-compatibility.patch
@@ -21,8 +21,8 @@ Forwarded: no
 -import aQute.lib.base64.*;
 +import aQute.lib.base64.Base64;
  import aQute.lib.io.*;
+ import aQute.lib.zip.*;
  import aQute.service.reporter.*;
- 
 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java
 +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java
 @@ -42,7 +42,7 @@
@@ -69,7 +69,7 @@ Forwarded: no
  
 --- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
 +++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
-@@ -42,7 +42,7 @@
+@@ -43,7 +43,7 @@
  import aQute.bnd.service.repository.SearchableRepository.ResourceDescriptor;
  import aQute.bnd.version.*;
  import aQute.configurable.*;
@@ -80,9 +80,9 @@ Forwarded: no
  import aQute.lib.getopt.*;
 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Verifier.java
 +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Verifier.java
-@@ -10,7 +10,7 @@
- import aQute.bnd.osgi.Descriptors.PackageRef;
+@@ -12,7 +12,7 @@
  import aQute.bnd.osgi.Descriptors.TypeRef;
+ import aQute.bnd.util.dto.*;
  import aQute.bnd.version.*;
 -import aQute.lib.base64.*;
 +import aQute.lib.base64.Base64;
@@ -120,38 +120,17 @@ Forwarded: no
 +	}
 +
  }
---- a/biz.aQute.junit/bnd.bnd
-+++ b/biz.aQute.junit/bnd.bnd
-@@ -7,7 +7,7 @@
- Tester-Plugin: aQute.junit.plugin.ProjectTesterImpl
- 
- javac.source = 1.5
--javac.target = jsr14
-+javac.target = 1.5
- Private-Package: aQute.junit.*,\
- 	junit.*,\
- 	org.junit.*
---- a/biz.aQute.launcher/bnd.bnd
-+++ b/biz.aQute.launcher/bnd.bnd
-@@ -10,6 +10,6 @@
- 	
- Bundle-Version: 1.3.0.${tstamp}
- javac.source = 1.5
--javac.target = jsr14
-+javac.target = 1.5
- 
- Premain-Class: aQute.launcher.agent.LauncherAgent
 --- a/biz.aQute.bndlib/src/aQute/bnd/url/BasicAuthentication.java
 +++ b/biz.aQute.bndlib/src/aQute/bnd/url/BasicAuthentication.java
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
+ 
  import javax.net.ssl.*;
  
- import aQute.bnd.service.url.*;
 -import aQute.lib.base64.*;
 +import aQute.lib.base64.Base64;
- import aQute.libg.glob.*;
  
  /**
+  * Provide Http Basic Authentication. This URL Connection Handler plugin will
 --- a/biz.aQute.bndlib/src/aQute/bnd/url/BndAuthentication.java
 +++ b/biz.aQute.bndlib/src/aQute/bnd/url/BndAuthentication.java
 @@ -9,7 +9,7 @@
@@ -163,3 +142,14 @@ Forwarded: no
  import aQute.lib.hex.*;
  import aQute.lib.settings.*;
  
+--- a/aQute.libg/test/aQute/lib/hex/HexTest.java
++++ b/aQute.libg/test/aQute/lib/hex/HexTest.java
+@@ -3,7 +3,7 @@
+ import java.util.*;
+ 
+ import junit.framework.*;
+-import aQute.lib.base64.*;
++import aQute.lib.base64.Base64;
+ 
+ public class HexTest extends TestCase {
+ 
diff --git a/debian/patches/no-ee.j2se.patch b/debian/patches/no-ee.j2se.patch
index 2c4dcd8..96c2ba9 100644
--- a/debian/patches/no-ee.j2se.patch
+++ b/debian/patches/no-ee.j2se.patch
@@ -8,27 +8,27 @@ Forwarded: not-needed
 --- a/aQute.libg/bnd.bnd
 +++ b/aQute.libg/bnd.bnd
 @@ -1,5 +1,4 @@
---buildpath: com.springsource.junit,\
--	ee.j2se;version=${javac.ee}
-+-buildpath: com.springsource.junit
+--buildpath: \
+-    ee.j2se;version=${javac.ee}
++-buildpath:
+ -testpath: \
+     com.springsource.junit
  
- Export-Package: aQute.lib.*, aQute.libg.*, aQute.configurable, aQute.service.*
- Bundle-Version: 2.8.0.${tstamp;yyyyMMdd-HHmmss}
 --- a/biz.aQute.bnd/bnd.bnd
 +++ b/biz.aQute.bnd/bnd.bnd
-@@ -4,7 +4,6 @@
- -sub: *.bnd
+@@ -43,7 +43,6 @@
+     biz.aQute.launcher
  
  -buildpath: aQute.libg;version=latest,\
 -	ee.j2se;version=${javac.ee},\
  	biz.aQute.bndlib;version=project,\
- 	biz.aQute.junit;version=project,\
- 	biz.aQute.launcher;version=project,\
+ 	org.apache.tools.ant,\
+ 	org.osgi.service.component.annotations;version=6.0.0,\
 --- a/biz.aQute.bndlib.tests/bnd.bnd
 +++ b/biz.aQute.bndlib.tests/bnd.bnd
-@@ -6,7 +6,6 @@
- 	osgi.cmpn;version=4.3.1,\
- 	osgi.core;version=4.3.1,\
+@@ -10,7 +10,6 @@
+ 	osgi.core;version=@5,\
+ 	osgi.cmpn;version=@4.3.1,\
  	junit.osgi;version=3.8.2,\
 -	ee.j2se;version=${javac.ee},\
  	org.mockito.mockito-all;version=1.9.0
@@ -41,46 +41,91 @@ Forwarded: not-needed
  
  -buildpath: aQute.libg;version=project,\
 -	ee.j2se;version=${javac.ee},\
- 	com.springsource.junit,\
- 	org.mockito.mockito-all;version=1.9.0,\
  	biz.aQute.bndlib;version=latest,\
+ 	aQute.jpm.clnt;version=2.1, \
+ 	lib/WinRun4J.jar;version=file
 --- a/biz.aQute.launcher/bnd.bnd
 +++ b/biz.aQute.launcher/bnd.bnd
-@@ -1,9 +1,7 @@
+@@ -4,8 +4,7 @@
+ 
  -buildpath: biz.aQute.bndlib;version=project,\
  	aQute.libg;version=project,\
- 	osgi.core;version=4.3.1,\
--	junit.osgi;version=3.8.2,\
+-	osgi.core;version=4.3.1,\
 -	ee.j2se;version=${javac.ee}
--#	ee.minimum;version=1.2.1
-+	junit.osgi;version=3.8.2
++	osgi.core;version=4.3.1
+ -testpath: \
+ 	junit.osgi;version=3.8.2
  	
- 	
- Launcher-Plugin: aQute.launcher.plugin.ProjectLauncherImpl
-@@ -14,4 +12,4 @@
- javac.source = 1.5
- javac.target = jsr14
- 
--Premain-Class: aQute.launcher.agent.LauncherAgent
-\ No newline at end of file
-+Premain-Class: aQute.launcher.agent.LauncherAgent
 --- a/biz.aQute.repository/bnd.bnd
 +++ b/biz.aQute.repository/bnd.bnd
-@@ -18,7 +18,6 @@
+@@ -17,7 +17,6 @@
+ 	osgi.cmpn;version=4.3.1,\
  	osgi.r5;version=1.0.1,\
  	javax.xml.stream-1.0.1.jar;version=file,\
- 	org.mockito.mockito-all,\
 -	ee.j2se;version=${javac.ee},\
- 	${jetty.libs}
- 
- Bnd-Plugins:
+ 	${jetty.libs},\
+ 	aQute.jpm.bndrepo;version=1.0
+ -testpath: \
 --- a/biz.aQute.resolve/bnd.bnd
 +++ b/biz.aQute.resolve/bnd.bnd
-@@ -10,7 +10,6 @@
- 	junit.osgi,\
+@@ -8,7 +8,6 @@
+ 	osgi.r5;version=1.0.1,\
  	biz.aQute.bndlib;version=snapshot,\
  	biz.aQute.repository;version=snapshot,\
 -	ee.j2se;version=${javac.ee},\
- 	org.mockito.mockito-all,\
- 	org.apache.felix.resolver,\
+ 	org.apache.felix.resolver;version=1.1,\
+ 	osgi.cmpn;version=4.3.1
+ -testpath: \
+--- a/biz.aQute.bnd.annotation/bnd.bnd
++++ b/biz.aQute.bnd.annotation/bnd.bnd
+@@ -5,5 +5,4 @@
+ Export-Package:         aQute.bnd.annotation.*
+ 
+ -buildpath: \
+-	ee.j2se;version=${javac.ee},\
+ 	biz.aQute.bndlib;version=project
+--- a/biz.aQute.bnd.gradle/bnd.bnd
++++ b/biz.aQute.bnd.gradle/bnd.bnd
+@@ -10,7 +10,6 @@
+ Bundle-Description: The bnd gradle plugin.
+ 
+ -buildpath: \
+-  ee.j2se;version=${javac.ee}, \
+   aQute.libg;version=latest, \
+   biz.aQute.bndlib;version=latest
+ 
+--- a/biz.aQute.bnd.test/bnd.bnd
++++ b/biz.aQute.bnd.test/bnd.bnd
+@@ -5,7 +5,6 @@
+ 
+ 
+ -buildpath: \
+-	ee.j2se;version=${javac.ee},\
+     aQute.libg;version=project,\
+ 	biz.aQute.bndlib;version=project,\
+ 	osgi.core;version=4.3.1,\
+--- a/biz.aQute.bnd.testextension/bnd.bnd
++++ b/biz.aQute.bnd.testextension/bnd.bnd
+@@ -3,5 +3,4 @@
+ Extension-Activator: aQute.bnd.ext.test.TestExtension
+ 
+ -buildpath: \
+-	ee.j2se;version=${javac.ee},\
+ 	biz.aQute.bndlib;version=project
+--- a/org.osgi.impl.bundle.repoindex.api/bnd.bnd
++++ b/org.osgi.impl.bundle.repoindex.api/bnd.bnd
+@@ -1,5 +1,4 @@
+ Bundle-Version: 2.0.1.${tstamp}
+ Export-Package: org.osgi.service.indexer
+ -buildpath: \
+-	ee.j2se;version=${javac.ee},\
+ 	biz.aQute.bnd.annotation;version=latest
+--- a/org.osgi.impl.bundle.repoindex.lib/bnd.bnd
++++ b/org.osgi.impl.bundle.repoindex.lib/bnd.bnd
+@@ -1,6 +1,5 @@
+ -buildpath: \
+ 	org.osgi.impl.bundle.repoindex.api;version=project,\
+-	ee.j2se;version=${javac.ee},\
+ 	osgi.core;version=4.3.1,\
  	osgi.cmpn;version=4.3.1
+ -testpath: \
diff --git a/debian/patches/no-osgi.r5.patch b/debian/patches/no-osgi.r5.patch
index 7d4dea9..71140a5 100644
--- a/debian/patches/no-osgi.r5.patch
+++ b/debian/patches/no-osgi.r5.patch
@@ -13,20 +13,20 @@ Forwarded: not-needed
 
 --- a/biz.aQute.bnd/bnd.bnd
 +++ b/biz.aQute.bnd/bnd.bnd
-@@ -11,8 +11,7 @@
+@@ -49,8 +49,7 @@
+ 	org.osgi.service.metatype.annotations;version=6.0.0,\
  	osgi.cmpn;version=4.3.1,\
  	osgi.core;version=4.3.1,\
- 	junit.osgi,\
 -	org.osgi.impl.bundle.bindex,\
 -	osgi.r5;version=1.0.1
 +	org.osgi.impl.bundle.bindex
- 	
- # About the aQute.library.bndrepo dep. Needed to add them here
- # by hand even though they are in bndlib. However, they are added
+ -testpath: \
+ 	junit.osgi
+ 
 --- a/biz.aQute.bndlib/bnd.bnd
 +++ b/biz.aQute.bndlib/bnd.bnd
-@@ -44,8 +44,7 @@
- -buildpath: com.springsource.junit,\
+@@ -42,8 +42,7 @@
+ 	org.osgi.service.metatype.annotations;version=6.0.0,\
  	osgi.cmpn;version=4.3.1,\
  	aQute.libg;version=project,\
 -	osgi.core;version=4.3.1,\
diff --git a/debian/patches/no_ee_minimum.patch b/debian/patches/no_ee_minimum.patch
index b08d151..4b943d2 100644
--- a/debian/patches/no_ee_minimum.patch
+++ b/debian/patches/no_ee_minimum.patch
@@ -13,7 +13,7 @@ Forwarded: not-needed
 
 --- a/biz.aQute.bndlib/bnd.bnd
 +++ b/biz.aQute.bndlib/bnd.bnd
-@@ -46,7 +46,6 @@
+@@ -44,7 +44,6 @@
  	aQute.libg;version=project,\
  	osgi.core;version=4.3.1,\
  	osgi.r5;version=1.0.1,\
@@ -23,7 +23,7 @@ Forwarded: not-needed
  	org.osgi.resource;resolution:=optional,\
 --- a/biz.aQute.junit/bnd.bnd
 +++ b/biz.aQute.junit/bnd.bnd
-@@ -2,8 +2,7 @@
+@@ -6,8 +6,7 @@
  	osgi.cmpn;version=4.3.1,\
  	biz.aQute.bndlib;version=project,\
  	aQute.libg;version=project,\
@@ -43,3 +43,20 @@ Forwarded: not-needed
  	biz.aQute.bnd.annotation;version=latest,\
  	com.springsource.org.junit
  	
+--- a/biz.aQute.launcher/bnd.bnd
++++ b/biz.aQute.launcher/bnd.bnd
+@@ -6,7 +6,6 @@
+ 	aQute.libg;version=project,\
+ 	osgi.core;version=4.3.1,\
+ 	ee.j2se;version=${javac.ee}
+-#	ee.minimum;version=1.2.1
+ -testpath: \
+ 	junit.osgi;version=3.8.2
+ 	
+@@ -17,4 +16,4 @@
+ 	
+ Bundle-Version: 1.4.0.${tstamp}
+ 
+-Premain-Class: aQute.launcher.agent.LauncherAgent
+\ No newline at end of file
++Premain-Class: aQute.launcher.agent.LauncherAgent
diff --git a/debian/patches/series b/debian/patches/series
index 7eb5fab..d9f84bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@ embedded-repo.patch
 implement-missing-methods.patch
 no-osgi.r5.patch
 #java8-compatibility.patch
-gradle-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git

More information about the pkg-java-commits mailing list