Author: jvanzyl
Date: Mon Jul 29 13:29:42 2013
New Revision: 1508049
URL: http://svn.apache.org/r1508049
Log:
o recutting the release
Removed:
maven/plugins/tags/maven-remote-resources-plugin-1.5/
Author: jvanzyl
Date: Mon Jul 29 13:34:15 2013
New Revision: 1508058
URL: http://svn.apache.org/r1508058
Log:
o roll back to 1.5-SNAPSHOT to incorporate MRRESOURCES-61 in the 1.5 release
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
Modified: maven/plugins/trunk/maven
Author: jvanzyl
Date: Mon Jul 29 13:36:12 2013
New Revision: 1508063
URL: http://svn.apache.org/r1508063
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
Modified: maven/plugins/trunk/maven-remote
Author: jvanzyl
Date: Mon Jul 29 13:36:08 2013
New Revision: 1508060
URL: http://svn.apache.org/r1508060
Log:
[maven-release-plugin] prepare release maven-remote-resources-plugin-1.5
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
Modified: maven/plugins/trunk/maven
Author: jvanzyl
Date: Mon Jul 29 13:36:11 2013
New Revision: 1508061
URL: http://svn.apache.org/r1508061
Log:
[maven-release-plugin] copy for tag maven-remote-resources-plugin-1.5
Added:
maven/plugins/tags/maven-remote-resources-plugin-1.5/
- copied from r1508060, maven/plugins/trunk
Updated Branches:
refs/heads/master b5dcffe83 - 6be819a65
o how i run the ITs, just sharing
Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit:
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/260c75d5
Tree:
o adding some requirements to satisfy the isolated repository setup. all this
needs to be examined again because it's generally
extremely frustrating to set something up correctly.
Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit:
Author: jvanzyl
Date: Sun Jul 28 22:58:32 2013
New Revision: 1507868
URL: http://svn.apache.org/r1507868
Log:
[maven-release-plugin] copy for tag maven-remote-resources-plugin-1.5
Added:
maven/plugins/tags/maven-remote-resources-plugin-1.5/
- copied from r1507867, maven/plugins/trunk
Author: jvanzyl
Date: Sun Jul 28 22:58:29 2013
New Revision: 1507867
URL: http://svn.apache.org/r1507867
Log:
[maven-release-plugin] prepare release maven-remote-resources-plugin-1.5
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
Modified: maven/plugins/trunk/maven
Author: jvanzyl
Date: Sun Jul 28 22:58:33 2013
New Revision: 1507869
URL: http://svn.apache.org/r1507869
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
Modified: maven/plugins/trunk/maven-remote
Updated Branches:
refs/heads/aether-M3 [created] 604bf2545
o testing eclipse aether 0.9.0.M3. looks good with the ITs
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/604bf254
Tree:
o change the scope of org.eclipse.sisu to test in the maven-aether-provider to
prevent it from leaking out to clients.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
Tree:
Updated Branches:
refs/heads/master 5cfcb2f5b - e084ff3b8
o update to sisu 0.0.0.M5
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/06095041
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/06095041
Diff:
Author: jvanzyl
Date: Thu Jul 25 15:44:59 2013
New Revision: 1507022
URL: http://svn.apache.org/r1507022
Log:
o bump to 3.0.0-SNAPSHOT to account for the major change in use of 3.1.0
Modified:
maven/plugin-testing/trunk/pom.xml
Modified: maven/plugin-testing/trunk/pom.xml
URL:
http
Author: jvanzyl
Date: Tue Jul 23 11:49:59 2013
New Revision: 1505991
URL: http://svn.apache.org/r1505991
Log:
o updating for maven 3.1.0
o updating to Eclipse Aether
o using new facilities in the container
Modified:
maven/plugin-testing/trunk/.gitignore
maven/plugin-testing/trunk/maven
Updated Branches:
refs/heads/master d5259127e - 5cfcb2f5b
o moved to the wiki:
https://cwiki.apache.org/confluence/display/MAVEN/Compatibility+with+Maven+2.x
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9d6b57c5
Tree:
o remove exception for rat plugin
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5e771fb4
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5e771fb4
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5e771fb4
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5cfcb2f5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5cfcb2f5
Diff:
Author: jvanzyl
Date: Tue Jul 16 19:09:16 2013
New Revision: 869727
Log:
Publishing svnmucc operation to maven site by jvanzyl
Added:
websites/production/maven/content/
- copied from r869726, websites/staging/maven/trunk/content/
websites/production/maven/content/ant-tasks
Author: jvanzyl
Date: Tue Jul 16 19:09:00 2013
New Revision: 1503836
URL: http://svn.apache.org/r1503836
Log:
o fix version displayed on the far right
Modified:
maven/site/trunk/pom.xml
Modified: maven/site/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev
Author: jvanzyl
Date: Sun Jul 14 18:26:46 2013
New Revision: 869473
Log:
Publishing svnmucc operation to maven site by jvanzyl
Added:
websites/production/maven/content/
- copied from r869472, websites/staging/maven/trunk/content/
websites/production/maven/content/ant-tasks
Author: jvanzyl
Date: Sat Jul 13 21:35:38 2013
New Revision: 1502894
URL: http://svn.apache.org/r1502894
Log:
o update for the 3.1.0 release
Modified:
maven/site/trunk/content/apt/docs/history.apt
maven/site/trunk/content/site.xml
maven/site/trunk/pom.xml
Modified: maven/site/trunk
Author: jvanzyl
Date: Sat Jul 13 21:36:07 2013
New Revision: 1502895
URL: http://svn.apache.org/r1502895
Log:
o add release notes for 3.1.0
Added:
maven/site/trunk/content/apt/docs/3.1.0/
maven/site/trunk/content/apt/docs/3.1.0/release-notes.apt.vm
maven/site/trunk/content/apt/docs
Author: jvanzyl
Date: Sat Jul 13 21:38:12 2013
New Revision: 869384
Log:
Publishing svnmucc operation to maven site by jvanzyl
Added:
websites/production/maven/content/
- copied from r869383, websites/staging/maven/trunk/content/
websites/production/maven/content/ant-tasks
Author: jvanzyl
Date: Sun Jul 14 04:35:07 2013
New Revision: 2459
Log:
o maven 3.1.0
Added:
dev/maven/maven-3/3.1.0/
dev/maven/maven-3/3.1.0/binaries/
dev/maven/maven-3/3.1.0/binaries/apache-maven-3.1.0-bin.tar.gz (with
props)
dev/maven/maven-3/3.1.0/binaries/apache-maven
Author: jvanzyl
Date: Sun Jul 14 04:35:07 2013
New Revision: 2459
Log:
o maven 3.1.0
Added:
dev/maven/maven-3/3.1.0/
dev/maven/maven-3/3.1.0/binaries/
dev/maven/maven-3/3.1.0/binaries/apache-maven-3.1.0-bin.tar.gz (with
props)
dev/maven/maven-3/3.1.0/binaries/apache-maven
Updated Branches:
refs/heads/master 09e77b53f - 893ca28a1
[maven-release-plugin] prepare release maven-3.1.0
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/893ca28a
Tree:
Updated Tags: refs/tags/maven-3.1.0 [created] 3a1f442a4
Updated Branches:
refs/heads/master 893ca28a1 - 271761de8
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/271761de
Tree:
Updated Branches:
refs/heads/master 21907a74e - a47ef0683
[maven-release-plugin] prepare release maven-3.1
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a47ef068
Tree:
Updated Branches:
refs/heads/master a47ef0683 - e22b2fa16
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e22b2fa1
Tree:
Updated Tags: refs/tags/maven-3.1 [created] aa284eda8
Revert [maven-release-plugin] prepare release maven-3.1
This reverts commit a47ef06832bff888928c66c525e18439b7a3c0f3.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/09e77b53
Tree:
Updated Branches:
refs/heads/master e22b2fa16 - 09e77b53f
Revert [maven-release-plugin] prepare for next development iteration
This reverts commit e22b2fa16a14551b6a9f8fd5776d21cf5ef6c663.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit:
Author: jvanzyl
Date: Sat Jun 8 12:59:16 2013
New Revision: 1490975
URL: http://svn.apache.org/r1490975
Log:
o update download locations
Modified:
maven/site/trunk/content/xdoc/download.xml.vm
maven/site/trunk/pom.xml
Modified: maven/site/trunk/content/xdoc/download.xml.vm
URL:
http
Author: jvanzyl
Date: Sat Jun 8 12:59:37 2013
New Revision: 864850
Log:
Publishing svnmucc operation to maven site by jvanzyl
Added:
websites/production/maven/content/
- copied from r864849, websites/staging/maven/trunk/content/
websites/production/maven/content/ant-tasks
Author: jvanzyl
Date: Sat Jun 8 14:16:46 2013
New Revision: 1490986
URL: http://svn.apache.org/r1490986
Log:
o correct top level version on download page
Modified:
maven/site/trunk/content/xdoc/download.xml.vm
Modified: maven/site/trunk/content/xdoc/download.xml.vm
URL:
http
Author: jvanzyl
Date: Sat Jun 8 19:51:27 2013
New Revision: 864891
Log:
Publishing svnmucc operation to maven site by jvanzyl
Added:
websites/production/maven/content/
- copied from r864890, websites/staging/maven/trunk/content/
websites/production/maven/content/ant-tasks
Author: jvanzyl
Date: Fri Jun 7 17:43:31 2013
New Revision: 1490750
URL: http://svn.apache.org/r1490750
Log:
o updating for release
Modified:
maven/site/trunk/content/site.xml
maven/site/trunk/content/xdoc/download.xml.vm
Modified: maven/site/trunk/content/site.xml
URL:
http
Author: jvanzyl
Date: Fri Jun 7 21:45:26 2013
New Revision: 864765
Log:
Publishing svnmucc operation to maven site by jvanzyl
Added:
websites/production/maven/content/
- copied from r864764, websites/staging/maven/trunk/content/
websites/production/maven/content/ant-tasks
Author: jvanzyl
Date: Thu Jun 6 18:24:05 2013
New Revision: 1490386
URL: http://svn.apache.org/r1490386
Log:
o add android info
Modified:
maven/site/trunk/content/apt/docs/3.1.0-alpha-1/release-notes.txt
Modified: maven/site/trunk/content/apt/docs/3.1.0-alpha-1/release-notes.txt
URL:
http
Updated Tags: refs/tags/maven-3.1.0-alpha-1 [deleted] 61776724f
Updated Branches:
refs/heads/master ac64dd6bb - c726cdd3a
[maven-release-plugin] prepare release maven-3.1.0-alpha-1
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c726cdd3
Tree:
Updated Tags: refs/tags/maven-3.1.0-alpha-1 [created] 52c07992a
Updated Branches:
refs/heads/master c726cdd3a - e1286aea8
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e1286aea
Tree:
Updated Branches:
refs/heads/master bd6beaa92 - b0a83f625
o update notice to reflect Aether and Sisu coming from the Eclipse Foundation
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b0a83f62
Tree:
Updated Branches:
refs/heads/master f34b4fbdf - e55a51094
o remove snapshot repository
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e55a5109
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e55a5109
Diff:
Updated Tags: refs/tags/maven-3.1.0-alpha-1 [deleted] 8e83c211e
Updated Branches:
refs/heads/master e55a51094 - 42b69f0b0
[maven-release-plugin] prepare release maven-3.1.0-alpha-1
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/42b69f0b
Tree:
Updated Tags: refs/tags/maven-3.1.0-alpha-1 [created] 61776724f
Updated Branches:
refs/heads/master 42b69f0b0 - 326303e22
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/326303e2
Tree:
Updated Branches:
refs/heads/master 4db66fd06 - 32d720ea0
[maven-release-plugin] prepare release maven-3.1.0-alpha-1
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/32d720ea
Tree:
Updated Tags: refs/tags/maven-3.1.0-alpha-1 [created] 8e83c211e
Updated Branches:
refs/heads/master 32d720ea0 - 00b902909
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/00b90290
Tree:
Updated Tags: refs/tags/maven-3.1.0-alpha-1 [deleted] eb0b9ff97
Updated Branches:
refs/heads/master 42962fa28 - 2decac486
[maven-release-plugin] prepare release maven-3.1.0
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2decac48
Tree:
Updated Tags: refs/tags/maven-3.1.0 [deleted] 853608fd9
Updated Tags: refs/tags/maven-3.1.0 [created] 75c1e8a5d
Updated Branches:
refs/heads/master 2decac486 - 01c969e1e
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/01c969e1
Tree:
Updated Tags: refs/tags/maven-3.1.0 [deleted] 75c1e8a5d
Updated Branches:
refs/heads/master 01c969e1e - 08eab1953
o revert release plugin commits
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/08eab195
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/08eab195
Diff:
Updated Branches:
refs/heads/master 08eab1953 - 262b9bb1e
[maven-release-plugin] prepare release maven-3.1.0-alpha-1
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/262b9bb1
Tree:
Updated Tags: refs/tags/maven-3.1.0-alpha-1 [created] eb0b9ff97
Updated Branches:
refs/heads/master 262b9bb1e - 95fbf6f44
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/95fbf6f4
Tree:
Updated Branches:
refs/heads/master 833b5f0e9 - eb164f514
Use Eclipse/Sisu 0.0.0.M2a milestone
Signed-off-by: Jason van Zyl ja...@tesla.io
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/34a8c6ce
Tree:
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/eb164f51
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/eb164f51
Diff:
Avoid mixing two flavours of Guice on the classpath.
Note: the main blocker to using Google-Guice for Maven3 is the lack of a
release with the new ProvisionListener API, which is needed to support Plexus
lifecycles. While there are other fixes/features in Sisu-Guice that are
nice-to-have (such
Updated Branches:
refs/heads/master e438f1140 - 2d7069b6e
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2d7069b6
Tree:
Updated Branches:
refs/heads/eclipse-aether bd4c38b7f - 33abdd2cc
o update to slf4j 1.7.3 and use logger factory reset()
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/33abdd2c
Tree:
Updated Branches:
refs/heads/master 317e7c623 - 2ec0a6b69
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2ec0a6b6
Tree:
o using slf4j 1.7.4 which adds the method to clear the logger cache
o update the code to use slf4j 1.7.4
o the logging failures in the embedded ITs are now fixed
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cc2da2fa
Tree:
Updated Branches:
refs/heads/master 2ec0a6b69 - 8b97b0a2d
Fix call to SimpleLoggerFactory.reset method (use LoggerFactory to make sure we
get the right instance to reset, as SimpleLoggerFactory.INSTANCE is not
actually used by slf4j-simple's StaticLoggerBinder) and remove temporary
Updated Branches:
refs/heads/master 8924ebc73 - 3f94086b3
o accounting for the use of Eclipse Aether and the use of real plugins that
have direct linkage to Sonatype Aether
Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit:
Updated Branches:
refs/heads/eclipse-aether 33abdd2cc - f50ae7b05
o Merge branch 'master' into eclipse-aether
Conflicts:
maven-embedder/src/main/java/org/slf4j/impl/MavenSlf4jSimpleFriend.java
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit:
removed unused properties
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/317e7c62
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/317e7c62
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/317e7c62
Branch:
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2ec0a6b6
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/2ec0a6b6
Diff:
o using slf4j 1.7.4 which adds the method to clear the logger cache
o update the code to use slf4j 1.7.4
o the logging failures in the embedded ITs are now fixed
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cc2da2fa
Tree:
o using snapshot version of sisu to vet any issues, and adding ossrh as a
snapshot repository while testing
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cf4d0be0
Tree:
Reverting some unexpected aether dependency changes to the top-level pom which
broke the build
Signed-off-by: Jason van Zyl ja...@tesla.io
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4849df91
Tree:
Fix call to SimpleLoggerFactory.reset method (use LoggerFactory to make sure we
get the right instance to reset, as SimpleLoggerFactory.INSTANCE is not
actually used by slf4j-simple's StaticLoggerBinder) and remove temporary
reflection workaround
Signed-off-by: Jason van Zyl ja...@tesla.io
Merge branch 'eclipse-aether' of github.com:tesla/tesla-build into
eclipse-aether
Conflicts:
.gitignore
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ebf2e4dd
Tree:
o update to slf4j 1.7.3 and use logger factory reset()
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/33abdd2c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/33abdd2c
Diff:
o using snapshot version of sisu to vet any issues, and adding ossrh as a
snapshot repository while testing
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/bd4c38b7
Tree:
Updated for latest ConflictResolver
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b5e05323
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b5e05323
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b5e05323
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven into
trunk
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8181e7c7
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8181e7c7
Diff:
Merge branch 'aether' of github.com:bentmann/maven-3 into eclipse-aether
Conflicts:
.gitignore
apache-maven/pom.xml
maven-aether-provider/pom.xml
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
o remove unecessary setup for svn
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/39d063a4
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/39d063a4
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/39d063a4
Followed change to DependencyNode.getPremanaged*()
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4fdcdbd2
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4fdcdbd2
Diff:
Merge branch 'trunk' into eclipse-aether
Conflicts:
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
Added Aether's snapshot repo to ease building
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/36bee649
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/36bee649
Diff:
Updated Branches:
refs/heads/master 8b97b0a2d - f50ae7b05
o Merge branch 'master' into eclipse-aether
Conflicts:
maven-embedder/src/main/java/org/slf4j/impl/MavenSlf4jSimpleFriend.java
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit:
Used improved conflict resolver
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3916201b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3916201b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3916201b
o update for changes in Aether APIs
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/de40fe19
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/de40fe19
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/de40fe19
update to Wagon 2.3 through the staging repo so we can validate 2.3 is good
with master
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411743
13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit:
Merge branch 'trunk' of github.com:apache/maven-3 into trunk
Conflicts:
apache-maven/src/bin/mvn
maven-embedder/src/site/apt/logging.apt
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/38d132b6
Tree:
removed stdout output
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412263
13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/784e8c3a
Tree:
MNG-5376: Account for changes between the Apple and Oracle JDKs on OSX
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412409
13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit:
o missed mvn in the merge
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3868007b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3868007b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3868007b
Branch:
added info about direct SLF4J use
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412765
13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d3652236
Tree:
[MNG-5380] check that whitespace can be preserved in Maven plugin configuration
when building MavenProject (still need to check if content is not trimmed when
injected into plugin)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412310
13f79535-47bb-0310-9956-ffa450edef68
301 - 400 of 3528 matches
Mail list logo