Repository: karaf Updated Branches: refs/heads/master e8e985a1c -> 63e1146f6
Partial revert of "Fix Jaas integration test" This partially reverts commit e8e985a1cf885c80c94d39f42d3c56e25e81476d. Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/666ce663 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/666ce663 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/666ce663 Branch: refs/heads/master Commit: 666ce663ee3943d9c8eee375af69da5f3a11788f Parents: e8e985a Author: Guillaume Nodet <[email protected]> Authored: Tue Jul 22 22:03:22 2014 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Tue Jul 22 22:04:19 2014 +0200 ---------------------------------------------------------------------- assemblies/features/standard/pom.xml | 2 -- .../tooling/features/ValidateDescriptorMojo.java | 18 ++---------------- 2 files changed, 2 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/666ce663/assemblies/features/standard/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml index 8edbe22..0474f4d 100644 --- a/assemblies/features/standard/pom.xml +++ b/assemblies/features/standard/pom.xml @@ -444,11 +444,9 @@ <phase>compile</phase> <goals> <goal>features-generate-descriptor</goal> - <goal>features-validate-descriptor</goal> </goals> <configuration> <addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature> - <file>${project.build.directory}/feature/feature.xml</file> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/karaf/blob/666ce663/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java index dff75e1..8263454 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java @@ -19,7 +19,6 @@ package org.apache.karaf.tooling.features; import aQute.bnd.header.OSGiHeader; import org.apache.felix.utils.manifest.Clause; -import org.apache.felix.utils.version.VersionTable; import org.apache.karaf.features.BundleInfo; import org.apache.karaf.features.Dependency; import org.apache.karaf.features.Feature; @@ -41,7 +40,6 @@ import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.shared.dependency.tree.DependencyNode; import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder; import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor; -import org.osgi.framework.Version; import java.io.*; import java.net.URI; @@ -659,23 +657,11 @@ public class ValidateDescriptorMojo extends MojoSupport { } public Feature get(String name, String version) throws Exception { - Feature best = null; for (Feature feature : features) { - if (name.equals(feature.getName())) { - if (best == null) { - best = feature; - } else { - Version v1 = VersionTable.getVersion(feature.getVersion()); - Version v2 = VersionTable.getVersion(best.getVersion()); - if (v1.compareTo(v2) > 0) { - best = feature; - } - } + if (name.equals(feature.getName()) && version.equals(feature.getVersion())) { + return feature; } } - if (best != null) { - return best; - } throw new Exception(String.format("Unable to find definition for feature %s (version %s)", name, version)); }
