diff options
author | Olli Virtanen <olli.virtanen@oath.com> | 2018-06-13 13:38:26 +0200 |
---|---|---|
committer | Olli Virtanen <olli.virtanen@oath.com> | 2018-06-13 13:38:26 +0200 |
commit | d5836f186c269986cb9d86374b54b540bf600930 (patch) | |
tree | e95e2ec309835ef1d285630e87bae5d177e9934b /jdisc_core | |
parent | eb80fb0d3a6004431ff13e36e9f480ccb32ec31f (diff) |
Bundle-plugin Scala code converted to Java
Diffstat (limited to 'jdisc_core')
-rw-r--r-- | jdisc_core/pom.xml | 7 | ||||
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java | 9 |
2 files changed, 0 insertions, 16 deletions
diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index 55da222994f..246265203cb 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -147,13 +147,6 @@ <version>${project.version}</version> <scope>compile</scope> </dependency> - <dependency> - <!-- This seems odd. Used for export-package parsing. Lazy stuff. Should be separated out. --> - <groupId>com.yahoo.vespa</groupId> - <artifactId>bundle-plugin</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> </dependencies> <build> <plugins> diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java index f2e9c1a6e53..8da1a4fad99 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java @@ -1,11 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.core; -import com.yahoo.container.plugin.bundle.TransformExportPackages; -import com.yahoo.container.plugin.osgi.ExportPackages.Export; import org.apache.felix.framework.util.Util; import org.osgi.framework.Constants; -import scala.collection.immutable.List; import java.io.File; import java.io.FileInputStream; @@ -96,10 +93,4 @@ public class ExportPackages { return jar.getManifest().getMainAttributes().getValue(Constants.EXPORT_PACKAGE); } } - - private static String transformExports(List<Export> exports, String newVersion) { - return TransformExportPackages.toExportPackageProperty( - TransformExportPackages.removeUses( - TransformExportPackages.replaceVersions(exports, newVersion))); - } } |