You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/01/12 02:00:24 UTC
[1/6] accumulo git commit: ACCUMULO-4106 Update release plugin
tagNameFormat
Repository: accumulo
Updated Branches:
refs/heads/1.6 8669215b1 -> 567f52fb2
refs/heads/1.7 78659a61f -> 642add8cc
refs/heads/master 64713554b -> 21123cca7
ACCUMULO-4106 Update release plugin tagNameFormat
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/567f52fb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/567f52fb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/567f52fb
Branch: refs/heads/1.6
Commit: 567f52fb26588b65083f2e197a9fb85c8fe500ac
Parents: 8669215
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jan 11 15:35:11 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jan 11 15:35:11 2016 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/567f52fb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d51f406..de8302c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -625,7 +625,7 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean verify</preparationGoals>
- <tagNameFormat>@{project.version}</tagNameFormat>
+ <tagNameFormat>rel/@{project.version}</tagNameFormat>
<releaseProfiles>seal-jars,skip-findbugs,skip-plugin-its-with-skipTests</releaseProfiles>
<useReleaseProfile>false</useReleaseProfile>
<pushChanges>false</pushChanges>
[3/6] accumulo git commit: ACCUMULO-4106 Update release plugin
tagNameFormat
Posted by ct...@apache.org.
ACCUMULO-4106 Update release plugin tagNameFormat
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/567f52fb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/567f52fb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/567f52fb
Branch: refs/heads/master
Commit: 567f52fb26588b65083f2e197a9fb85c8fe500ac
Parents: 8669215
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jan 11 15:35:11 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jan 11 15:35:11 2016 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/567f52fb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d51f406..de8302c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -625,7 +625,7 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean verify</preparationGoals>
- <tagNameFormat>@{project.version}</tagNameFormat>
+ <tagNameFormat>rel/@{project.version}</tagNameFormat>
<releaseProfiles>seal-jars,skip-findbugs,skip-plugin-its-with-skipTests</releaseProfiles>
<useReleaseProfile>false</useReleaseProfile>
<pushChanges>false</pushChanges>
[2/6] accumulo git commit: ACCUMULO-4106 Update release plugin
tagNameFormat
Posted by ct...@apache.org.
ACCUMULO-4106 Update release plugin tagNameFormat
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/567f52fb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/567f52fb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/567f52fb
Branch: refs/heads/1.7
Commit: 567f52fb26588b65083f2e197a9fb85c8fe500ac
Parents: 8669215
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jan 11 15:35:11 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jan 11 15:35:11 2016 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/567f52fb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d51f406..de8302c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -625,7 +625,7 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean verify</preparationGoals>
- <tagNameFormat>@{project.version}</tagNameFormat>
+ <tagNameFormat>rel/@{project.version}</tagNameFormat>
<releaseProfiles>seal-jars,skip-findbugs,skip-plugin-its-with-skipTests</releaseProfiles>
<useReleaseProfile>false</useReleaseProfile>
<pushChanges>false</pushChanges>
[4/6] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ct...@apache.org.
Merge branch '1.6' into 1.7
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/642add8c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/642add8c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/642add8c
Branch: refs/heads/master
Commit: 642add8cc6710ec5e396bd9e690e058ed8fe1837
Parents: 78659a6 567f52f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jan 11 19:57:51 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jan 11 19:57:51 2016 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/642add8c/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0fa003a,de8302c..3fc5d96
--- a/pom.xml
+++ b/pom.xml
@@@ -654,8 -625,8 +654,8 @@@
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean verify</preparationGoals>
- <tagNameFormat>@{project.version}</tagNameFormat>
+ <tagNameFormat>rel/@{project.version}</tagNameFormat>
- <releaseProfiles>seal-jars,skip-findbugs,skip-plugin-its-with-skipTests</releaseProfiles>
+ <releaseProfiles>apache-release,move-source-tarball,seal-jars,skip-findbugs,skip-plugin-its-with-skipTests</releaseProfiles>
<useReleaseProfile>false</useReleaseProfile>
<pushChanges>false</pushChanges>
<localCheckout>true</localCheckout>
[6/6] accumulo git commit: Merge branch '1.7'
Posted by ct...@apache.org.
Merge branch '1.7'
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/21123cca
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/21123cca
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/21123cca
Branch: refs/heads/master
Commit: 21123cca72a576c237e17b2a95b0105202265d45
Parents: 6471355 642add8
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jan 11 19:59:51 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jan 11 19:59:51 2016 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/21123cca/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 3f90af2,3fc5d96..e7bb0f6
--- a/pom.xml
+++ b/pom.xml
@@@ -689,8 -654,8 +689,8 @@@
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean verify</preparationGoals>
- <tagNameFormat>@{project.version}</tagNameFormat>
+ <tagNameFormat>rel/@{project.version}</tagNameFormat>
- <releaseProfiles>apache-release,move-source-tarball,seal-jars,skip-findbugs,skip-plugin-its-with-skipTests</releaseProfiles>
+ <releaseProfiles>apache-release,accumulo-release,skip-plugin-its-with-skipTests</releaseProfiles>
<useReleaseProfile>false</useReleaseProfile>
<pushChanges>false</pushChanges>
<localCheckout>true</localCheckout>
[5/6] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ct...@apache.org.
Merge branch '1.6' into 1.7
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/642add8c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/642add8c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/642add8c
Branch: refs/heads/1.7
Commit: 642add8cc6710ec5e396bd9e690e058ed8fe1837
Parents: 78659a6 567f52f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jan 11 19:57:51 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jan 11 19:57:51 2016 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/642add8c/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0fa003a,de8302c..3fc5d96
--- a/pom.xml
+++ b/pom.xml
@@@ -654,8 -625,8 +654,8 @@@
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean verify</preparationGoals>
- <tagNameFormat>@{project.version}</tagNameFormat>
+ <tagNameFormat>rel/@{project.version}</tagNameFormat>
- <releaseProfiles>seal-jars,skip-findbugs,skip-plugin-its-with-skipTests</releaseProfiles>
+ <releaseProfiles>apache-release,move-source-tarball,seal-jars,skip-findbugs,skip-plugin-its-with-skipTests</releaseProfiles>
<useReleaseProfile>false</useReleaseProfile>
<pushChanges>false</pushChanges>
<localCheckout>true</localCheckout>