[maven-surefire] 01/01: remove toolchain
This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch toolc in repository https://gitbox.apache.org/repos/asf/maven-surefire.git commit 3319c422f105131cf674646ec0e693d054d355b2 Author: Elliotte Rusty Harold AuthorDate: Wed Sep 30 11:49:38 2020 -0400 remove toolchain --- maven-surefire-common/pom.xml | 4 pom.xml | 15 --- 2 files changed, 19 deletions(-) diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 0c9ba3b..f37f072 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -59,10 +59,6 @@ provided -org.apache.maven -maven-toolchain - - org.apache.maven.shared maven-common-artifact-filters diff --git a/pom.xml b/pom.xml index fbbba5f..339e645 100644 --- a/pom.xml +++ b/pom.xml @@ -200,21 +200,6 @@ -org.apache.maven -maven-toolchain -3.0-alpha-2 - - -org.apache.maven -maven-core - - -org.apache.maven -maven-compat - - - - org.apache.maven.shared maven-common-artifact-filters 3.1.0
[maven-surefire] branch toolc created (now 3319c42)
This is an automated email from the ASF dual-hosted git repository. elharo pushed a change to branch toolc in repository https://gitbox.apache.org/repos/asf/maven-surefire.git. at 3319c42 remove toolchain This branch includes the following new commits: new 3319c42 remove toolchain The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[maven-resolver] 02/02: [MRESOLVER-140] Default to SHA-1 and MD5 hashing algorithms
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MRESOLVER-138 in repository https://gitbox.apache.org/repos/asf/maven-resolver.git commit 464ae7d640331594d87faa1d83d38d40b41f019d Author: Michael Osipov AuthorDate: Wed Sep 30 21:16:04 2020 +0200 [MRESOLVER-140] Default to SHA-1 and MD5 hashing algorithms --- .../impl/Maven2RepositoryLayoutFactory.java| 2 +- .../impl/Maven2RepositoryLayoutFactoryTest.java| 42 -- src/site/markdown/configuration.md | 4 +-- 3 files changed, 18 insertions(+), 30 deletions(-) diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java index 0372758..9f35142 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java @@ -48,7 +48,7 @@ public final class Maven2RepositoryLayoutFactory static final String CONFIG_PROP_SIGNATURE_CHECKSUMS = "aether.checksums.forSignature"; static final String CONFIG_PROP_CHECKSUMS_ALGORITHMS = "aether.checksums.algorithms"; -static final String DEFAULT_CHECKSUMS_ALGORITHMS = "SHA-512,SHA-256,SHA-1,MD5"; +static final String DEFAULT_CHECKSUMS_ALGORITHMS = "SHA-1,MD5"; private float priority; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java index bbf67cd..82fd2ea 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java @@ -155,11 +155,9 @@ public class Maven2RepositoryLayoutFactoryTest DefaultArtifact artifact = new DefaultArtifact( "g.i.d", "a-i.d", "cls", "ext", "1.0" ); URI uri = layout.getLocation( artifact, false ); List checksums = layout.getChecksums( artifact, false, uri ); -assertEquals( 4, checksums.size() ); -assertChecksum( checksums.get( 0 ), "g/i/d/a-i.d/1.0/a-i.d-1.0-cls.ext.sha512", "SHA-512" ); -assertChecksum( checksums.get( 1 ), "g/i/d/a-i.d/1.0/a-i.d-1.0-cls.ext.sha256", "SHA-256" ); -assertChecksum( checksums.get( 2 ), "g/i/d/a-i.d/1.0/a-i.d-1.0-cls.ext.sha1", "SHA-1" ); -assertChecksum( checksums.get( 3 ), "g/i/d/a-i.d/1.0/a-i.d-1.0-cls.ext.md5", "MD5" ); +assertEquals( 2, checksums.size() ); +assertChecksum( checksums.get( 0 ), "g/i/d/a-i.d/1.0/a-i.d-1.0-cls.ext.sha1", "SHA-1" ); +assertChecksum( checksums.get( 1 ), "g/i/d/a-i.d/1.0/a-i.d-1.0-cls.ext.md5", "MD5" ); } @Test @@ -181,11 +179,9 @@ public class Maven2RepositoryLayoutFactoryTest DefaultArtifact artifact = new DefaultArtifact( "g.i.d", "a-i.d", "cls", "ext", "1.0" ); URI uri = layout.getLocation( artifact, true ); List checksums = layout.getChecksums( artifact, true, uri ); -assertEquals( 4, checksums.size() ); -assertChecksum( checksums.get( 0 ), "g/i/d/a-i.d/1.0/a-i.d-1.0-cls.ext.sha512", "SHA-512" ); -assertChecksum( checksums.get( 1 ), "g/i/d/a-i.d/1.0/a-i.d-1.0-cls.ext.sha256", "SHA-256" ); -assertChecksum( checksums.get( 2 ), "g/i/d/a-i.d/1.0/a-i.d-1.0-cls.ext.sha1", "SHA-1" ); -assertChecksum( checksums.get( 3 ), "g/i/d/a-i.d/1.0/a-i.d-1.0-cls.ext.md5", "MD5" ); +assertEquals( 2, checksums.size() ); +assertChecksum( checksums.get( 0 ), "g/i/d/a-i.d/1.0/a-i.d-1.0-cls.ext.sha1", "SHA-1" ); +assertChecksum( checksums.get( 1 ), "g/i/d/a-i.d/1.0/a-i.d-1.0-cls.ext.md5", "MD5" ); } @Test @@ -209,14 +205,10 @@ public class Maven2RepositoryLayoutFactoryTest Metadata.Nature.RELEASE_OR_SNAPSHOT ); URI uri = layout.getLocation( metadata, false ); List checksums = layout.getChecksums( metadata, false, uri ); -assertEquals( 4, checksums.size() ); -assertChecksum( checksums.get( 0 ), "org/apache/maven/plugins/maven-jar-plugin/maven-metadata.xml.sha512", -"SHA-512" ); -assertChecksum( checksums.get( 1 ), "org/apache/maven/plugins/maven-jar-plugin/maven-metadata.xml.sha256", -"SHA-256" ); -assertChecksum( checksums.get( 2 ), "org/apache/maven/plugins/maven-jar-plugin/maven-metadata.xml.sha1", +assertEquals( 2, checksums.size() ); +assertChecksum( checksums.get( 0 ), "org/apache/maven/plugins/maven-jar-plugin/maven-metadata.xml.sha1", "SHA-1" ); -assertChecksum( check
[maven-resolver] 01/02: [MRESOLVER-139] Make SimpleDigest use SHA-1 or MD5 only
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MRESOLVER-138
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit 02c04c924049a534c245675672f96d43b8115f58
Author: Michael Osipov
AuthorDate: Sat Sep 26 23:07:27 2020 +0200
[MRESOLVER-139] Make SimpleDigest use SHA-1 or MD5 only
---
.../src/main/java/org/eclipse/aether/internal/impl/SimpleDigest.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleDigest.java
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleDigest.java
index 83825f1..daf56fc 100644
---
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleDigest.java
+++
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleDigest.java
@@ -30,7 +30,7 @@ import java.security.NoSuchAlgorithmException;
class SimpleDigest
{
-private static final String[] HASH_ALGOS = new String[] { "SHA-512",
"SHA-256", "SHA-1", "MD5" };
+private static final String[] HASH_ALGOS = new String[] { "SHA-1", "MD5" };
private MessageDigest digest;
[maven-resolver] branch MRESOLVER-138 created (now 464ae7d)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MRESOLVER-138 in repository https://gitbox.apache.org/repos/asf/maven-resolver.git. at 464ae7d [MRESOLVER-140] Default to SHA-1 and MD5 hashing algorithms This branch includes the following new commits: new 02c04c9 [MRESOLVER-139] Make SimpleDigest use SHA-1 or MD5 only new 464ae7d [MRESOLVER-140] Default to SHA-1 and MD5 hashing algorithms The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[maven-surefire] 02/02: avoided unnecessary string encoding (faster in 25 ns)
This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-surefire.git commit fba377f5fa876fd192fe071e28792951c569f789 Author: tibordigana AuthorDate: Wed Sep 30 22:07:35 2020 +0200 avoided unnecessary string encoding (faster in 25 ns) --- .../src/main/java/org/apache/maven/surefire/api/booter/Constants.java | 1 + .../maven/surefire/booter/spi/LegacyMasterProcessChannelEncoder.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Constants.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Constants.java index d1be7ac..bcb7b17 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Constants.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Constants.java @@ -32,4 +32,5 @@ public final class Constants public static final String MAGIC_NUMBER = "maven-surefire-event"; public static final byte[] MAGIC_NUMBER_BYTES = MAGIC_NUMBER.getBytes( US_ASCII ); public static final Charset DEFAULT_STREAM_ENCODING = UTF_8; +public static final byte[] DEFAULT_STREAM_ENCODING_BYTES = UTF_8.name().getBytes( US_ASCII ); } diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/LegacyMasterProcessChannelEncoder.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/LegacyMasterProcessChannelEncoder.java index dba0f9b..0d8f787 100644 --- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/LegacyMasterProcessChannelEncoder.java +++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/LegacyMasterProcessChannelEncoder.java @@ -43,6 +43,7 @@ import static java.lang.Math.ceil; import static java.nio.CharBuffer.wrap; import static java.util.Objects.requireNonNull; import static org.apache.maven.surefire.api.booter.Constants.DEFAULT_STREAM_ENCODING; +import static org.apache.maven.surefire.api.booter.Constants.DEFAULT_STREAM_ENCODING_BYTES; import static org.apache.maven.surefire.api.booter.Constants.MAGIC_NUMBER_BYTES; import static org.apache.maven.surefire.api.booter.ForkedProcessEventType.BOOTERCODE_BYE; import static org.apache.maven.surefire.api.booter.ForkedProcessEventType.BOOTERCODE_CONSOLE_DEBUG; @@ -476,7 +477,7 @@ public class LegacyMasterProcessChannelEncoder implements MasterProcessChannelEn String charsetName = encoder.charset().name(); result.put( (byte) charsetName.length() ); result.put( (byte) ':' ); -encoder.encode( wrap( charsetName ), result, true ); +result.put( DEFAULT_STREAM_ENCODING_BYTES ); result.put( (byte) ':' ); }
[maven-surefire] branch master updated (a56ebde -> fba377f)
This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-surefire.git. from a56ebde [jenkins] excluding H48 new 5a393a4 removed the unused method parameter LegacyMasterProcessChannelEncoder new fba377f avoided unnecessary string encoding (faster in 25 ns) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/maven/surefire/api/booter/Constants.java | 1 + .../booter/spi/LegacyMasterProcessChannelEncoder.java | 15 +++ .../booter/spi/LegacyMasterProcessChannelEncoderTest.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-)
[maven-surefire] 01/02: removed the unused method parameter LegacyMasterProcessChannelEncoder
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 5a393a4baab284fca444fd13c8075bdf30b9b487
Author: tibordigana
AuthorDate: Wed Sep 30 15:01:27 2020 +0200
removed the unused method parameter LegacyMasterProcessChannelEncoder
---
.../booter/spi/LegacyMasterProcessChannelEncoder.java| 12 +---
.../booter/spi/LegacyMasterProcessChannelEncoderTest.java| 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/LegacyMasterProcessChannelEncoder.java
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/LegacyMasterProcessChannelEncoder.java
index f8cb224..dba0f9b 100644
---
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/LegacyMasterProcessChannelEncoder.java
+++
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/LegacyMasterProcessChannelEncoder.java
@@ -314,10 +314,9 @@ public class LegacyMasterProcessChannelEncoder implements
MasterProcessChannelEn
private void encodeOpcode( ForkedProcessEventType eventType, boolean
sendImmediately )
{
-CharsetEncoder encoder = DEFAULT_STREAM_ENCODING.newEncoder();
int bufferMaxLength = estimateBufferLength( eventType, null, null, 0 );
ByteBuffer result = ByteBuffer.allocate( bufferMaxLength );
-encodeOpcode( encoder, result, eventType, null );
+encodeOpcode( result, eventType, null );
encodeAndPrintEvent( result, sendImmediately );
}
@@ -421,7 +420,7 @@ public class LegacyMasterProcessChannelEncoder implements
MasterProcessChannelEn
encodeString( encoder, result, reportEntry.getNameText() );
encodeString( encoder, result, reportEntry.getGroup() );
encodeString( encoder, result, reportEntry.getMessage() );
-encodeInteger( encoder, result, reportEntry.getElapsed() );
+encodeInteger( result, reportEntry.getElapsed() );
encode( encoder, result, stackTraceWrapper );
@@ -457,7 +456,7 @@ public class LegacyMasterProcessChannelEncoder implements
MasterProcessChannelEn
result.put( (byte) ':' );
}
-private static void encodeInteger( CharsetEncoder encoder, ByteBuffer
result, Integer i )
+private static void encodeInteger( ByteBuffer result, Integer i )
{
if ( i == null )
{
@@ -473,7 +472,7 @@ public class LegacyMasterProcessChannelEncoder implements
MasterProcessChannelEn
static void encodeHeader( CharsetEncoder encoder, ByteBuffer result,
ForkedProcessEventType operation,
RunMode runMode )
{
-encodeOpcode( encoder, result, operation, runMode );
+encodeOpcode( result, operation, runMode );
String charsetName = encoder.charset().name();
result.put( (byte) charsetName.length() );
result.put( (byte) ':' );
@@ -488,8 +487,7 @@ public class LegacyMasterProcessChannelEncoder implements
MasterProcessChannelEn
* @param operation opcode
* @param runMode run mode
*/
-static void encodeOpcode( CharsetEncoder encoder, ByteBuffer result,
ForkedProcessEventType operation,
- RunMode runMode )
+static void encodeOpcode( ByteBuffer result, ForkedProcessEventType
operation, RunMode runMode )
{
result.put( (byte) ':' );
result.put( MAGIC_NUMBER_BYTES );
diff --git
a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/spi/LegacyMasterProcessChannelEncoderTest.java
b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/spi/LegacyMasterProcessChannelEncoderTest.java
index 0262f3e..11f2d16 100644
---
a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/spi/LegacyMasterProcessChannelEncoderTest.java
+++
b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/spi/LegacyMasterProcessChannelEncoderTest.java
@@ -1007,7 +1007,7 @@ public class LegacyMasterProcessChannelEncoderTest
{
CharsetEncoder encoder = UTF_8.newEncoder();
ByteBuffer result = ByteBuffer.allocate( 128 );
-encodeOpcode( encoder, result, BOOTERCODE_TEST_ERROR, NORMAL_RUN );
+encodeOpcode( result, BOOTERCODE_TEST_ERROR, NORMAL_RUN );
assertThat( toString( result ) )
.isEqualTo( ":maven-surefire-event:" + (char) 10 +
":test-error:" + (char) 10 + ":normal-run:" );
[maven-surefire] branch master updated: JDK 16
This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-surefire.git The following commit(s) were added to refs/heads/master by this push: new e9f595b JDK 16 e9f595b is described below commit e9f595bbdf2800d678b1ef34a7d1c70af51f3a8c Author: tibordigana AuthorDate: Wed Sep 30 23:59:04 2020 +0200 JDK 16 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index dabf30b..c3d1d8b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ properties( final def oses = ['linux':'ubuntu && !H48', 'windows':'Windows'] final def mavens = env.BRANCH_NAME == 'master' ? ['3.6.x', '3.2.x'] : ['3.6.x'] // all non-EOL versions and the first EA -final def jdks = [15, 14, 11, 8, 7] +final def jdks = [16, 15, 11, 8, 7] final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its'] final def goals = ['clean', 'install']
[maven-apache-parent] branch dependabot/maven/org.apache.maven.plugins-maven-ear-plugin-3.1.0 created (now d2a2ad7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-ear-plugin-3.1.0 in repository https://gitbox.apache.org/repos/asf/maven-apache-parent.git. at d2a2ad7 Bump maven-ear-plugin from 3.0.2 to 3.1.0 No new revisions were added by this update.
[maven-doxia-site] branch dependabot/maven/org.apache.ant-ant-1.10.9 created (now 54e7caf)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.ant-ant-1.10.9 in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git. at 54e7caf Bump ant from 1.10.8 to 1.10.9 No new revisions were added by this update.
[maven-doxia] branch dependabot/maven/org.apache.ant-ant-apache-regexp-1.10.9 created (now 0df5cee)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.ant-ant-apache-regexp-1.10.9 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git. at 0df5cee Bump ant-apache-regexp from 1.7.1 to 1.10.9 No new revisions were added by this update.
[maven-site] branch dependabot/maven/org.apache.ant-ant-1.10.9 created (now 78e8583)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.ant-ant-1.10.9 in repository https://gitbox.apache.org/repos/asf/maven-site.git. at 78e8583 Bump ant from 1.10.8 to 1.10.9 No new revisions were added by this update.
[maven-antrun-plugin] branch dependabot/maven/org.apache.ant-ant-1.10.9 created (now 854a9be)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.ant-ant-1.10.9 in repository https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git. at 854a9be Bump ant from 1.10.8 to 1.10.9 No new revisions were added by this update.
