You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/03/07 22:48:14 UTC
[1/5] git commit: Increase permgen to get tests to run on Java6 on Mac
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 8e1ef5227 -> 09815dc32
Increase permgen to get tests to run on Java6 on Mac
Conflicts:
systests/jaxrs/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7d9f038f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7d9f038f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7d9f038f
Branch: refs/heads/2.7.x-fixes
Commit: 7d9f038f5ac5dca27eaa8c0e2249fd4fcb46d579
Parents: 8e1ef52
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Mar 4 11:55:46 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Mar 7 16:45:02 2014 -0500
----------------------------------------------------------------------
systests/jaxrs/pom.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7d9f038f/systests/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index c39ab1e..33aea6b 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -31,7 +31,11 @@
<description>Apache CXF JAX-RS System Tests</description>
<version>2.7.11-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
-
+
+ <properties>
+ <cxf.surefire.fork.vmargs>-XX:MaxPermSize=192m</cxf.surefire.fork.vmargs>
+ <cxf.server.launcher.vmargs>-XX:MaxPermSize=192m</cxf.server.launcher.vmargs>
+ </properties>
<dependencies>
<dependency>
<groupId>xalan</groupId>
[5/5] git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/09815dc3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/09815dc3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/09815dc3
Branch: refs/heads/2.7.x-fixes
Commit: 09815dc32aaa55bd05eeb93d17b9afe9a396ed96
Parents: 364fba1
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Mar 7 16:47:56 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Mar 7 16:47:56 2014 -0500
----------------------------------------------------------------------
.gitmergeinfo | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/09815dc3/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9d02b63..a949742 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -489,6 +489,7 @@ B 91157710e5c6b0fd2f808d0c5697e458af866d38
B 912dd1c11798dc69320dc7c81667e02925ebeed4
B 916b902173de7e32e0b9edde8523eb4559415191
B 91b367b770f6f21d932faa476428bfe41722afac
+B 91e6b02ac476064808a8926815e4442d23f61378
B 92003dbdda20095cab1bf5740a211a6c9b554b50
B 92203fbada808fccf32814a3d4cda8293b4e8ba1
B 923ad4a992f9d40285a80d6a8e701b0dda4d52ea
@@ -660,6 +661,7 @@ B c7bf868270c0cdf6f794d3e2227f16649ece82fa
B c7f4ce23ac7454dc383eb5f0c5d3f6f55aee95e8
B c86b32063506fe346c6b9c435647f6ced93bdc67
B c8847b7463f4f7beec2995458cdb58173c672f57
+B c886ce37f9bbbb441b97a8a01f7b02a67396f1a2
B c8f00d621bbebb4566bad45aca324676c221102c
B c92b639c2ad2f67533b21dcd4a6543e28cb676bf
B c95370e4cb038964ff8054d18b920da04805ad06
@@ -875,6 +877,7 @@ M 0fdc68f4cd45715a57f0aabd1c8f33da556bf50e
M 0feb9222ddcb94464356e12ee9a0da88576514ca
M 1022b96f3cbb1f064f3838a008eda420ea74762e
M 106b942d2ca4b8a4a95dc34c3d447fe5afb548ba
+M 10c6be01530e9a8c323fa53743961a0e7ad7e062
M 10d86cfe1b44ea471a6ddade1ef97b0090b29fa5
M 10ee4399bc892c4f96e481882ca89d4ae04edab7
M 11b4bedd47eed11662f3021f6220a6bd4aa01fa8
@@ -976,6 +979,7 @@ M 4ad7f1c417ddc8c5fe26f9ce63285a6755a2cc88
M 4adf16eda64105ec116ade7f3ff7324bac486c1e
M 4b2c552ff7c75b30a7c243417e514de9fee17248
M 4b3c378bf3c64cf7a1fd0ca52dd4a779e36ea274
+M 4c1bb349ff0a2d2460551729b77b47bd419ce145
M 4c3aeadaab87eb25c651bf7e0d79602173bf1451
M 4c5707d548cfa8f39d8cce290c742a84d2a7647b
M 4d392f1bfee96317d42c1c9d82a1f06da5158b54
@@ -1040,6 +1044,7 @@ M 74cba458513b9308ab9da0165ec32906786506c6
M 75a584de2b9ec8154222bd48c56568ef7041cd57
M 75d0b126cf89d7ea11bb05e7ba11300fe3f0789f
M 76d10e750efeb0f0533f1465b236a6b1900f52bf
+M 7705a925f0ce56507d5459d321f1def1f77258ae
M 7837aec132d1f80c78a118544bf4caf420afcdc8
M 78a2ca995c6ac70c637358c0327742af2f0ba2f7
M 78bb09270488d503a4d8d54d839dc526f12e5183
@@ -1131,6 +1136,7 @@ M b3976c6ff723b34f09e82449333db254093e82fe
M b3c07db315bc83b91857acab1d530fca75073d06
M b41e50ed05ff7575d8f8816ed0f0029aaf34efb4
M b4b9a010bb23059251400455afabddee15b46127
+M b5162d492c586e3f1abf42e2a9ae09322543bc97
M b5c38cc0e779ce45e3e2c03e0c62c8a5a767d986
M b5db68a487f727f5c0c37ce8053524664f6b25f3
M baa6132a0cc4e51421536d89b2f2c245abe5272d
[4/5] git commit: More plugin version updates
Posted by dk...@apache.org.
More plugin version updates
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/364fba1a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/364fba1a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/364fba1a
Branch: refs/heads/2.7.x-fixes
Commit: 364fba1ae623619c537ecaca1b9de8013b1c0d68
Parents: 7e2c620
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Mar 7 15:17:47 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Mar 7 16:47:56 2014 -0500
----------------------------------------------------------------------
parent/pom.xml | 5 +++--
pom.xml | 62 ++++++++++++++++++++++++++---------------------------
2 files changed, 34 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/364fba1a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b6f98c6..7ef379c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -298,7 +298,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9.1</version>
+ <version>2.11</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf.build-utils</groupId>
@@ -308,6 +308,7 @@
</dependencies>
<configuration>
<encoding>UTF-8</encoding>
+ <includeResources>false</includeResources>
</configuration>
<executions>
<execution>
@@ -450,7 +451,7 @@
</plugin>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.3</version>
+ <version>1.5</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf.build-utils</groupId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/364fba1a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 710092a..74e1dea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -375,7 +375,7 @@
<!-- We want to sign the artifact, the POM, and all attached artifacts -->
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
<executions>
<execution>
<goals>
@@ -465,7 +465,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -490,7 +490,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -523,7 +523,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.15</version>
+ <version>2.16</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -597,7 +597,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.5</version>
+ <version>2.2</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf.build-utils</groupId>
@@ -609,22 +609,22 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.15</version>
+ <version>2.16</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.5</version>
+ <version>2.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.8</version>
+ <version>3.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -639,26 +639,26 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.7</version>
- <configuration>
- <numUnapprovedLicenses>350</numUnapprovedLicenses>
- <excludeSubProjects>false</excludeSubProjects>
- <excludes>
- <exclude>.git/**</exclude>
- <exclude>.gitignore</exclude>
- <exclude>velocity.log</exclude>
- <exclude>**/target/**</exclude>
- <exclude>distribution/**</exclude>
- <exclude>**/jaxb.index</exclude>
- <exclude>**/META-INF/MANIFEST</exclude>
- <exclude>**/src/test/**/*.txt</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.settings/**/*</exclude>
- <exclude>**/.project</exclude>
- </excludes>
- </configuration>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ <configuration>
+ <numUnapprovedLicenses>350</numUnapprovedLicenses>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <exclude>.git/**</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>velocity.log</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>distribution/**</exclude>
+ <exclude>**/jaxb.index</exclude>
+ <exclude>**/META-INF/MANIFEST</exclude>
+ <exclude>**/src/test/**/*.txt</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <exclude>**/.project</exclude>
+ </excludes>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -687,7 +687,7 @@
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.1</version>
+ <version>3.3</version>
<configuration>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
@@ -695,7 +695,7 @@
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.5</version>
+ <version>2.7</version>
<configuration>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
[2/5] git commit: Auto block stuff we know will need to be blocked
Posted by dk...@apache.org.
Auto block stuff we know will need to be blocked
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2f9206f1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2f9206f1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2f9206f1
Branch: refs/heads/2.7.x-fixes
Commit: 2f9206f16fd208d4dc53a92b8fa6221332969d78
Parents: 7d9f038
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Feb 21 01:02:42 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Mar 7 16:46:04 2014 -0500
----------------------------------------------------------------------
bin/DoMerges.java | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/2f9206f1/bin/DoMerges.java
----------------------------------------------------------------------
diff --git a/bin/DoMerges.java b/bin/DoMerges.java
index bc03fa5..82d53be 100644
--- a/bin/DoMerges.java
+++ b/bin/DoMerges.java
@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
svn to be available on the path. If using a git checkout, it also requires
the command line version of git on the path.
- Basically, svn does all the work, but this little wrapper
+ Basically, git does all the work, but this little wrapper
thing will display the commit logs, prompt if you want to merge/block/ignore
each commit, prompt for commit (so you can resolve any conflicts first),
etc....
@@ -50,7 +50,7 @@ import java.util.regex.Pattern;
[R]ecord formally records that a merge occurred, but it does *not*
actually merge the commit. This is useful if you another tool to do
- the merging (such as Git) but still wish to record a merge did occur.
+ the merging but still wish to record a merge did occur.
[F]lush will permanently save all the [B]'s and [R]'s you've earlier made,
useful when you need to stop DoMerges (due to a missed commit or other
@@ -253,7 +253,6 @@ public class DoMerges {
if (s.contains("[maven-release-plugin] prepare")) {
return;
}
-
}
map.add(list.toArray(new String[list.size()]));
}
@@ -387,6 +386,10 @@ public class DoMerges {
System.out.println("https://issues.apache.org/jira/browse/" + s);
}
StringBuilder log = new StringBuilder();
+ if (isBlocked(logLines)) {
+ records.add("B " + ver);
+ continue;
+ }
for (String s : logLines) {
System.out.println(s);
log.append(s).append("\n");
@@ -444,6 +447,17 @@ public class DoMerges {
}
flush();
}
+ private static boolean isBlocked(String[] logLines) {
+ for (String s: logLines) {
+ if (s.trim().contains("Recording .gitmergeinfo Changes")) {
+ return true;
+ }
+ if (s.contains("[maven-release-plugin] prepare")) {
+ return true;
+ }
+ }
+ return false;
+ }
private static boolean checkPatchId(String ver) throws Exception {
if (!patchIds.isEmpty()) {
String pid = getPatchId(ver);
[3/5] git commit: Update release plugin version to version that works
better with git
Posted by dk...@apache.org.
Update release plugin version to version that works better with git
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7e2c6208
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7e2c6208
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7e2c6208
Branch: refs/heads/2.7.x-fixes
Commit: 7e2c6208d05337cfbd65eaa04c51caa8de957b3f
Parents: 2f9206f
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Mar 7 15:01:06 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Mar 7 16:46:25 2014 -0500
----------------------------------------------------------------------
pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7e2c6208/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0fdc7a9..710092a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -495,9 +495,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.3.2</version>
+ <version>2.5</version>
<configuration>
- <tagBase>https://svn.apache.org/repos/asf/cxf/tags</tagBase>
<useReleaseProfile>false</useReleaseProfile>
<preparationGoals>clean install</preparationGoals>
<goals>deploy</goals>