[apache-directory-server] 01/02: jdbm artifacts: Change type bundle to type jar.
Markus Koschany
apo-guest at moszumanska.debian.org
Mon Sep 14 17:30:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository apache-directory-server.
commit 6ddc5f9471f7f49a361f4b0a4e17cc5424b577fa
Author: Markus Koschany <apo at gambaru.de>
Date: Mon Sep 14 19:24:31 2015 +0200
jdbm artifacts: Change type bundle to type jar.
---
debian/patches/01-jar-packaging.patch | 135 ++++++++++------------------------
1 file changed, 39 insertions(+), 96 deletions(-)
diff --git a/debian/patches/01-jar-packaging.patch b/debian/patches/01-jar-packaging.patch
index 00f8bea..af62ee4 100644
--- a/debian/patches/01-jar-packaging.patch
+++ b/debian/patches/01-jar-packaging.patch
@@ -2,8 +2,6 @@ Description: Change the packaging type from bundle to jar
(for some reason the resolution of the inter module dependencies doesn't work)
Author: Emmanuel Bourg <ebourg at pache.org>
Forwarded: not-needed
-diff --git a/component-hub/pom.xml b/component-hub/pom.xml
-index 6a10e63..7eab2af 100644
--- a/component-hub/pom.xml
+++ b/component-hub/pom.xml
@@ -29,7 +29,7 @@
@@ -15,8 +13,6 @@ index 6a10e63..7eab2af 100644
<description>Provides main plugin-layer for ApacheDS</description>
<dependencies>
-diff --git a/core-annotations/pom.xml b/core-annotations/pom.xml
-index f17edc7..dc8f7bf 100644
--- a/core-annotations/pom.xml
+++ b/core-annotations/pom.xml
@@ -27,7 +27,7 @@
@@ -28,8 +24,6 @@ index f17edc7..dc8f7bf 100644
<description>Annotations used to define a DirectoryService</description>
-diff --git a/core-api/pom.xml b/core-api/pom.xml
-index 0619551..1f10534 100644
--- a/core-api/pom.xml
+++ b/core-api/pom.xml
@@ -29,7 +29,7 @@
@@ -41,8 +35,6 @@ index 0619551..1f10534 100644
<description>
Contains interfaces and helper classes that are part of the ApacheDS Core API.
-diff --git a/core-avl/pom.xml b/core-avl/pom.xml
-index 459a1a1..43be871 100644
--- a/core-avl/pom.xml
+++ b/core-avl/pom.xml
@@ -25,7 +25,7 @@
@@ -54,8 +46,6 @@ index 459a1a1..43be871 100644
<description>A linked in memory AVL tree implementation with Cursor</description>
-diff --git a/core-constants/pom.xml b/core-constants/pom.xml
-index 17e17a6..39a5947 100644
--- a/core-constants/pom.xml
+++ b/core-constants/pom.xml
@@ -27,7 +27,7 @@
@@ -67,8 +57,6 @@ index 17e17a6..39a5947 100644
<description>Contains classes that store interfaces with various constants in ApacheDS.</description>
-diff --git a/core-integ/pom.xml b/core-integ/pom.xml
-index 77e26bb..7e86ca1 100644
--- a/core-integ/pom.xml
+++ b/core-integ/pom.xml
@@ -29,7 +29,7 @@
@@ -80,8 +68,6 @@ index 77e26bb..7e86ca1 100644
<description>Integration testing framework for Apache Directory Server.</description>
-diff --git a/core-jndi/pom.xml b/core-jndi/pom.xml
-index 0ec3e57..c9e08ae 100644
--- a/core-jndi/pom.xml
+++ b/core-jndi/pom.xml
@@ -27,7 +27,7 @@
@@ -93,8 +79,6 @@ index 0ec3e57..c9e08ae 100644
<description>
Contains a JNDI provider implementation which wraps the core so existing
-diff --git a/core-shared/pom.xml b/core-shared/pom.xml
-index 5cb70a8..7234c33 100644
--- a/core-shared/pom.xml
+++ b/core-shared/pom.xml
@@ -29,7 +29,7 @@
@@ -106,8 +90,6 @@ index 5cb70a8..7234c33 100644
<description>
Contains helper classes that are part of the ApacheDS Core.
-diff --git a/core/pom.xml b/core/pom.xml
-index 73f1f84..ee14bfc 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@
@@ -119,8 +101,6 @@ index 73f1f84..ee14bfc 100644
<description>
Server's core contains the JNDI provider, interceptors, schema, and
-diff --git a/dependencies/pom.xml b/dependencies/pom.xml
-index 7ec6369..0ed77da 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -27,7 +27,7 @@
@@ -132,8 +112,6 @@ index 7ec6369..0ed77da 100644
<description>Exports NonOSGI dependencies as bundle</description>
-diff --git a/http-directory-bridge/pom.xml b/http-directory-bridge/pom.xml
-index 0cf74bf..8f5cfba 100644
--- a/http-directory-bridge/pom.xml
+++ b/http-directory-bridge/pom.xml
@@ -27,7 +27,7 @@
@@ -145,8 +123,6 @@ index 0cf74bf..8f5cfba 100644
<dependencies>
-diff --git a/http-integration/pom.xml b/http-integration/pom.xml
-index e5249ec..ce2844c 100644
--- a/http-integration/pom.xml
+++ b/http-integration/pom.xml
@@ -29,7 +29,7 @@
@@ -158,8 +134,6 @@ index e5249ec..ce2844c 100644
<dependencies>
<dependency>
-diff --git a/i18n/pom.xml b/i18n/pom.xml
-index 903191d..fc9a2c9 100644
--- a/i18n/pom.xml
+++ b/i18n/pom.xml
@@ -27,7 +27,7 @@
@@ -171,8 +145,6 @@ index 903191d..fc9a2c9 100644
<description>Internationalization of errors and other messages</description>
-diff --git a/interceptor-kerberos/pom.xml b/interceptor-kerberos/pom.xml
-index 5621809..de058ea 100644
--- a/interceptor-kerberos/pom.xml
+++ b/interceptor-kerberos/pom.xml
@@ -27,7 +27,7 @@
@@ -184,8 +156,6 @@ index 5621809..de058ea 100644
<description>Interceptors used by the ApacheDS kerberos service.</description>
-diff --git a/interceptors/admin/pom.xml b/interceptors/admin/pom.xml
-index 30d3f60..4a73c2c 100644
--- a/interceptors/admin/pom.xml
+++ b/interceptors/admin/pom.xml
@@ -29,7 +29,7 @@
@@ -197,8 +167,6 @@ index 30d3f60..4a73c2c 100644
<description>
AdministrativePoint interceptor
-diff --git a/interceptors/authn/pom.xml b/interceptors/authn/pom.xml
-index 8b99d0a..ba8d10a 100644
--- a/interceptors/authn/pom.xml
+++ b/interceptors/authn/pom.xml
@@ -29,7 +29,7 @@
@@ -210,8 +178,6 @@ index 8b99d0a..ba8d10a 100644
<description>
Authentication interceptor
-diff --git a/interceptors/authz/pom.xml b/interceptors/authz/pom.xml
-index fedfddc..0fa1059 100644
--- a/interceptors/authz/pom.xml
+++ b/interceptors/authz/pom.xml
@@ -29,7 +29,7 @@
@@ -223,8 +189,6 @@ index fedfddc..0fa1059 100644
<description>
Authorization interceptor
-diff --git a/interceptors/changelog/pom.xml b/interceptors/changelog/pom.xml
-index dc487c5..b615dee 100644
--- a/interceptors/changelog/pom.xml
+++ b/interceptors/changelog/pom.xml
@@ -29,7 +29,7 @@
@@ -236,8 +200,6 @@ index dc487c5..b615dee 100644
<description>
ChangeLog interceptor
-diff --git a/interceptors/collective/pom.xml b/interceptors/collective/pom.xml
-index af9552f..e11f692 100644
--- a/interceptors/collective/pom.xml
+++ b/interceptors/collective/pom.xml
@@ -29,7 +29,7 @@
@@ -249,8 +211,6 @@ index af9552f..e11f692 100644
<description>
Collective Attribute interceptor
-diff --git a/interceptors/event/pom.xml b/interceptors/event/pom.xml
-index 7b22259..2f584c7 100644
--- a/interceptors/event/pom.xml
+++ b/interceptors/event/pom.xml
@@ -29,7 +29,7 @@
@@ -262,8 +222,6 @@ index 7b22259..2f584c7 100644
<description>
Event interceptor
-diff --git a/interceptors/exception/pom.xml b/interceptors/exception/pom.xml
-index 06c57c2..4ff0f00 100644
--- a/interceptors/exception/pom.xml
+++ b/interceptors/exception/pom.xml
@@ -29,7 +29,7 @@
@@ -275,8 +233,6 @@ index 06c57c2..4ff0f00 100644
<description>
Exception interceptor
-diff --git a/interceptors/hash/pom.xml b/interceptors/hash/pom.xml
-index 2426a49..449731d 100644
--- a/interceptors/hash/pom.xml
+++ b/interceptors/hash/pom.xml
@@ -29,7 +29,7 @@
@@ -288,8 +244,6 @@ index 2426a49..449731d 100644
<description>
Password Hashing interceptor
-diff --git a/interceptors/journal/pom.xml b/interceptors/journal/pom.xml
-index d44c4cf..6c8533d 100644
--- a/interceptors/journal/pom.xml
+++ b/interceptors/journal/pom.xml
@@ -29,7 +29,7 @@
@@ -301,8 +255,6 @@ index d44c4cf..6c8533d 100644
<description>
Journal interceptor
-diff --git a/interceptors/logger/pom.xml b/interceptors/logger/pom.xml
-index b2e8f61..0fab53d 100644
--- a/interceptors/logger/pom.xml
+++ b/interceptors/logger/pom.xml
@@ -29,7 +29,7 @@
@@ -314,8 +266,6 @@ index b2e8f61..0fab53d 100644
<description>
Logger interceptor
-diff --git a/interceptors/normalization/pom.xml b/interceptors/normalization/pom.xml
-index 4e1127a..56afa0a 100644
--- a/interceptors/normalization/pom.xml
+++ b/interceptors/normalization/pom.xml
@@ -29,7 +29,7 @@
@@ -327,8 +277,6 @@ index 4e1127a..56afa0a 100644
<description>
Normalization interceptor
-diff --git a/interceptors/operational/pom.xml b/interceptors/operational/pom.xml
-index 3c417cb..4192f13 100644
--- a/interceptors/operational/pom.xml
+++ b/interceptors/operational/pom.xml
@@ -29,7 +29,7 @@
@@ -340,8 +288,6 @@ index 3c417cb..4192f13 100644
<description>
Operational Attribute interceptor
-diff --git a/interceptors/referral/pom.xml b/interceptors/referral/pom.xml
-index c419b04..522c72a 100644
--- a/interceptors/referral/pom.xml
+++ b/interceptors/referral/pom.xml
@@ -29,7 +29,7 @@
@@ -353,8 +299,6 @@ index c419b04..522c72a 100644
<description>
Referral interceptor
-diff --git a/interceptors/schema/pom.xml b/interceptors/schema/pom.xml
-index e0a11ec..b2d953d 100644
--- a/interceptors/schema/pom.xml
+++ b/interceptors/schema/pom.xml
@@ -29,7 +29,7 @@
@@ -366,8 +310,6 @@ index e0a11ec..b2d953d 100644
<description>
Schema interceptor
-diff --git a/interceptors/subtree/pom.xml b/interceptors/subtree/pom.xml
-index 72ec431..dc83dd5 100644
--- a/interceptors/subtree/pom.xml
+++ b/interceptors/subtree/pom.xml
@@ -29,7 +29,7 @@
@@ -379,8 +321,6 @@ index 72ec431..dc83dd5 100644
<description>
Subtree interceptor
-diff --git a/interceptors/trigger/pom.xml b/interceptors/trigger/pom.xml
-index ae05bae..1e4c1c4 100644
--- a/interceptors/trigger/pom.xml
+++ b/interceptors/trigger/pom.xml
@@ -29,7 +29,7 @@
@@ -392,8 +332,6 @@ index ae05bae..1e4c1c4 100644
<description>
Triggers interceptor
-diff --git a/jdbm-partition/pom.xml b/jdbm-partition/pom.xml
-index ecaeaf5..0a02c25 100644
--- a/jdbm-partition/pom.xml
+++ b/jdbm-partition/pom.xml
@@ -27,7 +27,7 @@
@@ -405,8 +343,15 @@ index ecaeaf5..0a02c25 100644
<description>
JDBM BTree backed partition implementation.
-diff --git a/kerberos-codec/pom.xml b/kerberos-codec/pom.xml
-index 984e030..9536a90 100644
+@@ -65,7 +65,7 @@
+ <dependency>
+ <groupId>org.apache.directory.jdbm</groupId>
+ <artifactId>apacheds-jdbm1</artifactId>
+- <type>bundle</type>
++ <type>jar</type>
+ </dependency>
+
+ <dependency>
--- a/kerberos-codec/pom.xml
+++ b/kerberos-codec/pom.xml
@@ -27,7 +27,7 @@
@@ -418,8 +363,6 @@ index 984e030..9536a90 100644
<description>The Kerberos protocol encoder/decoder module</description>
-diff --git a/ldif-partition/pom.xml b/ldif-partition/pom.xml
-index 52703b5..87b47e7 100644
--- a/ldif-partition/pom.xml
+++ b/ldif-partition/pom.xml
@@ -27,7 +27,7 @@
@@ -431,8 +374,6 @@ index 52703b5..87b47e7 100644
<description>A partition that backs it's entries and indices in AvlTrees within memory.</description>
-diff --git a/osgi/pom.xml b/osgi/pom.xml
-index 87abb91..8b898d8 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -28,7 +28,7 @@
@@ -444,8 +385,6 @@ index 87abb91..8b898d8 100644
<properties>
<apache.directory.version>${project.version}</apache.directory.version>
-diff --git a/protocol-dhcp/pom.xml b/protocol-dhcp/pom.xml
-index 21f3f21..63bc500 100644
--- a/protocol-dhcp/pom.xml
+++ b/protocol-dhcp/pom.xml
@@ -27,7 +27,7 @@
@@ -457,8 +396,6 @@ index 21f3f21..63bc500 100644
<description>The DHCP protocol provider for ApacheDS</description>
-diff --git a/protocol-dns/pom.xml b/protocol-dns/pom.xml
-index a51377a..82e244a 100644
--- a/protocol-dns/pom.xml
+++ b/protocol-dns/pom.xml
@@ -27,7 +27,7 @@
@@ -470,8 +407,6 @@ index a51377a..82e244a 100644
<description>The DNS protocol provider for ApacheDS</description>
-diff --git a/protocol-kerberos/pom.xml b/protocol-kerberos/pom.xml
-index 76f65a5..e50784d 100644
--- a/protocol-kerberos/pom.xml
+++ b/protocol-kerberos/pom.xml
@@ -27,7 +27,7 @@
@@ -483,8 +418,6 @@ index 76f65a5..e50784d 100644
<description>The Kerberos Protocol Provider for ApacheDS</description>
-diff --git a/protocol-ldap/pom.xml b/protocol-ldap/pom.xml
-index 5b0cfa2..a8c01ca 100644
--- a/protocol-ldap/pom.xml
+++ b/protocol-ldap/pom.xml
@@ -27,7 +27,7 @@
@@ -496,8 +429,15 @@ index 5b0cfa2..a8c01ca 100644
<description>The LDAPv3 protocol provider for ApacheDS</description>
-diff --git a/protocol-ntp/pom.xml b/protocol-ntp/pom.xml
-index 55f6e8c..daf9efa 100644
+@@ -61,7 +61,7 @@
+ <dependency>
+ <groupId>org.apache.directory.jdbm</groupId>
+ <artifactId>apacheds-jdbm1</artifactId>
+- <type>bundle</type>
++ <type>jar</type>
+ </dependency>
+
+ <dependency>
--- a/protocol-ntp/pom.xml
+++ b/protocol-ntp/pom.xml
@@ -27,7 +27,7 @@
@@ -509,8 +449,6 @@ index 55f6e8c..daf9efa 100644
<description>The NTP protocol provider for ApacheDS</description>
-diff --git a/protocol-shared/pom.xml b/protocol-shared/pom.xml
-index d6c0664..c5dc985 100644
--- a/protocol-shared/pom.xml
+++ b/protocol-shared/pom.xml
@@ -26,7 +26,7 @@
@@ -522,8 +460,6 @@ index d6c0664..c5dc985 100644
<artifactId>apacheds-protocol-shared</artifactId>
<description>
-diff --git a/server-annotations/pom.xml b/server-annotations/pom.xml
-index f8f1510..9b59806 100644
--- a/server-annotations/pom.xml
+++ b/server-annotations/pom.xml
@@ -27,7 +27,7 @@
@@ -535,8 +471,6 @@ index f8f1510..9b59806 100644
<description>Annotations used to define a LdapServer</description>
-diff --git a/server-config/pom.xml b/server-config/pom.xml
-index 7333d32..54686cd 100644
--- a/server-config/pom.xml
+++ b/server-config/pom.xml
@@ -27,7 +27,7 @@
@@ -548,8 +482,6 @@ index 7333d32..54686cd 100644
<dependencies>
-diff --git a/server-integ/pom.xml b/server-integ/pom.xml
-index 5f71d1a..4f24545 100644
--- a/server-integ/pom.xml
+++ b/server-integ/pom.xml
@@ -27,7 +27,7 @@
@@ -561,8 +493,6 @@ index 5f71d1a..4f24545 100644
<description>Integration testing framework for Apache Directory Server.</description>
-diff --git a/server-jndi/pom.xml b/server-jndi/pom.xml
-index ee3b01a..19436d0 100644
--- a/server-jndi/pom.xml
+++ b/server-jndi/pom.xml
@@ -27,7 +27,7 @@
@@ -574,8 +504,6 @@ index ee3b01a..19436d0 100644
<description>
The JNDI provider which launches the core and associated network
-diff --git a/service-builder/pom.xml b/service-builder/pom.xml
-index 0c0688a..11b753a 100644
--- a/service-builder/pom.xml
+++ b/service-builder/pom.xml
@@ -27,7 +27,7 @@
@@ -587,8 +515,6 @@ index 0c0688a..11b753a 100644
<dependencies>
<dependency>
-diff --git a/service-osgi/pom.xml b/service-osgi/pom.xml
-index 83e4226..6c4fcce 100644
--- a/service-osgi/pom.xml
+++ b/service-osgi/pom.xml
@@ -29,7 +29,7 @@
@@ -600,8 +526,6 @@ index 83e4226..6c4fcce 100644
<description />
<dependencies>
-diff --git a/test-framework/pom.xml b/test-framework/pom.xml
-index d199f2e..d4f0fe7 100644
--- a/test-framework/pom.xml
+++ b/test-framework/pom.xml
@@ -28,7 +28,7 @@
@@ -613,8 +537,6 @@ index d199f2e..d4f0fe7 100644
<description>Test framework for integration tests without depending on the InheritableSettings</description>
-diff --git a/xdbm-partition/pom.xml b/xdbm-partition/pom.xml
-index 20250db..c592e87 100644
--- a/xdbm-partition/pom.xml
+++ b/xdbm-partition/pom.xml
@@ -26,7 +26,7 @@
@@ -626,3 +548,24 @@ index 20250db..c592e87 100644
<description>Partition with search engine implementation generalized for XDBM entry store scheme</description>
+--- a/all/pom.xml
++++ b/all/pom.xml
+@@ -74,7 +74,7 @@
+ <dependency>
+ <groupId>org.apache.directory.jdbm</groupId>
+ <artifactId>apacheds-jdbm1</artifactId>
+- <type>bundle</type>
++ <type>jar</type>
+ </dependency>
+
+ <dependency>
+--- a/pom.xml
++++ b/pom.xml
+@@ -589,7 +589,6 @@
+ <dependency>
+ <groupId>org.apache.directory.jdbm</groupId>
+ <artifactId>apacheds-jdbm1</artifactId>
+- <type>bundle</type>
+ <version>${org.apache.directory.jdbm.version}</version>
+ </dependency>
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-directory-server.git
More information about the pkg-java-commits
mailing list