Hi Martin,

Indeed, thx. Just removed the duplicated dependencies. I noticed that we
have a few more redundant scopes across 6.x, 7.x and master branches; will
run a larger cleanup later so we can have a meaningful setup inside
<dependenciesManagement>.

Pedro Santos

On Tue, Sep 6, 2016 at 5:02 AM, Martin Grigorov <[email protected]>
wrote:

> Hi Pedro,
>
> On Tue, Sep 6, 2016 at 12:11 AM, <[email protected]> wrote:
>
>> Repository: wicket
>> Updated Branches:
>>   refs/heads/wicket-6.x 5d5af682d -> 635b21c6e
>>
>>
>> better test dependencies defaults as in wicket 7 and 8 plus changing
>> wicket-core hamcrest dependency scope to test
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/635b21c6
>> Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/635b21c6
>> Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/635b21c6
>>
>> Branch: refs/heads/wicket-6.x
>> Commit: 635b21c6e2c2862f9fc196e4af653bb209c06b36
>> Parents: 5d5af68
>> Author: Pedro Henrique Oliveira dos Santos <[email protected]>
>> Authored: Mon Sep 5 19:11:31 2016 -0300
>> Committer: Pedro Henrique Oliveira dos Santos <[email protected]>
>> Committed: Mon Sep 5 19:11:31 2016 -0300
>>
>> ----------------------------------------------------------------------
>>  pom.xml             | 20 ++++++++++++++++++++
>>  wicket-core/pom.xml | 16 ----------------
>>  wicket-util/pom.xml |  4 ----
>>  3 files changed, 20 insertions(+), 20 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/635b21c6/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/pom.xml b/pom.xml
>> index c20552c..c104886 100644
>> --- a/pom.xml
>> +++ b/pom.xml
>> @@ -523,6 +523,26 @@
>>                         <scope>test</scope>
>>                 </dependency>
>>                 <dependency>
>> +                       <groupId>org.hamcrest</groupId>
>> +                       <artifactId>hamcrest-library</artifactId>
>> +                       <scope>test</scope>
>> +               </dependency>
>> +               <dependency>
>> +                       <groupId>org.hamcrest</groupId>
>> +                       <artifactId>hamcrest-core</artifactId>
>> +                       <scope>test</scope>
>> +               </dependency>
>> +               <dependency>
>> +                       <groupId>org.hamcrest</groupId>
>> +                       <artifactId>hamcrest-library</artifactId>
>> +                       <scope>test</scope>
>> +               </dependency>
>> +               <dependency>
>> +                       <groupId>org.hamcrest</groupId>
>> +                       <artifactId>hamcrest-core</artifactId>
>> +                       <scope>test</scope>
>> +               </dependency>
>>
>
> Those new entries look duplicated to me.
> If they are in <dependencies> section then they don't need the <scope>
> setting. It comes from <dependenciesManagement>.
>
>
>> +               <dependency>
>>                         <groupId>org.mockito</groupId>
>>                         <artifactId>mockito-all</artifactId>
>>                         <scope>test</scope>
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/635b21c6/
>> wicket-core/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
>> index 06c5dd2..7689a14 100644
>> --- a/wicket-core/pom.xml
>> +++ b/wicket-core/pom.xml
>> @@ -50,22 +50,6 @@
>>                         <scope>provided</scope>
>>                         <!-- provided because of the -test jar we build?
>> -->
>>                 </dependency>
>> -               <dependency>
>> -                       <groupId>org.mockito</groupId>
>> -                       <artifactId>mockito-all</artifactId>
>> -                       <scope>provided</scope>
>> -                       <!-- provided because of the -test jar we build?
>> -->
>> -               </dependency>
>> -               <dependency>
>> -                       <groupId>org.hamcrest</groupId>
>> -                       <artifactId>hamcrest-library</artifactId>
>> -                       <scope>provided</scope>
>> -               </dependency>
>> -               <dependency>
>> -                       <groupId>org.hamcrest</groupId>
>> -                       <artifactId>hamcrest-core</artifactId>
>> -                       <scope>provided</scope>
>> -               </dependency>
>>         </dependencies>
>>         <build>
>>                 <plugins>
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/635b21c6/
>> wicket-util/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
>> index 0da1693..edd0bb9 100755
>> --- a/wicket-util/pom.xml
>> +++ b/wicket-util/pom.xml
>> @@ -31,10 +31,6 @@
>>                 <artifactId>junit</artifactId>
>>                 <scope>provided</scope>
>>         </dependency>
>> -       <dependency>
>> -               <groupId>org.hamcrest</groupId>
>> -               <artifactId>hamcrest-library</artifactId>
>> -       </dependency>
>>    </dependencies>
>>    <build>
>>         <pluginManagement>
>>
>>
>

Reply via email to