Permalink
Browse files

SHRINKRES-39 Strategy type inference fixed

  • Loading branch information...
1 parent 460b104 commit 276548e62594ea86690c49b1e58a65d6076fb100 @kpiwko kpiwko committed Jul 12, 2012
Showing with 314 additions and 93 deletions.
  1. +4 −1 ...java/org/jboss/shrinkwrap/resolver/api/archive/ConfiguredArchiveDependencyDeclarationBuilder.java
  2. +5 −2 ...prototype/src/main/java/org/jboss/shrinkwrap/resolver/api/archive/MavenArchiveResolverSystem.java
  3. +4 −1 ...-prototype/src/main/java/org/jboss/shrinkwrap/resolver/api/archive/MavenArchiveStrategyStage.java
  4. +5 −2 ...e/src/main/java/org/jboss/shrinkwrap/resolver/api/archive/MavenConfiguredArchiveResolveStage.java
  5. +4 −3 ...ven-prototype/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/ConfigurableResolveStage.java
  6. +8 −1 ...prototype/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/ConfigurableResolveStageBase.java
  7. +3 −2 ...maven-prototype/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/ConfiguredResolveStage.java
  8. +4 −3 ...n-prototype/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/ConfiguredResolveStageBase.java
  9. +1 −1 api-maven-prototype/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/MavenResolutionFilter.java
  10. +8 −1 ...en-prototype/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/MavenResolutionFilterBase.java
  11. +22 −1 ...aven-prototype/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/MavenResolutionStrategy.java
  12. +25 −3 ...-prototype/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/MavenResolutionStrategyBase.java
  13. +7 −5 api-maven-prototype/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/MavenResolveStageBase.java
  14. +5 −4 api-maven-prototype/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/MavenResolverSystem.java
  15. +2 −1 api-maven-prototype/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/MavenStrategyStage.java
  16. +2 −3 ...maven-prototype/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/MavenStrategyStageBase.java
  17. +4 −1 .../org/jboss/shrinkwrap/resolver/api/maven/dependency/ConfigurableDependencyDeclarationBuilder.java
  18. +4 −1 ...va/org/jboss/shrinkwrap/resolver/api/maven/dependency/ConfiguredDependencyDeclarationBuilder.java
  19. +7 −5 ...ain/java/org/jboss/shrinkwrap/resolver/api/maven/dependency/DependencyDeclarationBuilderBase.java
  20. +7 −5 ...endency/exclusion/DependencyExclusionBuilderToConfigurableDependencyDeclarationBuilderBridge.java
  21. +7 −5 ...ependency/exclusion/DependencyExclusionBuilderToConfiguredDependencyDeclarationBuilderBridge.java
  22. +3 −1 ...aven/dependency/exclusion/DependencyExclusionBuilderToDependencyDeclarationBuilderBridgeBase.java
  23. +12 −2 ...en-prototype/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/AbstractResolveStageBase.java
  24. +3 −3 ...-prototype/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/ConfiguredResolveStageImpl.java
  25. +5 −1 ...-maven-prototype/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/MavenFormatStageImpl.java
  26. +55 −17 ...aven-prototype/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/MavenStrategyStageImpl.java
  27. +14 −12 ...org/jboss/shrinkwrap/resolver/impl/maven/dependency/AbstractDependencyDeclarationBuilderBase.java
  28. +8 −1 ...jboss/shrinkwrap/resolver/impl/maven/dependency/ConfigurableDependencyDeclarationBuilderImpl.java
  29. +8 −1 ...g/jboss/shrinkwrap/resolver/impl/maven/dependency/ConfiguredDependencyDeclarationBuilderImpl.java
  30. +4 −2 ...l/maven/exclusion/AbstractDependencyExclusionBuilderToDependencyDeclarationBuilderBridgeBase.java
  31. +3 −1 ...ven/exclusion/DependencyExclusionBuilderToConfigurableDependencyDeclarationBuilderBridgeImpl.java
  32. +3 −1 ...maven/exclusion/DependencyExclusionBuilderToConfiguredDependencyDeclarationBuilderBridgeImpl.java
  33. +12 −0 ...aven-prototype/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/filter/AcceptAllFilter.java
  34. +5 −0 ...e/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/SettingsXmlProfileSelector.java
  35. +5 −0 ...type/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/logging/LogModelProblemCollector.java
  36. +21 −0 ...n-prototype/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/task/ConfigureFromPomTask.java
  37. +5 −0 ...-prototype/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/WorkingSessionChainingTest.java
  38. +5 −0 ...st/java/org/jboss/shrinkwrap/resolver/impl/maven/dependency/DependencyDeclarationBuilderTest.java
  39. +5 −0 .../test/java/org/jboss/shrinkwrap/resolver/impl/maven/exclusion/DependencyExclusionBuilderTest.java
@@ -16,15 +16,18 @@
*/
package org.jboss.shrinkwrap.resolver.api.archive;
+import org.jboss.shrinkwrap.resolver.api.maven.MavenResolutionFilter;
+import org.jboss.shrinkwrap.resolver.api.maven.MavenResolutionStrategy;
import org.jboss.shrinkwrap.resolver.api.maven.dependency.DependencyDeclaration;
import org.jboss.shrinkwrap.resolver.api.maven.dependency.DependencyDeclarationBuilderBase;
import org.jboss.shrinkwrap.resolver.api.maven.dependency.exclusion.DependencyExclusionBuilderToConfiguredDependencyDeclarationBuilderBridge;
/**
* @author <a href="mailto:alr@jboss.org">Andrew Lee Rubinger</a>
+ * @author <a href="mailto:kpiwko@redhat.com">Karel Piwko</a>
*/
public interface ConfiguredArchiveDependencyDeclarationBuilder
extends
- DependencyDeclarationBuilderBase<DependencyDeclaration, ConfiguredArchiveDependencyDeclarationBuilder, DependencyExclusionBuilderToConfiguredDependencyDeclarationBuilderBridge, MavenConfiguredArchiveResolveStage, MavenArchiveStrategyStage, MavenFormatArchiveStage> {
+ DependencyDeclarationBuilderBase<DependencyDeclaration, ConfiguredArchiveDependencyDeclarationBuilder, MavenResolutionFilter, DependencyExclusionBuilderToConfiguredDependencyDeclarationBuilderBridge, MavenConfiguredArchiveResolveStage, MavenArchiveStrategyStage, MavenFormatArchiveStage, MavenResolutionStrategy> {
}
@@ -20,6 +20,8 @@
import org.jboss.shrinkwrap.resolver.api.ResolverSystem;
import org.jboss.shrinkwrap.resolver.api.Resolvers;
import org.jboss.shrinkwrap.resolver.api.maven.ConfigurableResolveStageBase;
+import org.jboss.shrinkwrap.resolver.api.maven.MavenResolutionFilter;
+import org.jboss.shrinkwrap.resolver.api.maven.MavenResolutionStrategy;
import org.jboss.shrinkwrap.resolver.api.maven.MavenResolveStageBase;
import org.jboss.shrinkwrap.resolver.api.maven.dependency.DependencyDeclaration;
import org.jboss.shrinkwrap.resolver.api.maven.dependency.exclusion.DependencyExclusionBuilderToConfiguredDependencyDeclarationBuilderBridge;
@@ -31,11 +33,12 @@
* {@link MavenArchiveResolverSystemShortcutImpl#INSTANCE}.
*
* @author <a href="mailto:alr@jboss.org">Andrew Lee Rubinger</a>
+ * @author <a href="mailto:kpiwko@redhat.com">Karel Piwko</a>
*/
public interface MavenArchiveResolverSystem
extends
ResolverSystem,
- MavenResolveStageBase<DependencyDeclaration, ConfiguredArchiveDependencyDeclarationBuilder, DependencyExclusionBuilderToConfiguredDependencyDeclarationBuilderBridge, MavenConfiguredArchiveResolveStage, MavenArchiveStrategyStage, MavenFormatArchiveStage>,
- ConfigurableResolveStageBase<DependencyDeclaration, ConfiguredArchiveDependencyDeclarationBuilder, DependencyExclusionBuilderToConfiguredDependencyDeclarationBuilderBridge, MavenConfiguredArchiveResolveStage, MavenArchiveStrategyStage, MavenFormatArchiveStage> {
+ MavenResolveStageBase<DependencyDeclaration, ConfiguredArchiveDependencyDeclarationBuilder, MavenResolutionFilter, DependencyExclusionBuilderToConfiguredDependencyDeclarationBuilderBridge, MavenConfiguredArchiveResolveStage, MavenArchiveStrategyStage, MavenFormatArchiveStage, MavenResolutionStrategy>,
+ ConfigurableResolveStageBase<DependencyDeclaration, ConfiguredArchiveDependencyDeclarationBuilder, MavenResolutionFilter, DependencyExclusionBuilderToConfiguredDependencyDeclarationBuilderBridge, MavenConfiguredArchiveResolveStage, MavenArchiveStrategyStage, MavenFormatArchiveStage, MavenResolutionStrategy> {
}
@@ -18,6 +18,8 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.resolver.api.StrategyStage;
+import org.jboss.shrinkwrap.resolver.api.maven.MavenResolutionFilter;
+import org.jboss.shrinkwrap.resolver.api.maven.MavenResolutionStrategy;
import org.jboss.shrinkwrap.resolver.api.maven.MavenStrategyStageBase;
import org.jboss.shrinkwrap.resolver.api.maven.dependency.DependencyDeclaration;
@@ -28,6 +30,7 @@
* @author <a href="mailto:alr@jboss.org">Andrew Lee Rubinger</a>
* @author <a href="mailto:kpiwko@redhat.com">Karel Piwko</a>
*/
-public interface MavenArchiveStrategyStage extends MavenStrategyStageBase<DependencyDeclaration, MavenFormatArchiveStage> {
+public interface MavenArchiveStrategyStage extends
+ MavenStrategyStageBase<DependencyDeclaration, MavenResolutionFilter, MavenFormatArchiveStage, MavenResolutionStrategy> {
}
@@ -19,6 +19,8 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.resolver.api.Resolvers;
import org.jboss.shrinkwrap.resolver.api.maven.ConfiguredResolveStageBase;
+import org.jboss.shrinkwrap.resolver.api.maven.MavenResolutionFilter;
+import org.jboss.shrinkwrap.resolver.api.maven.MavenResolutionStrategy;
import org.jboss.shrinkwrap.resolver.api.maven.MavenResolveStageBase;
import org.jboss.shrinkwrap.resolver.api.maven.dependency.DependencyDeclaration;
import org.jboss.shrinkwrap.resolver.api.maven.dependency.exclusion.DependencyExclusionBuilderToConfiguredDependencyDeclarationBuilderBridge;
@@ -30,10 +32,11 @@
* {@link MavenArchiveResolverSystemShortcutImpl#INSTANCE}.
*
* @author <a href="mailto:alr@jboss.org">Andrew Lee Rubinger</a>
+ * @author <a href="mailto:kpiwko@redhat.com">Karel Piwko</a>
*/
public interface MavenConfiguredArchiveResolveStage
extends
- MavenResolveStageBase<DependencyDeclaration, ConfiguredArchiveDependencyDeclarationBuilder, DependencyExclusionBuilderToConfiguredDependencyDeclarationBuilderBridge, MavenConfiguredArchiveResolveStage, MavenArchiveStrategyStage, MavenFormatArchiveStage>,
- ConfiguredResolveStageBase<MavenFormatArchiveStage> {
+ MavenResolveStageBase<DependencyDeclaration, ConfiguredArchiveDependencyDeclarationBuilder, MavenResolutionFilter, DependencyExclusionBuilderToConfiguredDependencyDeclarationBuilderBridge, MavenConfiguredArchiveResolveStage, MavenArchiveStrategyStage, MavenFormatArchiveStage, MavenResolutionStrategy>,
+ ConfiguredResolveStageBase<MavenFormatArchiveStage,MavenResolutionStrategy> {
}
@@ -26,10 +26,11 @@
* {@link MavenResolverSystem#configureFromPom(String)}.
*
* @author <a href="mailto:alr@jboss.org">Andrew Lee Rubinger</a>
+ * @author <a href="mailto:kpiwko@redhat.com">Karel Piwko</a>
*/
public interface ConfigurableResolveStage
- extends
- MavenResolveStageBase<DependencyDeclaration, ConfigurableDependencyDeclarationBuilder, DependencyExclusionBuilderToConfigurableDependencyDeclarationBuilderBridge, ConfigurableResolveStage, MavenStrategyStage, MavenFormatStage>,
- ConfigurableResolveStageBase<DependencyDeclaration, ConfigurableDependencyDeclarationBuilder, DependencyExclusionBuilderToConfigurableDependencyDeclarationBuilderBridge, ConfigurableResolveStage, MavenStrategyStage, MavenFormatStage> {
+ extends
+ MavenResolveStageBase<DependencyDeclaration, ConfigurableDependencyDeclarationBuilder, MavenResolutionFilter, DependencyExclusionBuilderToConfigurableDependencyDeclarationBuilderBridge, ConfigurableResolveStage, MavenStrategyStage, MavenFormatStage, MavenResolutionStrategy>,
+ ConfigurableResolveStageBase<DependencyDeclaration, ConfigurableDependencyDeclarationBuilder, MavenResolutionFilter, DependencyExclusionBuilderToConfigurableDependencyDeclarationBuilderBridge, ConfigurableResolveStage, MavenStrategyStage, MavenFormatStage, MavenResolutionStrategy> {
}
@@ -30,7 +30,14 @@
* @author <a href="mailto:alr@jboss.org">Andrew Lee Rubinger</a>
* @author <a href="mailto:kpiwko@redhat.com">Karel Piwko</a>
*/
-public interface ConfigurableResolveStageBase<COORDINATETYPE extends DependencyDeclarationBase, COORDINATEBUILDERTYPE extends DependencyDeclarationBuilderBase<COORDINATETYPE, COORDINATEBUILDERTYPE, EXCLUSIONBUILDERTYPE, RESOLVESTAGETYPE, STRATEGYSTAGETYPE, FORMATSTAGETYPE>, EXCLUSIONBUILDERTYPE extends DependencyExclusionBuilderBase<EXCLUSIONBUILDERTYPE>, RESOLVESTAGETYPE extends MavenResolveStageBase<COORDINATETYPE, COORDINATEBUILDERTYPE, EXCLUSIONBUILDERTYPE, RESOLVESTAGETYPE, STRATEGYSTAGETYPE, FORMATSTAGETYPE>, STRATEGYSTAGETYPE extends MavenStrategyStageBase<COORDINATETYPE, FORMATSTAGETYPE>, FORMATSTAGETYPE extends MavenFormatStage> {
+public interface ConfigurableResolveStageBase<COORDINATETYPE extends DependencyDeclarationBase,
+COORDINATEBUILDERTYPE extends DependencyDeclarationBuilderBase<COORDINATETYPE, COORDINATEBUILDERTYPE, RESOLUTIONFILTERTYPE, EXCLUSIONBUILDERTYPE, RESOLVESTAGETYPE, STRATEGYSTAGETYPE, FORMATSTAGETYPE, RESOLUTIONSTRATEGYTYPE>,
+RESOLUTIONFILTERTYPE extends MavenResolutionFilterBase<COORDINATETYPE, RESOLUTIONFILTERTYPE>,
+EXCLUSIONBUILDERTYPE extends DependencyExclusionBuilderBase<EXCLUSIONBUILDERTYPE>,
+RESOLVESTAGETYPE extends MavenResolveStageBase<COORDINATETYPE, COORDINATEBUILDERTYPE, RESOLUTIONFILTERTYPE, EXCLUSIONBUILDERTYPE, RESOLVESTAGETYPE, STRATEGYSTAGETYPE, FORMATSTAGETYPE, RESOLUTIONSTRATEGYTYPE>,
+STRATEGYSTAGETYPE extends MavenStrategyStageBase<COORDINATETYPE, RESOLUTIONFILTERTYPE, FORMATSTAGETYPE, RESOLUTIONSTRATEGYTYPE>,
+FORMATSTAGETYPE extends MavenFormatStage,
+RESOLUTIONSTRATEGYTYPE extends MavenResolutionStrategyBase<COORDINATETYPE, RESOLUTIONFILTERTYPE, RESOLUTIONSTRATEGYTYPE>> {
/**
* Configures the Maven Resolver System Project Object Model from metadata contained in the specified POM {@link File}.
*
@@ -26,10 +26,11 @@
* {@link MavenResolverSystem#configureFromPom(String)}.
*
* @author <a href="mailto:alr@jboss.org">Andrew Lee Rubinger</a>
+ * @author <a href="mailto:kpiwko@redhat.com">Karel Piwko</a>
*/
public interface ConfiguredResolveStage
extends
- MavenResolveStageBase<DependencyDeclaration, ConfiguredDependencyDeclarationBuilder, DependencyExclusionBuilderToConfiguredDependencyDeclarationBuilderBridge, ConfiguredResolveStage, MavenStrategyStage, MavenFormatStage>,
- ConfiguredResolveStageBase<MavenFormatStage> {
+ MavenResolveStageBase<DependencyDeclaration, ConfiguredDependencyDeclarationBuilder, MavenResolutionFilter, DependencyExclusionBuilderToConfiguredDependencyDeclarationBuilderBridge, ConfiguredResolveStage, MavenStrategyStage, MavenFormatStage, MavenResolutionStrategy>,
+ ConfiguredResolveStageBase<MavenFormatStage, MavenResolutionStrategy> {
}
@@ -24,8 +24,9 @@
* Model) metadata
*
* @author <a href="mailto:alr@jboss.org">Andrew Lee Rubinger</a>
+ * @author <a href="mailto:kpiwko@redhat.com">Karel Piwko</a>
*/
-public interface ConfiguredResolveStageBase<FORMATSTAGETYPE extends MavenFormatStage> {
+public interface ConfiguredResolveStageBase<FORMATSTAGETYPE extends MavenFormatStage, RESOLUTIONSTRATEGYTYPE extends MavenResolutionStrategy> {
/**
* Resolves all dependencies defined by the POM metadata in "test" scope
*
@@ -46,7 +47,7 @@
* @throws IllegalArgumentException
* If no strategy is specified
*/
- FORMATSTAGETYPE importTestDependencies(ResolutionStrategy strategy) throws IllegalArgumentException;
+ FORMATSTAGETYPE importTestDependencies(RESOLUTIONSTRATEGYTYPE strategy) throws IllegalArgumentException;
/**
* Resolves all dependencies defined by the POM metadata
@@ -67,5 +68,5 @@
* @throws IllegalArgumentException
* If no strategy is specified
*/
- FORMATSTAGETYPE importDefinedDependencies(ResolutionStrategy strategy) throws IllegalArgumentException;
+ FORMATSTAGETYPE importDefinedDependencies(RESOLUTIONSTRATEGYTYPE strategy) throws IllegalArgumentException;
}
@@ -24,6 +24,6 @@
* @author <a href="mailto:alr@jboss.org">Andrew Lee Rubinger</a>
* @author <a href="mailto:kpiwko@redhat.com">Karel Piwko</a>
*/
-public interface MavenResolutionFilter extends MavenResolutionFilterBase<DependencyDeclaration> {
+public interface MavenResolutionFilter extends MavenResolutionFilterBase<DependencyDeclaration, MavenResolutionFilter> {
}
@@ -16,6 +16,8 @@
*/
package org.jboss.shrinkwrap.resolver.api.maven;
+import java.util.List;
+
import org.jboss.shrinkwrap.resolver.api.ResolutionFilter;
import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenCoordinateBase;
@@ -25,6 +27,11 @@
*
* @param <COORDINATETYPE>
*/
-public interface MavenResolutionFilterBase<COORDINATETYPE extends MavenCoordinateBase> extends ResolutionFilter<COORDINATETYPE> {
+public interface MavenResolutionFilterBase<COORDINATETYPE extends MavenCoordinateBase, RESOLUTIONFILTERTYPE extends MavenResolutionFilterBase<COORDINATETYPE, RESOLUTIONFILTERTYPE>>
+ extends ResolutionFilter<COORDINATETYPE> {
+
+ RESOLUTIONFILTERTYPE setDefinedDependencies(List<COORDINATETYPE> dependencies);
+
+ RESOLUTIONFILTERTYPE setDefinedDependencyManagement(List<COORDINATETYPE> dependencyManagement);
}
@@ -1,7 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ */
package org.jboss.shrinkwrap.resolver.api.maven;
import org.jboss.shrinkwrap.resolver.api.maven.dependency.DependencyDeclaration;
-public interface MavenResolutionStrategy extends MavenResolutionStrategyBase<DependencyDeclaration> {
+/**
+ *
+ * @author <a href="mailto:kpiwko@redhat.com">Karel Piwko</a>
+ *
+ */
+public interface MavenResolutionStrategy extends
+ MavenResolutionStrategyBase<DependencyDeclaration, MavenResolutionFilter, MavenResolutionStrategy> {
}
@@ -1,10 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ */
package org.jboss.shrinkwrap.resolver.api.maven;
import org.jboss.shrinkwrap.resolver.api.TransitiveResolutionStrategy;
import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenCoordinateBase;
-public interface MavenResolutionStrategyBase<COORDINATETYPE extends MavenCoordinateBase>
- extends
- TransitiveResolutionStrategy<COORDINATETYPE, MavenResolutionFilterBase<COORDINATETYPE>, MavenResolutionStrategyBase<COORDINATETYPE>> {
+/**
+ *
+ * @author <a href="mailto:kpiwko@redhat.com">Karel Piwko</a>
+ *
+ * @param <COORDINATETYPE>
+ * @param <RESOLUTIONFILTERTYPE>
+ * @param <RESOLUTIONSTRATEGYTYPE>
+ */
+public interface MavenResolutionStrategyBase<COORDINATETYPE extends MavenCoordinateBase, RESOLUTIONFILTERTYPE extends MavenResolutionFilterBase<COORDINATETYPE, RESOLUTIONFILTERTYPE>, RESOLUTIONSTRATEGYTYPE extends MavenResolutionStrategyBase<COORDINATETYPE, RESOLUTIONFILTERTYPE, RESOLUTIONSTRATEGYTYPE>>
+ extends TransitiveResolutionStrategy<COORDINATETYPE, RESOLUTIONFILTERTYPE, RESOLUTIONSTRATEGYTYPE> {
}
@@ -37,13 +37,15 @@
* @author <a href="mailto:kpiwko@redhat.com">Karel Piwko</a
*/
public interface MavenResolveStageBase<COORDINATETYPE extends DependencyDeclarationBase,
- COORDINATEBUILDERTYPE extends DependencyDeclarationBuilderBase<COORDINATETYPE, COORDINATEBUILDERTYPE, EXCLUSIONBUILDERTYPE, RESOLVESTAGETYPE, STRATEGYSTAGETYPE, FORMATSTAGETYPE>,
+ COORDINATEBUILDERTYPE extends DependencyDeclarationBuilderBase<COORDINATETYPE, COORDINATEBUILDERTYPE, RESOLUTIONFILTERTYPE, EXCLUSIONBUILDERTYPE, RESOLVESTAGETYPE, STRATEGYSTAGETYPE, FORMATSTAGETYPE, RESOLUTIONSTRATEGYTYPE>,
+ RESOLUTIONFILTERTYPE extends MavenResolutionFilterBase<COORDINATETYPE,RESOLUTIONFILTERTYPE>,
EXCLUSIONBUILDERTYPE extends DependencyExclusionBuilderBase<EXCLUSIONBUILDERTYPE>,
- RESOLVESTAGETYPE extends MavenResolveStageBase<COORDINATETYPE, COORDINATEBUILDERTYPE, EXCLUSIONBUILDERTYPE, RESOLVESTAGETYPE, STRATEGYSTAGETYPE, FORMATSTAGETYPE>,
- STRATEGYSTAGETYPE extends MavenStrategyStageBase<COORDINATETYPE,FORMATSTAGETYPE>,
- FORMATSTAGETYPE extends MavenFormatStage>
+ RESOLVESTAGETYPE extends MavenResolveStageBase<COORDINATETYPE, COORDINATEBUILDERTYPE, RESOLUTIONFILTERTYPE, EXCLUSIONBUILDERTYPE, RESOLVESTAGETYPE, STRATEGYSTAGETYPE, FORMATSTAGETYPE, RESOLUTIONSTRATEGYTYPE>,
+ STRATEGYSTAGETYPE extends MavenStrategyStageBase<COORDINATETYPE,RESOLUTIONFILTERTYPE, FORMATSTAGETYPE, RESOLUTIONSTRATEGYTYPE>,
+ FORMATSTAGETYPE extends MavenFormatStage,
+ RESOLUTIONSTRATEGYTYPE extends MavenResolutionStrategyBase<COORDINATETYPE,RESOLUTIONFILTERTYPE,RESOLUTIONSTRATEGYTYPE>>
extends
- ResolveStage<COORDINATETYPE, COORDINATEBUILDERTYPE, MavenResolutionFilterBase<COORDINATETYPE>, RESOLVESTAGETYPE, STRATEGYSTAGETYPE, FORMATSTAGETYPE, MavenResolutionStrategyBase<COORDINATETYPE>> {
+ ResolveStage<COORDINATETYPE, COORDINATEBUILDERTYPE, RESOLUTIONFILTERTYPE, RESOLVESTAGETYPE, STRATEGYSTAGETYPE, FORMATSTAGETYPE, RESOLUTIONSTRATEGYTYPE> {
/**
* Configures the Maven Resolver System Settings from metadata contained in the specified settings.xml {@link File}.
@@ -30,11 +30,12 @@
* {@link MavenResolverSystemShortcutImpl#INSTANCE}.
*
* @author <a href="mailto:alr@jboss.org">Andrew Lee Rubinger</a>
+ * @author <a href="mailto:kpiwko@redhat.com">Karel Piwko</a>
*/
public interface MavenResolverSystem
- extends
- ResolverSystem,
- MavenResolveStageBase<DependencyDeclaration, ConfigurableDependencyDeclarationBuilder, DependencyExclusionBuilderToConfigurableDependencyDeclarationBuilderBridge, ConfigurableResolveStage, MavenStrategyStage, MavenFormatStage>,
- ConfigurableResolveStageBase<DependencyDeclaration, ConfiguredDependencyDeclarationBuilder, DependencyExclusionBuilderToConfiguredDependencyDeclarationBuilderBridge, ConfiguredResolveStage, MavenStrategyStage, MavenFormatStage> {
+ extends
+ ResolverSystem,
+ MavenResolveStageBase<DependencyDeclaration, ConfigurableDependencyDeclarationBuilder, MavenResolutionFilter, DependencyExclusionBuilderToConfigurableDependencyDeclarationBuilderBridge, ConfigurableResolveStage, MavenStrategyStage, MavenFormatStage, MavenResolutionStrategy>,
+ ConfigurableResolveStageBase<DependencyDeclaration, ConfiguredDependencyDeclarationBuilder, MavenResolutionFilter, DependencyExclusionBuilderToConfiguredDependencyDeclarationBuilderBridge, ConfiguredResolveStage, MavenStrategyStage, MavenFormatStage, MavenResolutionStrategy> {
}
@@ -25,6 +25,7 @@
* @author <a href="mailto:alr@jboss.org">Andrew Lee Rubinger</a>
* @author <a href="mailto:kpiwko@redhat.com">Karel Piwko</a>
*/
-public interface MavenStrategyStage extends MavenStrategyStageBase<DependencyDeclaration, MavenFormatStage> {
+public interface MavenStrategyStage extends
+ MavenStrategyStageBase<DependencyDeclaration, MavenResolutionFilter, MavenFormatStage, MavenResolutionStrategy> {
}
Oops, something went wrong.

0 comments on commit 276548e

Please sign in to comment.