Repository: accumulo Updated Branches: refs/heads/master 1d58ee19c -> b49f9309f
ACCUMULO-2616 Bump maven plugin/parent POM versions Change Apache parent POM to version 14. Drop resulting redundant and/or unnecessary plugin versions, configuration, and properties. Update bouncycastle test dependency version and incorporate into the dependencyManagement section and fix resulting deprecation warnings. Drop redundant m2e container in assembly POM. Migrate to non-deprecated surefire/failsafe fork settings. Update other plugin versions to latest. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/aaa8afb9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aaa8afb9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aaa8afb9 Branch: refs/heads/master Commit: aaa8afb9fe28d6af3437428dc30490fc079f2836 Parents: e2552a8 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Apr 2 16:24:11 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Apr 2 16:24:11 2014 -0400 ---------------------------------------------------------------------- assemble/pom.xml | 31 --------- examples/simple/pom.xml | 1 - maven-plugin/src/it/plugin-test/pom.xml | 4 -- pom.xml | 70 ++++++++------------ start/pom.xml | 3 +- test/pom.xml | 7 +- .../apache/accumulo/test/util/CertUtils.java | 10 +-- test/src/test/scripts/run-test.sh | 2 +- 8 files changed, 38 insertions(+), 90 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/aaa8afb9/assemble/pom.xml ---------------------------------------------------------------------- diff --git a/assemble/pom.xml b/assemble/pom.xml index a293fb5..704107b 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -117,37 +117,6 @@ <artifactId>libthrift</artifactId> </dependency> </dependencies> - <build> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <versionRange>[1.8,)</versionRange> - <goals> - <goal>regex-property</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> <profiles> <profile> <id>apache-release</id> http://git-wip-us.apache.org/repos/asf/accumulo/blob/aaa8afb9/examples/simple/pom.xml ---------------------------------------------------------------------- diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml index 7930a54..35f0540 100644 --- a/examples/simple/pom.xml +++ b/examples/simple/pom.xml @@ -84,7 +84,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.2</version> <configuration> <!-- this is just an example. Leave it out. --> <skip>true</skip> http://git-wip-us.apache.org/repos/asf/accumulo/blob/aaa8afb9/maven-plugin/src/it/plugin-test/pom.xml ---------------------------------------------------------------------- diff --git a/maven-plugin/src/it/plugin-test/pom.xml b/maven-plugin/src/it/plugin-test/pom.xml index a602042..7654c96 100644 --- a/maven-plugin/src/it/plugin-test/pom.xml +++ b/maven-plugin/src/it/plugin-test/pom.xml @@ -30,10 +30,6 @@ <description>A simple IT verifying the basic use case.</description> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - <dependencies> <dependency> <groupId>commons-cli</groupId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/aaa8afb9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0ed6b05..1b555b0 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>13</version> + <version>14</version> </parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> @@ -114,17 +114,22 @@ </site> </distributionManagement> <properties> - <accumulo.it.forkCount>1</accumulo.it.forkCount> <!-- used for filtering the java source with the current version --> <accumulo.release.version>${project.version}</accumulo.release.version> + <!-- bouncycastle version for test dependencies --> + <bouncycastle.version>1.50</bouncycastle.version> + <!-- surefire/failsafe plugin option --> + <forkCount>0.25C</forkCount> <!-- overwritten in profiles hadoop-1 or hadoop-2 --> <hadoop.version>2.2.0</hadoop.version> <httpclient.version>3.1</httpclient.version> <!-- the maven-release-plugin makes this recommendation, due to plugin bugs --> <maven.min-version>3.0.4</maven.min-version> + <!-- surefire/failsafe plugin option --> + <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> <powermock.version>1.5</powermock.version> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <!-- surefire/failsafe plugin option --> + <reuseForks>true</reuseForks> <sealJars>false</sealJars> <!-- overwritten in profiles hadoop-1 or hadoop-2 --> <slf4j.version>1.7.5</slf4j.version> @@ -382,6 +387,16 @@ <version>${zookeeper.version}</version> </dependency> <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + <version>${bouncycastle.version}</version> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + <version>${bouncycastle.version}</version> + </dependency> + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> <version>3.0.10</version> @@ -439,7 +454,7 @@ <plugin> <groupId>com.google.code.sortpom</groupId> <artifactId>maven-sortpom-plugin</artifactId> - <version>2.1.0</version> + <version>2.3.0</version> <configuration> <predefinedSortOrder>recommended_2008_06</predefinedSortOrder> <lineSeparator>\n</lineSeparator> @@ -453,7 +468,7 @@ <plugin> <groupId>com.github.koraktor</groupId> <artifactId>mavanagaiata</artifactId> - <version>0.6.1</version> + <version>0.7.0</version> <configuration> <skipNoGit>true</skipNoGit> </configuration> @@ -461,7 +476,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>native-maven-plugin</artifactId> - <version>1.0-alpha-7</version> + <version>1.0-alpha-8</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -505,16 +520,9 @@ <source>1.6</source> <target>1.6</target> <optimize>true</optimize> - <encoding>${project.build.sourceEncoding}</encoding> </configuration> </plugin> <plugin> - <!-- should be in the Apache parent, but isn't --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.8</version> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> @@ -554,23 +562,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.3</version> <configuration> <skipDeploy>true</skipDeploy> </configuration> </plugin> <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <redirectTestOutputToFile>true</redirectTestOutputToFile> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <version>0.10</version> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.8</version> @@ -578,7 +574,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> - <version>2.5.2</version> + <version>2.6</version> <configuration> <aggregate>true</aggregate> <formats> @@ -799,14 +795,6 @@ <goal>integration-test</goal> <goal>verify</goal> </goals> - <configuration> - <!--parallel>classes</parallel--> - <reuseForks>false</reuseForks> - <forkMode>perthread</forkMode> - <perCoreThreadCount>false</perCoreThreadCount> - <threadCount>${accumulo.it.forkCount}</threadCount> - <redirectTestOutputToFile>true</redirectTestOutputToFile> - </configuration> </execution> </executions> </plugin> @@ -860,7 +848,7 @@ <!-- enable ssh deployment of site with maven 3 --> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-ssh</artifactId> - <version>2.4</version> + <version>2.6</version> </extension> </extensions> </build> @@ -881,7 +869,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9</version> <reportSets> <reportSet> <reports> @@ -893,12 +880,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId> - <version>2.3</version> + <version>2.4</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>3.0.1</version> + <version>3.1</version> <configuration> <format>html</format> <includeTests>true</includeTests> @@ -927,7 +914,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> - <version>2.5.2</version> + <version>2.5.3</version> <configuration> <excludeFilterFile>contrib/findbugs-exclude.xml</excludeFilterFile> <findbugsXmlOutput>true</findbugsXmlOutput> @@ -968,7 +955,6 @@ <descriptorRefs> <descriptorRef>source-release-zip-tar</descriptorRef> </descriptorRefs> - <tarLongFileFormat>gnu</tarLongFileFormat> </configuration> </execution> </executions> @@ -1038,7 +1024,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> - <version>2.5.2</version> + <version>2.6</version> <configuration> <aggregate>true</aggregate> <formats> http://git-wip-us.apache.org/repos/asf/accumulo/blob/aaa8afb9/start/pom.xml ---------------------------------------------------------------------- diff --git a/start/pom.xml b/start/pom.xml index 4cad554..e164e82 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -93,7 +93,8 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>always</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/accumulo/blob/aaa8afb9/test/pom.xml ---------------------------------------------------------------------- diff --git a/test/pom.xml b/test/pom.xml index 50a2f70..4ec6f6a 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -25,9 +25,6 @@ <artifactId>accumulo-test</artifactId> <name>Testing</name> <description>Tests for Apache Accumulo.</description> - <properties> - <bouncycastle.version>1.49</bouncycastle.version> - </properties> <dependencies> <dependency> <groupId>com.beust</groupId> @@ -159,13 +156,11 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> - <version>${bouncycastle.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> - <version>${bouncycastle.version}</version> <scope>test</scope> </dependency> <dependency> @@ -198,11 +193,13 @@ <profiles> <profile> <id>shared-mini-for-it</id> + <!-- <activation> <property> <name>!skipITs</name> </property> </activation> + --> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/accumulo/blob/aaa8afb9/test/src/test/java/org/apache/accumulo/test/util/CertUtils.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/util/CertUtils.java b/test/src/test/java/org/apache/accumulo/test/util/CertUtils.java index bb7b16d..b561600 100644 --- a/test/src/test/java/org/apache/accumulo/test/util/CertUtils.java +++ b/test/src/test/java/org/apache/accumulo/test/util/CertUtils.java @@ -55,8 +55,8 @@ import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x500.style.IETFUtils; import org.bouncycastle.asn1.x500.style.RFC4519Style; import org.bouncycastle.asn1.x509.BasicConstraints; +import org.bouncycastle.asn1.x509.Extension; import org.bouncycastle.asn1.x509.KeyUsage; -import org.bouncycastle.asn1.x509.X509Extension; import org.bouncycastle.cert.CertIOException; import org.bouncycastle.cert.X509CertificateHolder; import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils; @@ -274,11 +274,11 @@ public class CertUtils { X500Name issuer = new X500Name(IETFUtils.rDNsFromString(issuerDirString, RFC4519Style.INSTANCE)); JcaX509v3CertificateBuilder certGen = new JcaX509v3CertificateBuilder(issuer, serialNumber, startDate.getTime(), endDate.getTime(), issuer, kp.getPublic()); JcaX509ExtensionUtils extensionUtils = new JcaX509ExtensionUtils(); - certGen.addExtension(X509Extension.subjectKeyIdentifier, false, extensionUtils.createSubjectKeyIdentifier(kp.getPublic())); - certGen.addExtension(X509Extension.basicConstraints, false, new BasicConstraints(isCertAuthority)); - certGen.addExtension(X509Extension.authorityKeyIdentifier, false, extensionUtils.createAuthorityKeyIdentifier(signerPublicKey)); + certGen.addExtension(Extension.subjectKeyIdentifier, false, extensionUtils.createSubjectKeyIdentifier(kp.getPublic())); + certGen.addExtension(Extension.basicConstraints, false, new BasicConstraints(isCertAuthority)); + certGen.addExtension(Extension.authorityKeyIdentifier, false, extensionUtils.createAuthorityKeyIdentifier(signerPublicKey)); if (isCertAuthority) { - certGen.addExtension(X509Extension.keyUsage, true, new KeyUsage(KeyUsage.keyCertSign)); + certGen.addExtension(Extension.keyUsage, true, new KeyUsage(KeyUsage.keyCertSign)); } X509CertificateHolder cert = certGen.build(new JcaContentSignerBuilder(signingAlgorithm).build(signerPrivateKey)); return new X509CertificateObject(cert.toASN1Structure()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/aaa8afb9/test/src/test/scripts/run-test.sh ---------------------------------------------------------------------- diff --git a/test/src/test/scripts/run-test.sh b/test/src/test/scripts/run-test.sh index d669d67..02a5090 100755 --- a/test/src/test/scripts/run-test.sh +++ b/test/src/test/scripts/run-test.sh @@ -38,5 +38,5 @@ cd $bin/.. tests=$1 shift -# Let the user provide additional maven options (like -Daccumulo.it.forkCount=2) +# Let the user provide additional maven options (like -DforkCount=2) mvn verify -Dit.test=$tests -Dtest=testnamethatdoesntexist -DfailIfNoTests=false $@
