[sling-org-apache-sling-commons-mime] 01/01: Merge pull request #2 from cschneider/SLING-7612

[bd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-mime.git

commit 9a57f83b3ccefe049198d29c11118b1375214579
Merge: 3ce4525 4606f10
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Jun 27 11:53:03 2018 +0200

    Merge pull request #2 from cschneider/SLING-7612
    
    SLING-7612: Use Declarative Services to register optional components

 pom.xml                                            |  1 -
 .../sling/commons/mime/internal/Activator.java     | 66 ----------------------
 .../commons/mime/internal/MimeTypeServiceImpl.java | 25 --------
 .../mime/internal/MimeTypeWebConsolePlugin.java    | 20 +++++--
 .../mime/internal/TikaMimeTypeProvider.java        |  8 +++
 5 files changed, 23 insertions(+), 97 deletions(-)

diff --cc src/main/java/org/apache/sling/commons/mime/internal/MimeTypeServiceImpl.java
index e7a7e14,e5e37c3..6af9e3a
--- a/src/main/java/org/apache/sling/commons/mime/internal/MimeTypeServiceImpl.java
+++ b/src/main/java/org/apache/sling/commons/mime/internal/MimeTypeServiceImpl.java
@@@ -20,11 -20,10 +20,9 @@@ import java.io.BufferedReader
  import java.io.IOException;
  import java.io.InputStream;
  import java.io.InputStreamReader;
 -import java.io.PrintStream;
  import java.net.URL;
  import java.util.ArrayList;
- import java.util.Dictionary;
  import java.util.HashMap;
- import java.util.Hashtable;
  import java.util.List;
  import java.util.Map;