Fixed many missing (or unused) import declarations in pom.xml (see

DIRAPI-354)
apache · Mar 4, 2020 · 58714c8dff4e4d7b172e8d2c9252829d92741e96 · 58714c8
1 parent 45eaca4
commit 58714c8dff4e4d7b172e8d2c9252829d92741e96
Showing 13 changed files with 47 additions and 55 deletions.
diff --git a/dsml/engine/pom.xml b/dsml/engine/pom.xml
@@ -82,10 +82,10 @@
               org.apache.directory.api.dsmlv2.engine;version=${project.version};-noimport:=true
             </Export-Package>
             <Import-Package>
-              org.apache.directory.api.asn1;version=${project.version},
+              org.apache.commons.codec;version=${commons.codec.version},
               org.apache.directory.api.dsmlv2;version=${project.version},
-              org.apache.directory.api.dsmlv2.response;version=${project.version},
               org.apache.directory.api.dsmlv2.request;version=${project.version},
+              org.apache.directory.api.dsmlv2.response;version=${project.version},
               org.apache.directory.api.i18n;version=${project.version},
               org.apache.directory.api.ldap.model.cursor;version=${project.version},
               org.apache.directory.api.ldap.model.exception;version=${project.version},

diff --git a/dsml/parser/pom.xml b/dsml/parser/pom.xml
@@ -122,6 +122,8 @@
               org.apache.directory.api.dsmlv2.request;version=${project.version};-noimport:=true
             </Export-Package>
             <Import-Package>
+              javax.xml.transform,
+              javax.xml.transform.stream,
               org.apache.directory.api.asn1;version=${project.version},
               org.apache.directory.api.asn1.util;version=${project.version},
               org.apache.directory.api.i18n;version=${project.version},
@@ -139,9 +141,7 @@
               org.dom4j.io;version=${dom4j.version},
               org.dom4j.tree;version=${dom4j.version},
               org.slf4j;version=${slf4j.api.bundleversion},
-              org.xmlpull.v1;version=${xpp3.version},
-              javax.xml.transform,
-              javax.xml.transform.stream
+              org.xmlpull.v1;version=${xpp3.version}
             </Import-Package>
             <Automatic-Module-Name>apache.directory.ldap.api.dsml.parser</Automatic-Module-Name>
           </instructions>

diff --git a/ldap/client/api/pom.xml b/ldap/client/api/pom.xml
@@ -148,24 +148,26 @@
               org.apache.directory.ldap.client.template.exception;version=${project.version};-noimport:=true
             </Export-Package>
             <Import-Package>
+              javax.net.ssl,
+              javax.security.auth,
+              javax.security.auth.callback,
+              javax.security.auth.login,
+              javax.security.sasl,
               org.apache.commons.pool2;version=${commons.pool.version},
               org.apache.commons.pool2.impl;version=${commons.pool.version},
               org.apache.directory.api.asn1;version=${project.version},
               org.apache.directory.api.asn1.util;version=${project.version},
               org.apache.directory.api.i18n;version=${project.version},
-              org.apache.directory.api.ldap.aci;version=${project.version},
-              org.apache.directory.api.ldap.aci.protectedItem;version=${project.version},
               org.apache.directory.api.ldap.codec.api;version=${project.version},
-              org.apache.directory.api.ldap.extras.controls.ppolicy_impl;version=${project.version},
+              org.apache.directory.api.ldap.extras.controls.ad;version=${project.version},
               org.apache.directory.api.ldap.extras.controls.ppolicy;version=${project.version},
-              org.apache.directory.api.ldap.extras.controls.vlv_impl;version=${project.version},
-              org.apache.directory.api.ldap.extras.controls.vlv;version=${project.version},
               org.apache.directory.api.ldap.extras.extended.startTls;version=${project.version},
               org.apache.directory.api.ldap.model.constants;version=${project.version},
               org.apache.directory.api.ldap.model.cursor;version=${project.version},
               org.apache.directory.api.ldap.model.entry;version=${project.version},
               org.apache.directory.api.ldap.model.exception;version=${project.version},
               org.apache.directory.api.ldap.model.filter;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.ldif;version=${project.version};-noimport:=true,
               org.apache.directory.api.ldap.model.ldif.anonymizer;version=${project.version};-noimport:=true,
               org.apache.directory.api.ldap.model.message;version=${project.version},
               org.apache.directory.api.ldap.model.message.controls;version=${project.version},
@@ -174,21 +176,19 @@
               org.apache.directory.api.ldap.model.schema;version=${project.version},
               org.apache.directory.api.ldap.model.schema.parsers;version=${project.version},
               org.apache.directory.api.ldap.model.schema.registries;version=${project.version},
+              org.apache.directory.api.ldap.model.schema.syntaxCheckers;version=${project.version},
               org.apache.directory.api.ldap.schema.manager.impl;version=${project.version},
               org.apache.directory.api.util;version=${project.version},
               org.apache.mina.core.filterchain;version=${mina.core.version},
               org.apache.mina.core.future;version=${mina.core.version},
               org.apache.mina.core.service;version=${mina.core.version},
               org.apache.mina.core.session;version=${mina.core.version},
+              org.apache.mina.filter;version=${mina.core.version},
               org.apache.mina.filter.codec;version=${mina.core.version},
               org.apache.mina.filter.ssl;version=${mina.core.version},
               org.apache.mina.transport.socket;version=${mina.core.version},
               org.apache.mina.transport.socket.nio;version=${mina.core.version},
-              org.slf4j;version=${slf4j.api.bundleversion},
-              javax.security.auth.login,
-              javax.security.auth.callback,
-              javax.security.sasl,
-              javax.net.ssl
+              org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
             <Automatic-Module-Name>apache.directory.ldap.api.client.api</Automatic-Module-Name>
           </instructions>

diff --git a/ldap/codec/core/pom.xml b/ldap/codec/core/pom.xml
@@ -131,6 +131,8 @@
               org.apache.directory.api.ldap.codec.search;version=${project.version};-noimport:=true
             </Export-Package>
             <Import-Package>
+              javax.naming,
+              javax.naming.ldap,
               org.apache.directory.api.asn1;version=${project.version},
               org.apache.directory.api.asn1.actions;version=${project.version},
               org.apache.directory.api.asn1.ber;version=${project.version},
@@ -150,11 +152,8 @@
               org.apache.directory.api.util.exception;version=${project.version},
               org.apache.mina.filter.codec;version=${mina.core.version},
               org.apache.mina.util;version=${mina.core.version},
-              org.slf4j;version=${slf4j.api.bundleversion},
               org.osgi.framework;version="[1.0.0,2.0.0)",
-              javax.naming,
-              javax.naming.directory,
-              javax.naming.ldap
+              org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
             <Bundle-Activator>
               org.apache.directory.api.ldap.codec.osgi.DefaultActivator

diff --git a/ldap/extras/aci/pom.xml b/ldap/extras/aci/pom.xml
@@ -99,7 +99,6 @@
             </Export-Package>
             <Import-Package>
               antlr;version=${antlr.version},
-              antlr.collections.impl;version=${antlr.version},
               org.apache.directory.api.i18n;version=${project.version},
               org.apache.directory.api.ldap.model.constants;version=${project.version},
               org.apache.directory.api.ldap.model.entry;version=${project.version},

diff --git a/ldap/extras/codec/pom.xml b/ldap/extras/codec/pom.xml
@@ -138,10 +138,10 @@
               org.apache.directory.api.asn1.ber;version=${project.version},
               org.apache.directory.api.asn1.ber.grammar;version=${project.version},
               org.apache.directory.api.asn1.ber.tlv;version=${project.version},
+              org.apache.directory.api.asn1.util;version=${project.version},
               org.apache.directory.api.i18n;version=${project.version},
               org.apache.directory.api.ldap.codec;version=${project.version},
               org.apache.directory.api.ldap.codec.api;version=${project.version},
-              org.apache.directory.api.ldap.codec.osgi;version=${project.version},
               org.apache.directory.api.ldap.extras.controls;version=${project.version},
               org.apache.directory.api.ldap.extras.controls.ad;version=${project.version},
               org.apache.directory.api.ldap.extras.controls.changeNotifications;version=${project.version},
@@ -165,14 +165,15 @@
               org.apache.directory.api.ldap.extras.extended.whoAmI;version=${project.version},
               org.apache.directory.api.ldap.extras.intermediate.syncrepl;version=${project.version},
               org.apache.directory.api.ldap.model.exception;version=${project.version},
+              org.apache.directory.api.ldap.model.exception;version=${project.version},
               org.apache.directory.api.ldap.model.message;version=${project.version},
               org.apache.directory.api.ldap.model.message.extended;version=${project.version},
               org.apache.directory.api.ldap.model.name;version=${project.version},
               org.apache.directory.api.ldap.model.url;version=${project.version},
               org.apache.directory.api.util;version=${project.version},
-              org.slf4j;version=${slf4j.api.bundleversion},
               org.osgi.framework;version="[1.0.0,2.0.0)",
               org.osgi.util.tracker;version="[1.0.0,2.0.0)",
+              org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
             <Bundle-Activator>
               org.apache.directory.api.ldap.extras.ExtrasBundleActivator

diff --git a/ldap/extras/sp/pom.xml b/ldap/extras/sp/pom.xml
@@ -83,14 +83,14 @@
               org.apache.directory.api.ldap.sp;version=${project.version};-noimport:=true
             </Export-Package>
             <Import-Package>
+              javax.naming,
+              javax.naming.directory,
+              javax.naming.ldap,
               org.apache.commons.lang3;version=${commons.lang.version},
               org.apache.directory.api.ldap.codec.api;version=${project.version},
               org.apache.directory.api.ldap.extras.extended.storedProcedure;version=${project.version},
               org.apache.directory.api.ldap.model.constants;version=${project.version},
-              org.apache.directory.api.ldap.model.message;version=${project.version},
-              javax.naming,
-              javax.naming.directory,
-              javax.naming.ldap
+              org.apache.directory.api.util;version=${project.version}
             </Import-Package>
             <Automatic-Module-Name>apache.directory.ldap.api.extras.sp</Automatic-Module-Name>
           </instructions>

diff --git a/ldap/extras/trigger/pom.xml b/ldap/extras/trigger/pom.xml
@@ -103,19 +103,17 @@
             </Export-Package>
             <Import-Package>
               antlr;version=${antlr.version},
-              antlr.collections.impl;version=${antlr.version},
-              org.apache.commons.lang3;version=${commons.lang.version},
+              javax.naming,
+              javax.naming.directory,
+              javax.naming.ldap,
               org.apache.directory.api.i18n;version=${project.version},
-              org.apache.directory.api.util;version=${project.version},
               org.apache.directory.api.ldap.model.constants;version=${project.version},
               org.apache.directory.api.ldap.model.entry;version=${project.version},
               org.apache.directory.api.ldap.model.message;version=${project.version},
               org.apache.directory.api.ldap.model.name;version=${project.version},
               org.apache.directory.api.ldap.model.schema;version=${project.version},
-              org.slf4j;version=${slf4j.api.bundleversion},
-              javax.naming,
-              javax.naming.directory,
-              javax.naming.ldap
+              org.apache.directory.api.util;version=${project.version},
+              org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
             <Automatic-Module-Name>apache.directory.ldap.api.extras.trigger</Automatic-Module-Name>
           </instructions>

diff --git a/ldap/extras/util/pom.xml b/ldap/extras/util/pom.xml
@@ -69,15 +69,16 @@
               org.apache.directory.api.ldap.util.tree;version=${project.version};-noimport:=true
             </Export-Package>
             <Import-Package>
+              javax.naming,
+              javax.naming.directory,
+              javax.naming.ldap,
               org.apache.directory.api.asn1;version=${project.version},
+              org.apache.directory.api.i18n;version=${project.version},
               org.apache.directory.api.ldap.codec.api;version=${project.version},
               org.apache.directory.api.ldap.model.exception;version=${project.version},
               org.apache.directory.api.ldap.model.message;version=${project.version},
               org.apache.directory.api.ldap.model.name;version=${project.version},
-              org.slf4j;version=${slf4j.api.bundleversion},
-              javax.naming,
-              javax.naming.directory,
-              javax.naming.ldap
+              org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
             <Automatic-Module-Name>apache.directory.ldap.api.extras.util</Automatic-Module-Name>
           </instructions>

diff --git a/ldap/model/pom.xml b/ldap/model/pom.xml
@@ -193,22 +193,21 @@
             </Export-Package>
             <Import-Package>
               antlr;version=${antlr.version},
-              antlr.collections.impl;version=${antlr.version},
+              javax.crypto,
+              javax.crypto.spec,
+              javax.naming,
+              javax.naming.directory,
+              javax.naming.ldap,
               org.apache.commons.codec.digest;version=${commons.codec.version},
               org.apache.commons.collections4;version=${commons.collections.version},
               org.apache.commons.collections4.list;version=${commons.collections.version},
-              org.apache.commons.collections4.map;version=${commons.collections.version},
               org.apache.commons.lang3;version=${commons.lang.version},
               org.apache.commons.lang3.exception;version=${commons.lang.version},
-              org.apache.directory.api.asn1;version=${project.version},
               org.apache.directory.api.asn1.util;version=${project.version},
               org.apache.directory.api.i18n;version=${project.version},
               org.apache.directory.api.util;version=${project.version},
               org.apache.directory.api.util.exception;version=${project.version},
-              org.slf4j;version=${slf4j.api.bundleversion},
-              javax.naming,
-              javax.naming.directory,
-              javax.naming.ldap
+              org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
             <Automatic-Module-Name>apache.directory.ldap.api.model</Automatic-Module-Name>
           </instructions>

diff --git a/ldap/net/mina/pom.xml b/ldap/net/mina/pom.xml
@@ -64,11 +64,11 @@
               org.apache.directory.api.ldap.codec.protocol.mina;version=${project.version};-noimport:=true
             </Export-Package>
             <Import-Package>
-              org.apache.directory.api.i18n;version=${project.version},
               org.apache.directory.api.asn1;version=${project.version},
               org.apache.directory.api.asn1.ber;version=${project.version},
               org.apache.directory.api.asn1.ber.tlv;version=${project.version},
               org.apache.directory.api.asn1.util;version=${project.version},
+              org.apache.directory.api.i18n;version=${project.version},
               org.apache.directory.api.ldap.codec.api;version=${project.version},
               org.apache.directory.api.ldap.model.constants;version=${project.version},
               org.apache.directory.api.ldap.model.exception;version=${project.version},
@@ -77,9 +77,9 @@
               org.apache.mina.core.buffer;version=${mina.core.version},
               org.apache.mina.core.session;version=${mina.core.version},
               org.apache.mina.filter.codec;version=${mina.core.version},
-              org.slf4j;version=${slf4j.api.bundleversion},
               org.osgi.framework;version="[1.0.0,2.0.0)",
-              org.osgi.util.tracker;version="[1.0.0,2.0.0)"
+              org.osgi.util.tracker;version="[1.0.0,2.0.0)",
+              org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
             <Bundle-Activator>
               org.apache.directory.api.ldap.codec.protocol.mina.LdapProtocolCodecActivator

diff --git a/ldap/schema/converter/pom.xml b/ldap/schema/converter/pom.xml
@@ -125,7 +125,8 @@
               org.apache.directory.api.ldap.schema.converter;version="${project.version}";-noimport:=true
             </Export-Package>
             <Import-Package>
-              <![CDATA[
+              antlr;version=${antlr.version},
+              org.apache.commons.lang3.exception;version=${commons.lang.version},
               org.apache.directory.api.i18n;version=${project.version},
               org.apache.directory.api.ldap.model.constants;version=${project.version},
               org.apache.directory.api.ldap.model.entry;version=${project.version},
@@ -134,10 +135,7 @@
               org.apache.directory.api.ldap.model.name;version=${project.version},
               org.apache.directory.api.ldap.model.schema;version=${project.version},
               org.apache.directory.api.util;version=${project.version},
-              org.slf4j;version=${slf4j.api.bundleversion},
-              antlr;version=${antlr.version},
-              *
-              ]]>
+              org.slf4j;version=${slf4j.api.bundleversion}
             </Import-Package>
             <Automatic-Module-Name>apache.directory.ldap.api.schema.converter</Automatic-Module-Name>
           </instructions>

diff --git a/ldap/schema/data/pom.xml b/ldap/schema/data/pom.xml
@@ -155,16 +155,13 @@
             <Import-Package>
               org.apache.directory.api.asn1.util;version=${project.version},
               org.apache.directory.api.i18n;version=${project.version},
-              org.apache.directory.api.ldap.aci;version=${project.version},
               org.apache.directory.api.ldap.model.constants;version=${project.version},
               org.apache.directory.api.ldap.model.entry;version=${project.version},
               org.apache.directory.api.ldap.model.exception;version=${project.version},
               org.apache.directory.api.ldap.model.ldif;version=${project.version},
               org.apache.directory.api.ldap.model.message;version=${project.version},
               org.apache.directory.api.ldap.model.name;version=${project.version},
               org.apache.directory.api.ldap.model.schema;version=${project.version},
-              org.apache.directory.api.ldap.model.schema.comparators;version=${project.version},
-              org.apache.directory.api.ldap.model.schema.syntaxCheckers;version=${project.version},
               org.apache.directory.api.ldap.model.schema.normalizers;version=${project.version},
               org.apache.directory.api.ldap.model.schema.parsers;version=${project.version},
               org.apache.directory.api.ldap.model.schema.registries;version=${project.version},