From commits-return-36696-archive-asf-public=cust-asf.ponee.io@karaf.apache.org Fri Jul 5 14:28:19 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 8F49E18057A for ; Fri, 5 Jul 2019 16:28:18 +0200 (CEST) Received: (qmail 76533 invoked by uid 500); 5 Jul 2019 14:28:18 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 76524 invoked by uid 99); 5 Jul 2019 14:28:18 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Jul 2019 14:28:18 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id D4BF587AD7; Fri, 5 Jul 2019 14:28:12 +0000 (UTC) Date: Fri, 05 Jul 2019 14:28:12 +0000 To: "commits@karaf.apache.org" Subject: [karaf] branch master updated: Remove unused imports MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <156233689273.29701.4777872462389899208@gitbox.apache.org> From: skitt@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: karaf X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: fd29e1fa04fe77d4228b4e7897d4302bff165623 X-Git-Newrev: 5cf5a783b16d2efbf2a33dd2f491a810a68b62d7 X-Git-Rev: 5cf5a783b16d2efbf2a33dd2f491a810a68b62d7 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. skitt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/karaf.git The following commit(s) were added to refs/heads/master by this push: new 5cf5a78 Remove unused imports 5cf5a78 is described below commit 5cf5a783b16d2efbf2a33dd2f491a810a68b62d7 Author: Stephen Kitt AuthorDate: Fri Jul 5 14:37:43 2019 +0200 Remove unused imports Signed-off-by: Stephen Kitt --- .../test/java/org/apache/karaf/audit/logger/EventLoggerTest.java | 1 - .../main/java/org/apache/karaf/config/command/PropSetCommand.java | 5 ----- .../org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java | 2 -- .../main/java/org/apache/karaf/docker/command/InfoCommand.java | 1 - .../main/java/org/apache/karaf/docker/command/StartCommand.java | 1 - .../java/org/apache/karaf/docker/internal/osgi/Activator.java | 1 - .../src/test/java/org/apache/karaf/docker/DockerClientTest.java | 1 - .../org/apache/karaf/examples/command/command/AddCommand.java | 1 - .../test/java/org/apache/karaf/examples/itests/ExampleITest.java | 2 +- .../java/org/apache/karaf/examples/jdbc/command/AddCommand.java | 1 - .../java/org/apache/karaf/examples/jdbc/command/GetCommand.java | 2 -- .../examples/jpa/provider/ds/openjpa/BookingServiceImpl.java | 4 ---- .../apache/karaf/examples/rest/client/cxf/AddBookingCommand.java | 5 ----- .../apache/karaf/examples/rest/client/http/AddBookingCommand.java | 2 -- .../org/apache/karaf/features/internal/model/Conditional.java | 1 - .../features/internal/model/processing/FeatureReplacements.java | 1 - .../org/apache/karaf/features/internal/service/Blacklist.java | 1 - .../java/org/apache/karaf/features/internal/service/Deployer.java | 2 -- .../org/apache/karaf/features/internal/service/Overrides.java | 1 - .../main/java/org/apache/karaf/http/command/ProxyAddCommand.java | 1 - .../java/org/apache/karaf/http/core/internal/HttpMBeanImpl.java | 1 - .../apache/karaf/instance/core/internal/InstanceServiceImpl.java | 1 - .../test/src/test/java/org/apache/karaf/itests/InstanceTest.java | 1 - itests/test/src/test/java/org/apache/karaf/itests/MavenTest.java | 2 -- .../src/test/java/org/apache/karaf/itests/OverrideConfigTest.java | 1 - itests/test/src/test/java/org/apache/karaf/itests/WebTest.java | 2 -- .../java/org/apache/karaf/itests/examples/ConfigExampleTest.java | 2 -- .../java/org/apache/karaf/itests/examples/JpaExampleTest.java | 1 - .../java/org/apache/karaf/itests/examples/RestExampleTest.java | 3 --- .../MavenResolverRegisteredOnlyAfterConfigAdminTest.java | 1 - .../org/apache/karaf/itests/ssh/ConfigSshCommandSecurityTest.java | 1 - .../karaf/log/core/internal/LogServiceLog4j2XmlImplTest.java | 3 --- .../java/org/apache/karaf/management/KarafMBeanServerGuard.java | 1 - .../apache/karaf/management/internal/EventAdminLoggerImpl.java | 1 - .../main/java/org/apache/karaf/profile/impl/osgi/Activator.java | 1 - .../test/java/org/apache/karaf/profile/assembly/BuilderTest.java | 5 ----- .../src/main/java/org/apache/karaf/scheduler/core/Activator.java | 8 -------- .../java/org/apache/karaf/scheduler/core/QuartzScheduler.java | 6 ------ .../main/java/org/apache/felix/eventadmin/impl/Configuration.java | 1 - .../apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java | 1 - .../java/org/apache/karaf/shell/commands/impl/WatchAction.java | 2 -- .../apache/karaf/shell/impl/console/osgi/LocalConsoleManager.java | 2 -- .../impl/console/osgi/secured/SecuredSessionFactoryImpl.java | 1 - .../shell/impl/action/command/ActionMaskingCallbackTest.java | 2 -- .../src/main/java/org/apache/karaf/tooling/VerifyMojo.java | 1 - 45 files changed, 1 insertion(+), 86 deletions(-) diff --git a/audit/src/test/java/org/apache/karaf/audit/logger/EventLoggerTest.java b/audit/src/test/java/org/apache/karaf/audit/logger/EventLoggerTest.java index e700291..f9f7a81 100644 --- a/audit/src/test/java/org/apache/karaf/audit/logger/EventLoggerTest.java +++ b/audit/src/test/java/org/apache/karaf/audit/logger/EventLoggerTest.java @@ -35,7 +35,6 @@ import java.net.Socket; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.sql.Timestamp; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.ArrayList; diff --git a/config/src/main/java/org/apache/karaf/config/command/PropSetCommand.java b/config/src/main/java/org/apache/karaf/config/command/PropSetCommand.java index 74eb2e8..1108bda 100644 --- a/config/src/main/java/org/apache/karaf/config/command/PropSetCommand.java +++ b/config/src/main/java/org/apache/karaf/config/command/PropSetCommand.java @@ -16,11 +16,6 @@ */ package org.apache.karaf.config.command; -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; -import java.util.Dictionary; - import org.apache.felix.utils.properties.TypedProperties; import org.apache.karaf.config.command.completers.ConfigurationPropertyCompleter; import org.apache.karaf.shell.api.action.Argument; diff --git a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java b/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java index 463edd0..c61f9ac 100644 --- a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java +++ b/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java @@ -25,10 +25,8 @@ import java.net.URL; import java.nio.file.Files; import java.util.Dictionary; import java.util.Enumeration; -import java.util.HashSet; import java.util.Hashtable; import java.util.Map; -import java.util.Set; import org.apache.felix.utils.properties.TypedProperties; import org.apache.karaf.config.core.ConfigRepository; diff --git a/docker/src/main/java/org/apache/karaf/docker/command/InfoCommand.java b/docker/src/main/java/org/apache/karaf/docker/command/InfoCommand.java index 239922b..963557d 100644 --- a/docker/src/main/java/org/apache/karaf/docker/command/InfoCommand.java +++ b/docker/src/main/java/org/apache/karaf/docker/command/InfoCommand.java @@ -18,7 +18,6 @@ package org.apache.karaf.docker.command; import org.apache.karaf.docker.Info; import org.apache.karaf.shell.api.action.Command; -import org.apache.karaf.shell.api.action.Option; import org.apache.karaf.shell.api.action.lifecycle.Service; @Command(scope = "docker", name = "info", description = "Display system-wide information") diff --git a/docker/src/main/java/org/apache/karaf/docker/command/StartCommand.java b/docker/src/main/java/org/apache/karaf/docker/command/StartCommand.java index 5cd0af9..4bb3a3b 100644 --- a/docker/src/main/java/org/apache/karaf/docker/command/StartCommand.java +++ b/docker/src/main/java/org/apache/karaf/docker/command/StartCommand.java @@ -20,7 +20,6 @@ import org.apache.karaf.docker.command.completers.ContainersNameCompleter; import org.apache.karaf.shell.api.action.Argument; import org.apache.karaf.shell.api.action.Command; import org.apache.karaf.shell.api.action.Completion; -import org.apache.karaf.shell.api.action.Option; import org.apache.karaf.shell.api.action.lifecycle.Service; import java.util.List; diff --git a/docker/src/main/java/org/apache/karaf/docker/internal/osgi/Activator.java b/docker/src/main/java/org/apache/karaf/docker/internal/osgi/Activator.java index 5ce1356..9c5a6e5 100644 --- a/docker/src/main/java/org/apache/karaf/docker/internal/osgi/Activator.java +++ b/docker/src/main/java/org/apache/karaf/docker/internal/osgi/Activator.java @@ -16,7 +16,6 @@ */ package org.apache.karaf.docker.internal.osgi; -import org.apache.karaf.docker.DockerMBean; import org.apache.karaf.docker.DockerService; import org.apache.karaf.docker.internal.DockerMBeanImpl; import org.apache.karaf.docker.internal.DockerServiceImpl; diff --git a/docker/src/test/java/org/apache/karaf/docker/DockerClientTest.java b/docker/src/test/java/org/apache/karaf/docker/DockerClientTest.java index b2e0514..43a8ca7 100644 --- a/docker/src/test/java/org/apache/karaf/docker/DockerClientTest.java +++ b/docker/src/test/java/org/apache/karaf/docker/DockerClientTest.java @@ -23,7 +23,6 @@ import org.junit.Test; import java.io.File; import java.util.ArrayList; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; diff --git a/examples/karaf-command-example/karaf-command-example-command/src/main/java/org/apache/karaf/examples/command/command/AddCommand.java b/examples/karaf-command-example/karaf-command-example-command/src/main/java/org/apache/karaf/examples/command/command/AddCommand.java index 5585f19..65c29e7 100644 --- a/examples/karaf-command-example/karaf-command-example-command/src/main/java/org/apache/karaf/examples/command/command/AddCommand.java +++ b/examples/karaf-command-example/karaf-command-example-command/src/main/java/org/apache/karaf/examples/command/command/AddCommand.java @@ -26,7 +26,6 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import java.util.Random; -import java.util.UUID; @Service @Command(scope = "booking", name = "add", description = "Add a booking") diff --git a/examples/karaf-itest-example/src/test/java/org/apache/karaf/examples/itests/ExampleITest.java b/examples/karaf-itest-example/src/test/java/org/apache/karaf/examples/itests/ExampleITest.java index 2daf378..13f70fd 100644 --- a/examples/karaf-itest-example/src/test/java/org/apache/karaf/examples/itests/ExampleITest.java +++ b/examples/karaf-itest-example/src/test/java/org/apache/karaf/examples/itests/ExampleITest.java @@ -33,7 +33,7 @@ import static org.ops4j.pax.exam.CoreOptions.maven; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import org.ops4j.pax.exam.karaf.container.internal.JavaVersionUtil; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.*; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; + import org.ops4j.pax.exam.options.extra.VMOption; @RunWith(PaxExam.class) diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-command/src/main/java/org/apache/karaf/examples/jdbc/command/AddCommand.java b/examples/karaf-jdbc-example/karaf-jdbc-example-command/src/main/java/org/apache/karaf/examples/jdbc/command/AddCommand.java index c328e31..6901c78 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-command/src/main/java/org/apache/karaf/examples/jdbc/command/AddCommand.java +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-command/src/main/java/org/apache/karaf/examples/jdbc/command/AddCommand.java @@ -26,7 +26,6 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import java.util.Random; -import java.util.UUID; @Service @Command(scope = "booking", name = "add", description = "Add a booking") diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-command/src/main/java/org/apache/karaf/examples/jdbc/command/GetCommand.java b/examples/karaf-jdbc-example/karaf-jdbc-example-command/src/main/java/org/apache/karaf/examples/jdbc/command/GetCommand.java index 519d81b..6502555 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-command/src/main/java/org/apache/karaf/examples/jdbc/command/GetCommand.java +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-command/src/main/java/org/apache/karaf/examples/jdbc/command/GetCommand.java @@ -27,8 +27,6 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.apache.karaf.shell.support.table.ShellTable; -import java.util.List; - @Service @Command(scope = "booking", name = "get", description = "Get the booking by id") public class GetCommand implements Action { diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/src/main/java/org/apache/karaf/examples/jpa/provider/ds/openjpa/BookingServiceImpl.java b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/src/main/java/org/apache/karaf/examples/jpa/provider/ds/openjpa/BookingServiceImpl.java index 574c902..35a74a7 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/src/main/java/org/apache/karaf/examples/jpa/provider/ds/openjpa/BookingServiceImpl.java +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/src/main/java/org/apache/karaf/examples/jpa/provider/ds/openjpa/BookingServiceImpl.java @@ -23,10 +23,6 @@ import org.apache.karaf.examples.jpa.BookingService; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; -import javax.persistence.EntityManager; -import javax.persistence.NoResultException; -import javax.persistence.TypedQuery; -import javax.transaction.Transactional; import java.util.List; /** diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/AddBookingCommand.java b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/AddBookingCommand.java index e52b983..c093452 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/AddBookingCommand.java +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/AddBookingCommand.java @@ -26,11 +26,6 @@ import org.apache.karaf.shell.api.action.Option; import org.apache.karaf.shell.api.action.lifecycle.Service; import javax.ws.rs.core.MediaType; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.net.HttpURLConnection; -import java.net.URL; import java.util.ArrayList; import java.util.List; diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/src/main/java/org/apache/karaf/examples/rest/client/http/AddBookingCommand.java b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/src/main/java/org/apache/karaf/examples/rest/client/http/AddBookingCommand.java index 778f39c..93fb1c3 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/src/main/java/org/apache/karaf/examples/rest/client/http/AddBookingCommand.java +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/src/main/java/org/apache/karaf/examples/rest/client/http/AddBookingCommand.java @@ -23,12 +23,10 @@ import org.apache.karaf.shell.api.action.Option; import org.apache.karaf.shell.api.action.lifecycle.Service; import java.io.BufferedReader; -import java.io.BufferedWriter; import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.net.HttpURLConnection; import java.net.URL; -import java.nio.Buffer; @Service @Command(scope = "booking", name = "add", description = "Add booking") diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java b/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java index c47d48e..0c78e0b 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java @@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; -import org.apache.karaf.features.Blacklisting; import org.apache.karaf.features.Feature; @XmlAccessorType(XmlAccessType.FIELD) diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/FeatureReplacements.java b/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/FeatureReplacements.java index eddef28..933fb57 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/FeatureReplacements.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/processing/FeatureReplacements.java @@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; -import org.apache.karaf.features.FeaturesNamespaces; import org.apache.karaf.features.internal.model.Feature; @XmlType(name = "featureReplacements", propOrder = { diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Blacklist.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Blacklist.java index fe3d86e..60db489 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/service/Blacklist.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/Blacklist.java @@ -20,7 +20,6 @@ import java.io.BufferedReader; import java.io.FileNotFoundException; import java.io.InputStream; import java.io.InputStreamReader; -import java.net.MalformedURLException; import java.net.URL; import java.util.Arrays; import java.util.Collections; diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java index 61a0ef9..7477767 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java @@ -51,7 +51,6 @@ import org.apache.karaf.features.FeatureState; import org.apache.karaf.features.FeaturesService; import org.apache.karaf.features.internal.download.DownloadManager; import org.apache.karaf.features.internal.download.StreamProvider; -import org.apache.karaf.features.internal.model.ConfigFile; import org.apache.karaf.features.internal.region.SubsystemResolver; import org.apache.karaf.features.internal.region.SubsystemResolverCallback; import org.apache.karaf.features.internal.resolver.FeatureResource; @@ -82,7 +81,6 @@ import org.osgi.resource.Resource; import org.osgi.resource.Wire; import org.osgi.service.repository.Repository; import org.osgi.service.resolver.Resolver; -import org.osgi.util.tracker.ServiceTracker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java index 3d2d9b7..5f44ede 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/Overrides.java @@ -23,7 +23,6 @@ import java.io.InputStreamReader; import java.net.URL; import java.util.ArrayList; import java.util.Collection; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; diff --git a/http/src/main/java/org/apache/karaf/http/command/ProxyAddCommand.java b/http/src/main/java/org/apache/karaf/http/command/ProxyAddCommand.java index 467ce4c..b3a7cb5 100644 --- a/http/src/main/java/org/apache/karaf/http/command/ProxyAddCommand.java +++ b/http/src/main/java/org/apache/karaf/http/command/ProxyAddCommand.java @@ -20,7 +20,6 @@ import org.apache.karaf.http.core.ProxyService; import org.apache.karaf.shell.api.action.Action; import org.apache.karaf.shell.api.action.Argument; import org.apache.karaf.shell.api.action.Command; -import org.apache.karaf.shell.api.action.Option; import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; diff --git a/http/src/main/java/org/apache/karaf/http/core/internal/HttpMBeanImpl.java b/http/src/main/java/org/apache/karaf/http/core/internal/HttpMBeanImpl.java index 6717db2..20763db 100644 --- a/http/src/main/java/org/apache/karaf/http/core/internal/HttpMBeanImpl.java +++ b/http/src/main/java/org/apache/karaf/http/core/internal/HttpMBeanImpl.java @@ -17,7 +17,6 @@ package org.apache.karaf.http.core.internal; import java.util.Arrays; -import java.util.Collection; import java.util.List; import java.util.Map; diff --git a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java index 58ab43a..a046fd0 100644 --- a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java +++ b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java @@ -23,7 +23,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.InterruptedIOException; import java.io.OutputStream; import java.io.PrintStream; import java.net.Socket; diff --git a/itests/test/src/test/java/org/apache/karaf/itests/InstanceTest.java b/itests/test/src/test/java/org/apache/karaf/itests/InstanceTest.java index 488ccba..1ee4f53 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/InstanceTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/InstanceTest.java @@ -19,7 +19,6 @@ import javax.management.ObjectName; import javax.management.openmbean.TabularData; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/itests/test/src/test/java/org/apache/karaf/itests/MavenTest.java b/itests/test/src/test/java/org/apache/karaf/itests/MavenTest.java index 8d0d8f3..4bb91f0 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/MavenTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/MavenTest.java @@ -66,8 +66,6 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.*; import static org.ops4j.pax.exam.CoreOptions.*; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.*; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel; @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) diff --git a/itests/test/src/test/java/org/apache/karaf/itests/OverrideConfigTest.java b/itests/test/src/test/java/org/apache/karaf/itests/OverrideConfigTest.java index 6dc6980..907b779 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/OverrideConfigTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/OverrideConfigTest.java @@ -31,7 +31,6 @@ import java.util.Hashtable; import static java.nio.file.StandardOpenOption.*; import static org.junit.Assert.*; -import static org.junit.Assert.assertEquals; @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) diff --git a/itests/test/src/test/java/org/apache/karaf/itests/WebTest.java b/itests/test/src/test/java/org/apache/karaf/itests/WebTest.java index 9e66a17..975698b 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/WebTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/WebTest.java @@ -15,8 +15,6 @@ package org.apache.karaf.itests; import javax.management.MBeanServer; import javax.management.ObjectName; -import javax.management.openmbean.CompositeData; -import javax.management.openmbean.SimpleType; import javax.management.openmbean.TabularData; import org.junit.Before; diff --git a/itests/test/src/test/java/org/apache/karaf/itests/examples/ConfigExampleTest.java b/itests/test/src/test/java/org/apache/karaf/itests/examples/ConfigExampleTest.java index 2fead38..3fd727e 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/examples/ConfigExampleTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/examples/ConfigExampleTest.java @@ -24,9 +24,7 @@ import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerMethod; import org.osgi.service.cm.Configuration; -import org.osgi.service.cm.ConfigurationAdmin; -import javax.inject.Inject; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.Dictionary; diff --git a/itests/test/src/test/java/org/apache/karaf/itests/examples/JpaExampleTest.java b/itests/test/src/test/java/org/apache/karaf/itests/examples/JpaExampleTest.java index 74b51cc..08fd6ad 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/examples/JpaExampleTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/examples/JpaExampleTest.java @@ -14,7 +14,6 @@ package org.apache.karaf.itests.examples; import org.apache.karaf.bundle.core.BundleService; -import org.apache.karaf.examples.jpa.BookingService; import org.apache.karaf.itests.KarafTestSupport; import org.apache.karaf.jaas.boot.principal.RolePrincipal; import org.junit.Test; diff --git a/itests/test/src/test/java/org/apache/karaf/itests/examples/RestExampleTest.java b/itests/test/src/test/java/org/apache/karaf/itests/examples/RestExampleTest.java index 5e4d9f4..453bc3f 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/examples/RestExampleTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/examples/RestExampleTest.java @@ -25,11 +25,8 @@ import org.ops4j.pax.exam.spi.reactors.PerMethod; import java.io.BufferedReader; import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; import java.net.HttpURLConnection; import java.net.URL; -import java.net.URLConnection; import static org.junit.Assert.assertEquals; diff --git a/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java b/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java index 96163e8..8148486 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java @@ -18,7 +18,6 @@ package org.apache.karaf.itests.mavenresolver; import static org.junit.Assert.assertEquals; import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFileExtend; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; import java.io.File; diff --git a/itests/test/src/test/java/org/apache/karaf/itests/ssh/ConfigSshCommandSecurityTest.java b/itests/test/src/test/java/org/apache/karaf/itests/ssh/ConfigSshCommandSecurityTest.java index 7d627be..9388828 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/ssh/ConfigSshCommandSecurityTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/ssh/ConfigSshCommandSecurityTest.java @@ -13,7 +13,6 @@ */ package org.apache.karaf.itests.ssh; -import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.junit.PaxExam; diff --git a/log/src/test/java/org/apache/karaf/log/core/internal/LogServiceLog4j2XmlImplTest.java b/log/src/test/java/org/apache/karaf/log/core/internal/LogServiceLog4j2XmlImplTest.java index 294e3f0..ce6a770 100644 --- a/log/src/test/java/org/apache/karaf/log/core/internal/LogServiceLog4j2XmlImplTest.java +++ b/log/src/test/java/org/apache/karaf/log/core/internal/LogServiceLog4j2XmlImplTest.java @@ -26,10 +26,7 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import java.io.ByteArrayInputStream; -import java.io.OutputStream; import java.io.StringWriter; -import java.nio.file.Files; -import java.nio.file.StandardOpenOption; import static org.junit.Assert.assertEquals; diff --git a/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java b/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java index 01d584b..a255587 100644 --- a/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java +++ b/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java @@ -16,7 +16,6 @@ */ package org.apache.karaf.management; -import org.apache.karaf.management.internal.Activator; import org.apache.karaf.management.internal.BulkRequestContext; import org.apache.karaf.management.internal.EventAdminLogger; import org.apache.karaf.management.internal.EventAdminMBeanServerWrapper; diff --git a/management/server/src/main/java/org/apache/karaf/management/internal/EventAdminLoggerImpl.java b/management/server/src/main/java/org/apache/karaf/management/internal/EventAdminLoggerImpl.java index b33a6bc..53fc16b 100644 --- a/management/server/src/main/java/org/apache/karaf/management/internal/EventAdminLoggerImpl.java +++ b/management/server/src/main/java/org/apache/karaf/management/internal/EventAdminLoggerImpl.java @@ -21,7 +21,6 @@ import org.osgi.service.event.Event; import org.osgi.service.event.EventAdmin; import org.osgi.util.tracker.ServiceTracker; -import java.io.Closeable; import java.util.HashMap; import java.util.Locale; import java.util.Map; diff --git a/profile/src/main/java/org/apache/karaf/profile/impl/osgi/Activator.java b/profile/src/main/java/org/apache/karaf/profile/impl/osgi/Activator.java index 7ed1b2f..fa1e925 100644 --- a/profile/src/main/java/org/apache/karaf/profile/impl/osgi/Activator.java +++ b/profile/src/main/java/org/apache/karaf/profile/impl/osgi/Activator.java @@ -19,7 +19,6 @@ package org.apache.karaf.profile.impl.osgi; import java.nio.file.Path; import java.nio.file.Paths; -import org.apache.karaf.profile.ProfileMBean; import org.apache.karaf.profile.ProfileService; import org.apache.karaf.profile.impl.ProfileMBeanImpl; import org.apache.karaf.profile.impl.ProfileServiceImpl; diff --git a/profile/src/test/java/org/apache/karaf/profile/assembly/BuilderTest.java b/profile/src/test/java/org/apache/karaf/profile/assembly/BuilderTest.java index e4e2f19..366859b 100644 --- a/profile/src/test/java/org/apache/karaf/profile/assembly/BuilderTest.java +++ b/profile/src/test/java/org/apache/karaf/profile/assembly/BuilderTest.java @@ -17,19 +17,14 @@ package org.apache.karaf.profile.assembly; import java.io.BufferedWriter; -import java.io.File; import java.io.IOException; import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; -import org.apache.karaf.features.internal.model.Features; -import org.apache.karaf.features.internal.service.RepositoryImpl; import org.junit.Test; import org.osgi.framework.Constants; diff --git a/scheduler/src/main/java/org/apache/karaf/scheduler/core/Activator.java b/scheduler/src/main/java/org/apache/karaf/scheduler/core/Activator.java index 1e66c19..1f18b99 100644 --- a/scheduler/src/main/java/org/apache/karaf/scheduler/core/Activator.java +++ b/scheduler/src/main/java/org/apache/karaf/scheduler/core/Activator.java @@ -22,14 +22,6 @@ import org.apache.karaf.util.tracker.annotation.Managed; import org.apache.karaf.util.tracker.annotation.ProvideService; import org.apache.karaf.util.tracker.annotation.Services; import org.osgi.service.cm.ManagedService; -import org.quartz.impl.jdbcjobstore.JobStoreSupport; -import org.quartz.impl.jdbcjobstore.JobStoreTX; -import org.quartz.impl.jdbcjobstore.StdJDBCDelegate; -import org.quartz.simpl.RAMJobStore; -import org.quartz.simpl.SimpleThreadPool; -import org.quartz.spi.JobStore; -import org.quartz.spi.ThreadPool; -import org.quartz.utils.ConnectionProvider; import java.util.Enumeration; import java.util.Properties; diff --git a/scheduler/src/main/java/org/apache/karaf/scheduler/core/QuartzScheduler.java b/scheduler/src/main/java/org/apache/karaf/scheduler/core/QuartzScheduler.java index b9eb680..74bc485 100644 --- a/scheduler/src/main/java/org/apache/karaf/scheduler/core/QuartzScheduler.java +++ b/scheduler/src/main/java/org/apache/karaf/scheduler/core/QuartzScheduler.java @@ -23,13 +23,7 @@ import org.apache.karaf.scheduler.ScheduleOptions; import org.apache.karaf.scheduler.Scheduler; import org.apache.karaf.scheduler.SchedulerError; import org.quartz.*; -import org.quartz.impl.DirectSchedulerFactory; -import org.quartz.impl.StdSchedulerFactory; import org.quartz.impl.matchers.GroupMatcher; -import org.quartz.simpl.CascadingClassLoadHelper; -import org.quartz.simpl.RAMJobStore; -import org.quartz.spi.JobStore; -import org.quartz.spi.ThreadPool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java index 0590719..53e8798 100644 --- a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java +++ b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java @@ -25,7 +25,6 @@ import java.util.StringTokenizer; import org.apache.felix.eventadmin.impl.adapter.AbstractAdapter; import org.apache.felix.eventadmin.impl.adapter.BundleEventAdapter; import org.apache.felix.eventadmin.impl.adapter.FrameworkEventAdapter; -import org.apache.felix.eventadmin.impl.adapter.LogEventAdapter; import org.apache.felix.eventadmin.impl.adapter.ServiceEventAdapter; import org.apache.felix.eventadmin.impl.handler.EventAdminImpl; import org.apache.felix.eventadmin.impl.security.SecureEventAdminFactory; diff --git a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java index 2368311..c4a732a 100644 --- a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java +++ b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java @@ -20,7 +20,6 @@ package org.apache.felix.eventadmin.impl.adapter; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; -import org.osgi.framework.BundleListener; import org.osgi.framework.SynchronousBundleListener; import org.osgi.service.event.Event; import org.osgi.service.event.EventAdmin; diff --git a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/WatchAction.java b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/WatchAction.java index 1d6fe13..3107881 100644 --- a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/WatchAction.java +++ b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/WatchAction.java @@ -20,7 +20,6 @@ package org.apache.karaf.shell.commands.impl; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.io.InterruptedIOException; import java.io.PrintStream; import java.util.ArrayList; @@ -42,7 +41,6 @@ import org.apache.karaf.shell.api.console.Completer; import org.apache.karaf.shell.api.console.Parser; import org.apache.karaf.shell.api.console.Session; import org.apache.karaf.shell.api.console.SessionFactory; -import org.apache.karaf.shell.api.console.Signal; import org.apache.karaf.shell.commands.impl.WatchAction.WatchParser; import org.apache.karaf.shell.support.ShellUtil; import org.apache.karaf.shell.support.completers.CommandsCompleter; diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/LocalConsoleManager.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/LocalConsoleManager.java index 261ca8d..49e5fe8 100644 --- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/LocalConsoleManager.java +++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/LocalConsoleManager.java @@ -18,7 +18,6 @@ */ package org.apache.karaf.shell.impl.console.osgi; -import java.io.OutputStream; import java.io.PrintStream; import java.nio.charset.Charset; import java.security.PrivilegedAction; @@ -33,7 +32,6 @@ import org.apache.karaf.shell.api.console.SessionFactory; import org.apache.karaf.shell.impl.console.JLineTerminal; import org.apache.karaf.shell.support.ShellUtil; import org.apache.karaf.util.jaas.JaasHelper; -import org.apache.sshd.common.util.io.NoCloseOutputStream; import org.jline.terminal.Terminal; import org.jline.terminal.TerminalBuilder; import org.osgi.framework.BundleContext; diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java index 9b65826..b6b0c99 100644 --- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java +++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java @@ -40,7 +40,6 @@ import org.apache.felix.service.threadio.ThreadIO; import org.apache.karaf.jaas.boot.principal.RolePrincipal; import org.apache.karaf.service.guard.tools.ACLConfigurationParser; import org.apache.karaf.shell.api.console.Command; -import org.apache.karaf.shell.api.console.Session; import org.apache.karaf.shell.impl.console.SessionFactoryImpl; import org.apache.karaf.util.tracker.SingleServiceTracker; import org.osgi.framework.BundleContext; diff --git a/shell/core/src/test/java/org/apache/karaf/shell/impl/action/command/ActionMaskingCallbackTest.java b/shell/core/src/test/java/org/apache/karaf/shell/impl/action/command/ActionMaskingCallbackTest.java index 672afdd..f5b1b11 100644 --- a/shell/core/src/test/java/org/apache/karaf/shell/impl/action/command/ActionMaskingCallbackTest.java +++ b/shell/core/src/test/java/org/apache/karaf/shell/impl/action/command/ActionMaskingCallbackTest.java @@ -32,7 +32,6 @@ import org.apache.karaf.shell.api.console.SessionFactory; import org.apache.karaf.shell.impl.console.HeadlessSessionImpl; import org.apache.karaf.shell.impl.console.SessionFactoryImpl; import org.apache.karaf.shell.impl.console.parsing.KarafParser; -import org.jline.reader.ParsedLine; import org.jline.reader.Parser; import org.junit.Before; import org.junit.Test; @@ -43,7 +42,6 @@ import java.io.InputStream; import java.io.PrintStream; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; public class ActionMaskingCallbackTest { diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java index f13e0cb..0b2238f 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java @@ -77,7 +77,6 @@ import org.apache.karaf.features.internal.model.Features; import org.apache.karaf.features.internal.model.JaxbUtil; import org.apache.karaf.features.internal.resolver.ResourceUtils; import org.apache.karaf.features.internal.service.Deployer; -import org.apache.karaf.features.internal.service.FeaturesProcessor; import org.apache.karaf.features.internal.service.FeaturesProcessorImpl; import org.apache.karaf.features.internal.service.FeaturesServiceConfig; import org.apache.karaf.features.internal.service.State;