You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by if...@apache.org on 2014/08/28 05:17:54 UTC
[1/2] git commit: enabled JSR330-only components in all unit tests
Repository: maven
Updated Branches:
refs/heads/master e67714aa2 -> 2909b5a32
enabled JSR330-only components in all unit tests
Signed-off-by: Igor Fedorenko <if...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0ba8fa12
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0ba8fa12
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0ba8fa12
Branch: refs/heads/master
Commit: 0ba8fa125855dc653105e1bb7e09bac390d2dd65
Parents: e67714a
Author: Igor Fedorenko <if...@apache.org>
Authored: Wed Aug 27 10:15:25 2014 -0400
Committer: Igor Fedorenko <if...@apache.org>
Committed: Wed Aug 27 10:15:25 2014 -0400
----------------------------------------------------------------------
.../maven/repository/internal/AbstractRepositoryTestCase.java | 2 ++
.../apache/maven/artifact/AbstractArtifactComponentTestCase.java | 2 ++
.../org/apache/maven/project/AbstractMavenProjectTestCase.java | 2 ++
.../org/apache/maven/repository/LegacyRepositorySystemTest.java | 2 ++
.../apache/maven/repository/legacy/LegacyRepositorySystemTest.java | 2 ++
.../org/apache/maven/project/AbstractMavenProjectTestCase.java | 2 ++
.../test/java/org/apache/maven/project/PomConstructionTest.java | 2 ++
.../org/apache/maven/settings/PomConstructionWithSettingsTest.java | 2 ++
8 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/0ba8fa12/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
index eea3830..b81450c 100644
--- a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
+++ b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
@@ -24,6 +24,7 @@ import java.net.MalformedURLException;
import org.apache.maven.repository.internal.util.ConsoleRepositoryListener;
import org.apache.maven.repository.internal.util.ConsoleTransferListener;
import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusTestCase;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
@@ -43,6 +44,7 @@ public abstract class AbstractRepositoryTestCase
{
super.customizeContainerConfiguration( containerConfiguration );
containerConfiguration.setAutoWiring( true );
+ containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
}
@Override
http://git-wip-us.apache.org/repos/asf/maven/blob/0ba8fa12/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
index 3f96793..91265db 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
@@ -37,6 +37,7 @@ import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.DefaultMavenExecutionResult;
import org.apache.maven.execution.MavenSession;
import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusTestCase;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystemSession;
@@ -76,6 +77,7 @@ public abstract class AbstractArtifactComponentTestCase
{
super.customizeContainerConfiguration( containerConfiguration );
containerConfiguration.setAutoWiring( true );
+ containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
}
@Override
http://git-wip-us.apache.org/repos/asf/maven/blob/0ba8fa12/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
index f897dbf..71f79a4 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
@@ -29,6 +29,7 @@ import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusTestCase;
import org.eclipse.aether.DefaultRepositorySystemSession;
@@ -47,6 +48,7 @@ public abstract class AbstractMavenProjectTestCase
{
super.customizeContainerConfiguration( containerConfiguration );
containerConfiguration.setAutoWiring( true );
+ containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
}
protected void setUp()
http://git-wip-us.apache.org/repos/asf/maven/blob/0ba8fa12/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
index 4c73c0f..9dc7cc0 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
@@ -33,6 +33,7 @@ import org.apache.maven.model.RepositoryPolicy;
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusTestCase;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
@@ -55,6 +56,7 @@ public class LegacyRepositorySystemTest
{
super.customizeContainerConfiguration( containerConfiguration );
containerConfiguration.setAutoWiring( true );
+ containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
}
@Override
http://git-wip-us.apache.org/repos/asf/maven/blob/0ba8fa12/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
index 98340be..01ab3b9 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
@@ -23,6 +23,7 @@ import org.apache.maven.artifact.repository.Authentication;
import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.settings.Server;
import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusTestCase;
/**
@@ -40,6 +41,7 @@ public class LegacyRepositorySystemTest
{
super.customizeContainerConfiguration( containerConfiguration );
containerConfiguration.setAutoWiring( true );
+ containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
}
@Override
http://git-wip-us.apache.org/repos/asf/maven/blob/0ba8fa12/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
index a8b4829..4cc1e89 100644
--- a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
+++ b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
@@ -29,6 +29,7 @@ import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusTestCase;
import org.eclipse.aether.DefaultRepositorySystemSession;
@@ -47,6 +48,7 @@ public abstract class AbstractMavenProjectTestCase
{
super.customizeContainerConfiguration( containerConfiguration );
containerConfiguration.setAutoWiring( true );
+ containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
}
protected void setUp()
http://git-wip-us.apache.org/repos/asf/maven/blob/0ba8fa12/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
index 06ee6c9..392d9cd 100644
--- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
@@ -34,6 +34,7 @@ import org.apache.maven.project.harness.PomTestWrapper;
import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusTestCase;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
@@ -59,6 +60,7 @@ public class PomConstructionTest
{
super.customizeContainerConfiguration( containerConfiguration );
containerConfiguration.setAutoWiring( true );
+ containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
}
protected void setUp()
http://git-wip-us.apache.org/repos/asf/maven/blob/0ba8fa12/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java b/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
index 41b21ce..5c16686 100644
--- a/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
+++ b/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
@@ -34,6 +34,7 @@ import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
@@ -60,6 +61,7 @@ public class PomConstructionWithSettingsTest
{
super.customizeContainerConfiguration( containerConfiguration );
containerConfiguration.setAutoWiring( true );
+ containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
}
protected void setUp()
Re: [2/2] git commit: aether 1.0
Posted by Igor Fedorenko <ig...@ifedorenko.com>.
Thank you, Robert, for the reminder. I updated the jira with fixed
release version and link to git commit.
As far changes on Benjamin's branch. I am not comfortable committing
somebody else's code unless it comes through explicit pull request or
jira attachment. I also generally require corresponding unit and/or
integration tests or at very least an example to demonstrate the problem
before I can vouch for the change myself.
--
Regards,
Igor
On 2014-08-28, 6:00, Robert Scholte wrote:
> Igor,
>
> please bind this change to MNG-5562[1]
> Also, Benjamin advices to change other things as well.
>
> thanks,
> Robert
>
>
> [1] https://jira.codehaus.org/browse/MNG-5562
>
> Op Thu, 28 Aug 2014 05:17:55 +0200 schreef <if...@apache.org>:
>
>> aether 1.0
>>
>> Signed-off-by: Igor Fedorenko <if...@apache.org>
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/maven/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2909b5a3
>> Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/2909b5a3
>> Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/2909b5a3
>>
>> Branch: refs/heads/master
>> Commit: 2909b5a329fd946796428a8e7f46034bc3bcbd2f
>> Parents: 0ba8fa1
>> Author: Igor Fedorenko <if...@apache.org>
>> Authored: Wed Aug 27 23:17:24 2014 -0400
>> Committer: Igor Fedorenko <if...@apache.org>
>> Committed: Wed Aug 27 23:17:24 2014 -0400
>>
>> ----------------------------------------------------------------------
>> apache-maven/pom.xml | 6 +++++-
>> maven-aether-provider/pom.xml | 8 +++++++-
>> maven-compat/pom.xml | 7 ++++++-
>> pom.xml | 9 +++++++--
>> 4 files changed, 25 insertions(+), 5 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/apache-maven/pom.xml
>>
>> ----------------------------------------------------------------------
>> diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
>> index 8b89c50..f50cce7 100644
>> --- a/apache-maven/pom.xml
>> +++ b/apache-maven/pom.xml
>> @@ -87,7 +87,11 @@
>> </dependency>
>> <dependency>
>> <groupId>org.eclipse.aether</groupId>
>> - <artifactId>aether-connector-wagon</artifactId>
>> + <artifactId>aether-connector-basic</artifactId>
>> + </dependency>
>> + <dependency>
>> + <groupId>org.eclipse.aether</groupId>
>> + <artifactId>aether-transport-wagon</artifactId>
>> </dependency>
>> <dependency>
>> <groupId>org.slf4j</groupId>
>>
>> http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/maven-aether-provider/pom.xml
>>
>> ----------------------------------------------------------------------
>> diff --git a/maven-aether-provider/pom.xml
>> b/maven-aether-provider/pom.xml
>> index 9c1569e..16e2f64 100644
>> --- a/maven-aether-provider/pom.xml
>> +++ b/maven-aether-provider/pom.xml
>> @@ -91,7 +91,12 @@ under the License.
>> <!-- Testing -->
>> <dependency>
>> <groupId>org.eclipse.aether</groupId>
>> - <artifactId>aether-connector-wagon</artifactId>
>> + <artifactId>aether-connector-basic</artifactId>
>> + <scope>test</scope>
>> + </dependency>
>> + <dependency>
>> + <groupId>org.eclipse.aether</groupId>
>> + <artifactId>aether-transport-wagon</artifactId>
>> <scope>test</scope>
>> </dependency>
>> <dependency>
>> @@ -122,3 +127,4 @@ under the License.
>> </build>
>> </project>
>> +
>>
>> http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/maven-compat/pom.xml
>>
>> ----------------------------------------------------------------------
>> diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
>> index 74d9246..b2e0638 100644
>> --- a/maven-compat/pom.xml
>> +++ b/maven-compat/pom.xml
>> @@ -79,7 +79,12 @@
>> </dependency>
>> <dependency>
>> <groupId>org.eclipse.aether</groupId>
>> - <artifactId>aether-connector-wagon</artifactId>
>> + <artifactId>aether-connector-basic</artifactId>
>> + <scope>test</scope>
>> + </dependency>
>> + <dependency>
>> + <groupId>org.eclipse.aether</groupId>
>> + <artifactId>aether-transport-wagon</artifactId>
>> <scope>test</scope>
>> </dependency>
>> <dependency>
>>
>> http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/pom.xml b/pom.xml
>> index 75671d8..5c785fe 100644
>> --- a/pom.xml
>> +++ b/pom.xml
>> @@ -60,7 +60,7 @@
>> <cipherVersion>1.7</cipherVersion>
>> <modelloVersion>1.8.1</modelloVersion>
>> <jxpathVersion>1.3</jxpathVersion>
>> - <aetherVersion>0.9.0.M2</aetherVersion>
>> + <aetherVersion>1.0.0.v20140518</aetherVersion>
>> <slf4jVersion>1.7.5</slf4jVersion>
>>
>> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
>>
>> <!-- Control the name of the distribution and information output
>> by mvn -->
>> @@ -308,7 +308,12 @@
>> </dependency>
>> <dependency>
>> <groupId>org.eclipse.aether</groupId>
>> - <artifactId>aether-connector-wagon</artifactId>
>> + <artifactId>aether-connector-basic</artifactId>
>> + <version>${aetherVersion}</version>
>> + </dependency>
>> + <dependency>
>> + <groupId>org.eclipse.aether</groupId>
>> + <artifactId>aether-transport-wagon</artifactId>
>> <version>${aetherVersion}</version>
>> </dependency>
>> <!-- Commons -->
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [2/2] git commit: aether 1.0
Posted by Robert Scholte <rf...@apache.org>.
Hi,
I've had mail contact with Benjamin. We don't have to expect more coding
from his side.
It's up to us if we want to integrate some of his proposals.
The extra adjustments are there for:
- MNG-3092
- cycle warnings
Robert
Op Thu, 28 Aug 2014 13:18:19 +0200 schreef Jason van Zyl <ja...@takari.io>:
> If Benjamin has further changes he would like to make, he can do them
> himself or make PRs with explanations.
>
> On Aug 28, 2014, at 6:00 AM, Robert Scholte <rf...@apache.org> wrote:
>
>> Igor,
>>
>> please bind this change to MNG-5562[1]
>> Also, Benjamin advices to change other things as well.
>>
>> thanks,
>> Robert
>>
>>
>> [1] https://jira.codehaus.org/browse/MNG-5562
>>
>> Op Thu, 28 Aug 2014 05:17:55 +0200 schreef <if...@apache.org>:
>>
>>> aether 1.0
>>>
>>> Signed-off-by: Igor Fedorenko <if...@apache.org>
>>>
>>>
>>> Project: http://git-wip-us.apache.org/repos/asf/maven/repo
>>> Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2909b5a3
>>> Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/2909b5a3
>>> Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/2909b5a3
>>>
>>> Branch: refs/heads/master
>>> Commit: 2909b5a329fd946796428a8e7f46034bc3bcbd2f
>>> Parents: 0ba8fa1
>>> Author: Igor Fedorenko <if...@apache.org>
>>> Authored: Wed Aug 27 23:17:24 2014 -0400
>>> Committer: Igor Fedorenko <if...@apache.org>
>>> Committed: Wed Aug 27 23:17:24 2014 -0400
>>>
>>> ----------------------------------------------------------------------
>>> apache-maven/pom.xml | 6 +++++-
>>> maven-aether-provider/pom.xml | 8 +++++++-
>>> maven-compat/pom.xml | 7 ++++++-
>>> pom.xml | 9 +++++++--
>>> 4 files changed, 25 insertions(+), 5 deletions(-)
>>> ----------------------------------------------------------------------
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/apache-maven/pom.xml
>>> ----------------------------------------------------------------------
>>> diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
>>> index 8b89c50..f50cce7 100644
>>> --- a/apache-maven/pom.xml
>>> +++ b/apache-maven/pom.xml
>>> @@ -87,7 +87,11 @@
>>> </dependency>
>>> <dependency>
>>> <groupId>org.eclipse.aether</groupId>
>>> - <artifactId>aether-connector-wagon</artifactId>
>>> + <artifactId>aether-connector-basic</artifactId>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>org.eclipse.aether</groupId>
>>> + <artifactId>aether-transport-wagon</artifactId>
>>> </dependency>
>>> <dependency>
>>> <groupId>org.slf4j</groupId>
>>>
>>> http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/maven-aether-provider/pom.xml
>>> ----------------------------------------------------------------------
>>> diff --git a/maven-aether-provider/pom.xml
>>> b/maven-aether-provider/pom.xml
>>> index 9c1569e..16e2f64 100644
>>> --- a/maven-aether-provider/pom.xml
>>> +++ b/maven-aether-provider/pom.xml
>>> @@ -91,7 +91,12 @@ under the License.
>>> <!-- Testing -->
>>> <dependency>
>>> <groupId>org.eclipse.aether</groupId>
>>> - <artifactId>aether-connector-wagon</artifactId>
>>> + <artifactId>aether-connector-basic</artifactId>
>>> + <scope>test</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>org.eclipse.aether</groupId>
>>> + <artifactId>aether-transport-wagon</artifactId>
>>> <scope>test</scope>
>>> </dependency>
>>> <dependency>
>>> @@ -122,3 +127,4 @@ under the License.
>>> </build>
>>> </project>
>>> +
>>>
>>> http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/maven-compat/pom.xml
>>> ----------------------------------------------------------------------
>>> diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
>>> index 74d9246..b2e0638 100644
>>> --- a/maven-compat/pom.xml
>>> +++ b/maven-compat/pom.xml
>>> @@ -79,7 +79,12 @@
>>> </dependency>
>>> <dependency>
>>> <groupId>org.eclipse.aether</groupId>
>>> - <artifactId>aether-connector-wagon</artifactId>
>>> + <artifactId>aether-connector-basic</artifactId>
>>> + <scope>test</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>org.eclipse.aether</groupId>
>>> + <artifactId>aether-transport-wagon</artifactId>
>>> <scope>test</scope>
>>> </dependency>
>>> <dependency>
>>>
>>> http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/pom.xml
>>> ----------------------------------------------------------------------
>>> diff --git a/pom.xml b/pom.xml
>>> index 75671d8..5c785fe 100644
>>> --- a/pom.xml
>>> +++ b/pom.xml
>>> @@ -60,7 +60,7 @@
>>> <cipherVersion>1.7</cipherVersion>
>>> <modelloVersion>1.8.1</modelloVersion>
>>> <jxpathVersion>1.3</jxpathVersion>
>>> - <aetherVersion>0.9.0.M2</aetherVersion>
>>> + <aetherVersion>1.0.0.v20140518</aetherVersion>
>>> <slf4jVersion>1.7.5</slf4jVersion>
>>> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
>>> <!-- Control the name of the distribution and information output
>>> by mvn -->
>>> @@ -308,7 +308,12 @@
>>> </dependency>
>>> <dependency>
>>> <groupId>org.eclipse.aether</groupId>
>>> - <artifactId>aether-connector-wagon</artifactId>
>>> + <artifactId>aether-connector-basic</artifactId>
>>> + <version>${aetherVersion}</version>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>org.eclipse.aether</groupId>
>>> + <artifactId>aether-transport-wagon</artifactId>
>>> <version>${aetherVersion}</version>
>>> </dependency>
>>> <!-- Commons -->
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>
> Thanks,
>
> Jason
>
> ----------------------------------------------------------
> Jason van Zyl
> Founder, Apache Maven
> http://twitter.com/jvanzyl
> http://twitter.com/takari_io
> ---------------------------------------------------------
>
> Simplex sigillum veri. (Simplicity is the seal of truth.)
>
>
>
>
>
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [2/2] git commit: aether 1.0
Posted by Jason van Zyl <ja...@takari.io>.
If Benjamin has further changes he would like to make, he can do them himself or make PRs with explanations.
On Aug 28, 2014, at 6:00 AM, Robert Scholte <rf...@apache.org> wrote:
> Igor,
>
> please bind this change to MNG-5562[1]
> Also, Benjamin advices to change other things as well.
>
> thanks,
> Robert
>
>
> [1] https://jira.codehaus.org/browse/MNG-5562
>
> Op Thu, 28 Aug 2014 05:17:55 +0200 schreef <if...@apache.org>:
>
>> aether 1.0
>>
>> Signed-off-by: Igor Fedorenko <if...@apache.org>
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/maven/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2909b5a3
>> Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/2909b5a3
>> Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/2909b5a3
>>
>> Branch: refs/heads/master
>> Commit: 2909b5a329fd946796428a8e7f46034bc3bcbd2f
>> Parents: 0ba8fa1
>> Author: Igor Fedorenko <if...@apache.org>
>> Authored: Wed Aug 27 23:17:24 2014 -0400
>> Committer: Igor Fedorenko <if...@apache.org>
>> Committed: Wed Aug 27 23:17:24 2014 -0400
>>
>> ----------------------------------------------------------------------
>> apache-maven/pom.xml | 6 +++++-
>> maven-aether-provider/pom.xml | 8 +++++++-
>> maven-compat/pom.xml | 7 ++++++-
>> pom.xml | 9 +++++++--
>> 4 files changed, 25 insertions(+), 5 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/apache-maven/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
>> index 8b89c50..f50cce7 100644
>> --- a/apache-maven/pom.xml
>> +++ b/apache-maven/pom.xml
>> @@ -87,7 +87,11 @@
>> </dependency>
>> <dependency>
>> <groupId>org.eclipse.aether</groupId>
>> - <artifactId>aether-connector-wagon</artifactId>
>> + <artifactId>aether-connector-basic</artifactId>
>> + </dependency>
>> + <dependency>
>> + <groupId>org.eclipse.aether</groupId>
>> + <artifactId>aether-transport-wagon</artifactId>
>> </dependency>
>> <dependency>
>> <groupId>org.slf4j</groupId>
>>
>> http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/maven-aether-provider/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
>> index 9c1569e..16e2f64 100644
>> --- a/maven-aether-provider/pom.xml
>> +++ b/maven-aether-provider/pom.xml
>> @@ -91,7 +91,12 @@ under the License.
>> <!-- Testing -->
>> <dependency>
>> <groupId>org.eclipse.aether</groupId>
>> - <artifactId>aether-connector-wagon</artifactId>
>> + <artifactId>aether-connector-basic</artifactId>
>> + <scope>test</scope>
>> + </dependency>
>> + <dependency>
>> + <groupId>org.eclipse.aether</groupId>
>> + <artifactId>aether-transport-wagon</artifactId>
>> <scope>test</scope>
>> </dependency>
>> <dependency>
>> @@ -122,3 +127,4 @@ under the License.
>> </build>
>> </project>
>> +
>>
>> http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/maven-compat/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
>> index 74d9246..b2e0638 100644
>> --- a/maven-compat/pom.xml
>> +++ b/maven-compat/pom.xml
>> @@ -79,7 +79,12 @@
>> </dependency>
>> <dependency>
>> <groupId>org.eclipse.aether</groupId>
>> - <artifactId>aether-connector-wagon</artifactId>
>> + <artifactId>aether-connector-basic</artifactId>
>> + <scope>test</scope>
>> + </dependency>
>> + <dependency>
>> + <groupId>org.eclipse.aether</groupId>
>> + <artifactId>aether-transport-wagon</artifactId>
>> <scope>test</scope>
>> </dependency>
>> <dependency>
>>
>> http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/pom.xml b/pom.xml
>> index 75671d8..5c785fe 100644
>> --- a/pom.xml
>> +++ b/pom.xml
>> @@ -60,7 +60,7 @@
>> <cipherVersion>1.7</cipherVersion>
>> <modelloVersion>1.8.1</modelloVersion>
>> <jxpathVersion>1.3</jxpathVersion>
>> - <aetherVersion>0.9.0.M2</aetherVersion>
>> + <aetherVersion>1.0.0.v20140518</aetherVersion>
>> <slf4jVersion>1.7.5</slf4jVersion>
>> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
>> <!-- Control the name of the distribution and information output by mvn -->
>> @@ -308,7 +308,12 @@
>> </dependency>
>> <dependency>
>> <groupId>org.eclipse.aether</groupId>
>> - <artifactId>aether-connector-wagon</artifactId>
>> + <artifactId>aether-connector-basic</artifactId>
>> + <version>${aetherVersion}</version>
>> + </dependency>
>> + <dependency>
>> + <groupId>org.eclipse.aether</groupId>
>> + <artifactId>aether-transport-wagon</artifactId>
>> <version>${aetherVersion}</version>
>> </dependency>
>> <!-- Commons -->
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
Thanks,
Jason
----------------------------------------------------------
Jason van Zyl
Founder, Apache Maven
http://twitter.com/jvanzyl
http://twitter.com/takari_io
---------------------------------------------------------
Simplex sigillum veri. (Simplicity is the seal of truth.)
Re: [2/2] git commit: aether 1.0
Posted by Robert Scholte <rf...@apache.org>.
Igor,
please bind this change to MNG-5562[1]
Also, Benjamin advices to change other things as well.
thanks,
Robert
[1] https://jira.codehaus.org/browse/MNG-5562
Op Thu, 28 Aug 2014 05:17:55 +0200 schreef <if...@apache.org>:
> aether 1.0
>
> Signed-off-by: Igor Fedorenko <if...@apache.org>
>
>
> Project: http://git-wip-us.apache.org/repos/asf/maven/repo
> Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2909b5a3
> Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/2909b5a3
> Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/2909b5a3
>
> Branch: refs/heads/master
> Commit: 2909b5a329fd946796428a8e7f46034bc3bcbd2f
> Parents: 0ba8fa1
> Author: Igor Fedorenko <if...@apache.org>
> Authored: Wed Aug 27 23:17:24 2014 -0400
> Committer: Igor Fedorenko <if...@apache.org>
> Committed: Wed Aug 27 23:17:24 2014 -0400
>
> ----------------------------------------------------------------------
> apache-maven/pom.xml | 6 +++++-
> maven-aether-provider/pom.xml | 8 +++++++-
> maven-compat/pom.xml | 7 ++++++-
> pom.xml | 9 +++++++--
> 4 files changed, 25 insertions(+), 5 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/apache-maven/pom.xml
> ----------------------------------------------------------------------
> diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
> index 8b89c50..f50cce7 100644
> --- a/apache-maven/pom.xml
> +++ b/apache-maven/pom.xml
> @@ -87,7 +87,11 @@
> </dependency>
> <dependency>
> <groupId>org.eclipse.aether</groupId>
> - <artifactId>aether-connector-wagon</artifactId>
> + <artifactId>aether-connector-basic</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>org.eclipse.aether</groupId>
> + <artifactId>aether-transport-wagon</artifactId>
> </dependency>
> <dependency>
> <groupId>org.slf4j</groupId>
>
> http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/maven-aether-provider/pom.xml
> ----------------------------------------------------------------------
> diff --git a/maven-aether-provider/pom.xml
> b/maven-aether-provider/pom.xml
> index 9c1569e..16e2f64 100644
> --- a/maven-aether-provider/pom.xml
> +++ b/maven-aether-provider/pom.xml
> @@ -91,7 +91,12 @@ under the License.
> <!-- Testing -->
> <dependency>
> <groupId>org.eclipse.aether</groupId>
> - <artifactId>aether-connector-wagon</artifactId>
> + <artifactId>aether-connector-basic</artifactId>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.eclipse.aether</groupId>
> + <artifactId>aether-transport-wagon</artifactId>
> <scope>test</scope>
> </dependency>
> <dependency>
> @@ -122,3 +127,4 @@ under the License.
> </build>
> </project>
> +
>
> http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/maven-compat/pom.xml
> ----------------------------------------------------------------------
> diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
> index 74d9246..b2e0638 100644
> --- a/maven-compat/pom.xml
> +++ b/maven-compat/pom.xml
> @@ -79,7 +79,12 @@
> </dependency>
> <dependency>
> <groupId>org.eclipse.aether</groupId>
> - <artifactId>aether-connector-wagon</artifactId>
> + <artifactId>aether-connector-basic</artifactId>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.eclipse.aether</groupId>
> + <artifactId>aether-transport-wagon</artifactId>
> <scope>test</scope>
> </dependency>
> <dependency>
>
> http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/pom.xml
> ----------------------------------------------------------------------
> diff --git a/pom.xml b/pom.xml
> index 75671d8..5c785fe 100644
> --- a/pom.xml
> +++ b/pom.xml
> @@ -60,7 +60,7 @@
> <cipherVersion>1.7</cipherVersion>
> <modelloVersion>1.8.1</modelloVersion>
> <jxpathVersion>1.3</jxpathVersion>
> - <aetherVersion>0.9.0.M2</aetherVersion>
> + <aetherVersion>1.0.0.v20140518</aetherVersion>
> <slf4jVersion>1.7.5</slf4jVersion>
> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
> <!-- Control the name of the distribution and information output by
> mvn -->
> @@ -308,7 +308,12 @@
> </dependency>
> <dependency>
> <groupId>org.eclipse.aether</groupId>
> - <artifactId>aether-connector-wagon</artifactId>
> + <artifactId>aether-connector-basic</artifactId>
> + <version>${aetherVersion}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.eclipse.aether</groupId>
> + <artifactId>aether-transport-wagon</artifactId>
> <version>${aetherVersion}</version>
> </dependency>
> <!-- Commons -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
[2/2] git commit: aether 1.0
Posted by if...@apache.org.
aether 1.0
Signed-off-by: Igor Fedorenko <if...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2909b5a3
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/2909b5a3
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/2909b5a3
Branch: refs/heads/master
Commit: 2909b5a329fd946796428a8e7f46034bc3bcbd2f
Parents: 0ba8fa1
Author: Igor Fedorenko <if...@apache.org>
Authored: Wed Aug 27 23:17:24 2014 -0400
Committer: Igor Fedorenko <if...@apache.org>
Committed: Wed Aug 27 23:17:24 2014 -0400
----------------------------------------------------------------------
apache-maven/pom.xml | 6 +++++-
maven-aether-provider/pom.xml | 8 +++++++-
maven-compat/pom.xml | 7 ++++++-
pom.xml | 9 +++++++--
4 files changed, 25 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 8b89c50..f50cce7 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -87,7 +87,11 @@
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
- <artifactId>aether-connector-wagon</artifactId>
+ <artifactId>aether-connector-basic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-transport-wagon</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/maven-aether-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 9c1569e..16e2f64 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -91,7 +91,12 @@ under the License.
<!-- Testing -->
<dependency>
<groupId>org.eclipse.aether</groupId>
- <artifactId>aether-connector-wagon</artifactId>
+ <artifactId>aether-connector-basic</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-transport-wagon</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -122,3 +127,4 @@ under the License.
</build>
</project>
+
http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 74d9246..b2e0638 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -79,7 +79,12 @@
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
- <artifactId>aether-connector-wagon</artifactId>
+ <artifactId>aether-connector-basic</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-transport-wagon</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/2909b5a3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 75671d8..5c785fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
<cipherVersion>1.7</cipherVersion>
<modelloVersion>1.8.1</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
- <aetherVersion>0.9.0.M2</aetherVersion>
+ <aetherVersion>1.0.0.v20140518</aetherVersion>
<slf4jVersion>1.7.5</slf4jVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
@@ -308,7 +308,12 @@
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
- <artifactId>aether-connector-wagon</artifactId>
+ <artifactId>aether-connector-basic</artifactId>
+ <version>${aetherVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-transport-wagon</artifactId>
<version>${aetherVersion}</version>
</dependency>
<!-- Commons -->