[maven-surefire] branch SUREFIRE-1707 created (now 8c95e45)
This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a change to branch SUREFIRE-1707 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git. at 8c95e45 [SUREFIRE-1707] Forked JVM is killed when GC paused the tests for over 30 seconds This branch includes the following new commits: new 8c95e45 [SUREFIRE-1707] Forked JVM is killed when GC paused the tests for over 30 seconds 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-surefire] 01/01: [SUREFIRE-1707] Forked JVM is killed when GC paused the tests for over 30 seconds
This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a commit to branch SUREFIRE-1707 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git commit 8c95e4528fdb89596edf0f9ef65523e7b8f21e98 Author: tibordigana AuthorDate: Sun Nov 3 04:45:41 2019 +0100 [SUREFIRE-1707] Forked JVM is killed when GC paused the tests for over 30 seconds --- .../src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java index 93deb20..3a05844 100644 --- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java +++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java @@ -206,7 +206,7 @@ public final class ForkedBooter pingMechanisms.pingScheduler.scheduleWithFixedDelay( checkerJob, 0L, 1L, SECONDS ); } Runnable pingJob = createPingJob( pingDone, pingMechanisms.pluginProcessChecker ); -pingMechanisms.pingScheduler.scheduleAtFixedRate( pingJob, 0L, PING_TIMEOUT_IN_SECONDS, SECONDS ); +pingMechanisms.pingScheduler.scheduleWithFixedDelay( pingJob, 0L, PING_TIMEOUT_IN_SECONDS, SECONDS ); return pingMechanisms; }
[maven-doxia-converter] branch code-coverage deleted (was 85fcfd9)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch code-coverage in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git. was 85fcfd9 Add Code Coverage - jacoco-maven-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[maven-doxia-converter] branch master updated (37f8657 -> 85fcfd9)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git. from 37f8657 Remove obsolete dependency to xml-api add ea2afd6 Minor code update, Java 7 and fix ide warning, formating add 85fcfd9 Add Code Coverage - jacoco-maven-plugin No new revisions were added by this update. Summary of changes: pom.xml| 19 ++ .../org/apache/maven/doxia/DefaultConverter.java | 49 ++ .../org/apache/maven/doxia/cli/CLIManager.java | 51 ++- .../org/apache/maven/doxia/cli/ConverterCli.java | 15 - .../maven/doxia/wrapper/AbstractFileWrapper.java | 76 ++ .../maven/doxia/wrapper/AbstractWrapper.java | 25 +++ .../maven/doxia/wrapper/OutputFileWrapper.java | 7 +- .../maven/doxia/wrapper/OutputStreamWrapper.java | 4 +- .../java/org/apache/maven/doxia/ConverterTest.java | 13 ++-- 9 files changed, 96 insertions(+), 163 deletions(-)
[maven-doxia-converter] branch DOXIATOOLS-62 created (now 6ccb11f)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch DOXIATOOLS-62 in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git. at 6ccb11f [DOXIATOOLS-62] Enable xhtml5 parser/sink This branch includes the following new commits: new 6ccb11f [DOXIATOOLS-62] Enable xhtml5 parser/sink 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-doxia-converter] 01/01: [DOXIATOOLS-62] Enable xhtml5 parser/sink
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIATOOLS-62
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git
commit 6ccb11fb68e2abb97a5df320a3f8372d90a47724
Author: Sylwester Lachiewicz
AuthorDate: Sun Nov 3 00:39:23 2019 +0100
[DOXIATOOLS-62] Enable xhtml5 parser/sink
---
pom.xml| 6 +-
.../org/apache/maven/doxia/DefaultConverter.java | 13 +-
src/main/resources/META-INF/plexus/components.xml | 14 ++
src/site/apt/index.apt | 4 +-
src/site/apt/usage.apt.vm | 6 +-
.../java/org/apache/maven/doxia/ConverterTest.java | 65 +
src/test/resources/unit/xhtml/test.xhtml5 | 154 +
7 files changed, 252 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 10cb84d..282ca2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,11 @@ under the License.
doxia-module-xhtml
${doxiaVersion}
-
+
+ org.apache.maven.doxia
+ doxia-module-xhtml5
+ ${doxiaVersion}
+
commons-cli
diff --git a/src/main/java/org/apache/maven/doxia/DefaultConverter.java
b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
index 86ddad4..99698cf 100644
--- a/src/main/java/org/apache/maven/doxia/DefaultConverter.java
+++ b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
@@ -92,9 +92,12 @@ public class DefaultConverter
private static final String XHTML_PARSER = "xhtml";
+private static final String XHTML5_PARSER = "xhtml5";
+
/** Supported input format, i.e. supported Doxia parser */
public static final String[] SUPPORTED_FROM_FORMAT =
-{ APT_PARSER, CONFLUENCE_PARSER, DOCBOOK_PARSER, FML_PARSER,
TWIKI_PARSER, XDOC_PARSER, XHTML_PARSER };
+{ APT_PARSER, CONFLUENCE_PARSER, DOCBOOK_PARSER, FML_PARSER,
TWIKI_PARSER, XDOC_PARSER, XHTML_PARSER,
+XHTML5_PARSER};
private static final String APT_SINK = "apt";
@@ -116,10 +119,12 @@ public class DefaultConverter
private static final String XHTML_SINK = "xhtml";
+private static final String XHTML5_SINK = "xhtml5";
+
/** Supported output format, i.e. supported Doxia Sink */
public static final String[] SUPPORTED_TO_FORMAT =
{ APT_SINK, CONFLUENCE_SINK, DOCBOOK_SINK, FO_SINK, ITEXT_SINK,
LATEX_SINK, RTF_SINK, TWIKI_SINK, XDOC_SINK,
-XHTML_SINK };
+XHTML_SINK, XHTML5_SINK };
/** Flag to format the generated files, actually only for XML based sinks.
*/
private boolean formatOutput;
@@ -434,7 +439,7 @@ public class DefaultConverter
if ( formatOutput && ( DOCBOOK_SINK.equals( output.getFormat() ) ||
FO_SINK.equals( output.getFormat() )
|| ITEXT_SINK.equals( output.getFormat() ) || XDOC_SINK.equals(
output.getFormat() )
-|| XHTML_SINK.equals( output.getFormat() ) ) )
+|| XHTML_SINK.equals( output.getFormat() ) || XHTML5_SINK.equals(
output.getFormat() ) ) )
{
// format all xml files excluding docbook which is buggy
// TODO Add doc book format
@@ -658,7 +663,7 @@ public class DefaultConverter
throw new IllegalArgumentException( "The file '" +
xmlFile.getAbsolutePath() + "' is not a file." );
}
-
+
try ( Reader reader = ReaderFactory.newXmlReader( xmlFile ) )
{
XmlPullParser parser = new MXParser();
diff --git a/src/main/resources/META-INF/plexus/components.xml
b/src/main/resources/META-INF/plexus/components.xml
index 1d4157a..a843948 100644
--- a/src/main/resources/META-INF/plexus/components.xml
+++ b/src/main/resources/META-INF/plexus/components.xml
@@ -214,5 +214,19 @@
org.apache.maven.doxia.module.xhtml.XhtmlSinkFactory
Xhtml implementation of the Sink factory.
+
+
+
+ org.apache.maven.doxia.parser.Parser
+ xhtml5
+
org.apache.maven.doxia.module.xhtml5.Xhtml5Parser
+ Parse an xhtml5 model and emit events into a Doxia
Sink.
+
+
+ org.apache.maven.doxia.sink.SinkFactory
+ xhtml5
+
org.apache.maven.doxia.module.xhtml5.Xhtml5SinkFactory
+ Xhtml5 implementation of the Sink factory.
+
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index b17ec29..dd9aeae 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -33,9 +33,9 @@ Doxia Converter
Currently, the supported Doxia formats are:
-* input format: apt, confluence, docbook, fml, twiki, xdoc, xhtml or
autodetect
+* input format: apt, confluence, docbook, fml, twiki, xdoc, xhtml, xhtml5
or autodetect
-* output format: apt, confluence, docbook, fo, itext, latex, rtf, twiki,
xdoc, xhtml
+* output format: apt, confluence, docbook, fo, itext, latex, rtf, twiki,
xdoc, xhtml, xhtml5
[]
diff --git
[maven-surefire] branch checkstyle deleted (was 541e6b8)
This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a change to branch checkstyle in repository https://gitbox.apache.org/repos/asf/maven-surefire.git. was 541e6b8 [SUREFIRE-1706] Use the checkstyle in tests and se includeTestSourceDirectory=true The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[maven-surefire] branch master updated (8801286 -> 541e6b8)
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 8801286 [jenkinsfile] enabled H42 and jenkins-win-he-de-4 add 541e6b8 [SUREFIRE-1706] Use the checkstyle in tests and se includeTestSourceDirectory=true No new revisions were added by this update. Summary of changes: .../failsafe/MarshallerUnmarshallerTest.java | 3 + .../maven/plugin/failsafe/RunResultTest.java | 1 + .../AbstractSurefireMojoJava7PlusTest.java | 13 +- .../plugin/surefire/AbstractSurefireMojoTest.java | 38 +- .../maven/plugin/surefire/CommonReflectorTest.java | 5 +- .../org/apache/maven/plugin/surefire/DataZT1A.java | 7 +- .../org/apache/maven/plugin/surefire/DataZT2A.java | 8 +- .../org/apache/maven/plugin/surefire/DataZT3A.java | 8 +- .../maven/plugin/surefire/MojoMocklessTest.java| 9 +- .../surefire/SurefireDependencyResolverTest.java | 27 +- .../maven/plugin/surefire/SurefireHelperTest.java | 5 +- .../plugin/surefire/SurefirePropertiesTest.java| 4 +- ...ooterDeserializerProviderConfigurationTest.java | 47 ++- ...BooterDeserializerStartupConfigurationTest.java | 20 +- .../booterclient/DefaultForkConfigurationTest.java | 7 +- .../booterclient/ForkConfigurationTest.java| 5 + .../booterclient/ForkingRunListenerTest.java | 1 + .../JarManifestForkConfigurationTest.java | 3 +- .../booterclient/MockNotifiableTestStream.java | 2 +- .../plugin/surefire/booterclient/MockReporter.java | 3 +- .../OutputStreamFlushableCommandlineTest.java | 3 + .../TestProvidingInputStreamTest.java | 3 +- .../booterclient/output/ForkClientTest.java| 84 ++-- .../output/ForkedChannelDecoderTest.java | 27 +- .../report/DefaultReporterFactoryTest.java | 19 +- .../surefire/report/StatelessXmlReporterTest.java | 11 +- .../surefire/report/WrappedReportEntryTest.java| 16 +- .../runorder/RunEntryStatisticsMapTest.java| 5 +- .../surefire/util/DependenciesScannerTest.java | 49 ++- .../plugin/surefire/util/DirectoryScannerTest.java | 28 +- .../report/ConsoleOutputFileReporterTest.java | 6 +- .../maven/surefire/report/FileReporterTest.java| 13 +- .../maven/surefire/report/RunStatisticsTest.java | 33 +- .../maven/plugin/surefire/SurefirePluginTest.java | 6 +- .../plugins/surefire/report/JUnit4SuiteTest.java | 2 +- .../plugins/surefire/report/Surefire1183Test.java | 4 +- .../plugins/surefire/report/Surefire597Test.java | 6 +- .../surefire/report/SurefireReportMojoTest.java| 4 +- .../report/SurefireSchemaValidationTest.java | 5 +- .../maven/plugins/surefire/report/Utils.java | 3 + pom.xml| 7 + .../runorder/ThreadedExecutionSchedulerTest.java | 1 + .../surefire/SpecificTestClassFilterTest.java | 25 +- .../maven/surefire/booter/CommandReaderTest.java | 45 +- .../surefire/booter/ForkedChannelEncoderTest.java | 38 +- .../surefire/booter/ForkingRunListenerTest.java| 38 +- .../surefire/booter/MasterProcessCommandTest.java | 32 +- .../surefire/booter/NewClassLoaderRunner.java | 2 +- .../surefire/booter/SurefireReflectorTest.java | 38 +- .../report/LegacyPojoStackTraceWriterTest.java | 164 --- .../apache/maven/surefire/suite/RunResultTest.java | 1 + .../surefire/testset/FundamentalFilterTest.java| 3 +- .../maven/surefire/testset/ResolvedTestTest.java | 14 +- .../surefire/testset/TestListResolverTest.java | 15 +- .../maven/surefire/util/ReflectionUtilsTest.java | 6 +- .../surefire/util/RunOrderCalculatorTest.java | 9 +- .../apache/maven/surefire/util/RunOrderTest.java | 3 + .../apache/maven/surefire/util/TestsToRunTest.java | 7 +- .../util/internal/ConcurrencyUtilsTest.java| 4 +- .../maven/surefire/util/testdata/DataZT1A.java | 7 +- .../maven/surefire/util/testdata/DataZT2A.java | 8 +- .../maven/surefire/util/testdata/DataZT3A.java | 8 +- .../testdata/java/javascript/DataJavaZT4A.java | 4 +- .../maven/surefire/booter/ClasspathTest.java | 12 +- .../maven/surefire/booter/ForkedBooterTest.java| 1 + .../maven/surefire/booter/PpidCheckerTest.java | 1 + .../surefire/booter/PropertiesWrapperTest.java | 11 +- .../maven/surefire/booter/SystemUtilsTest.java | 7 + .../surefire/group/match/AndGroupMatcherTest.java | 4 + .../group/match/InverseGroupMatcherTest.java | 4 + .../surefire/group/match/OrGroupMatcherTest.java | 4 + .../group/match/SingleGroupMatcherTest.java| 4 + .../group/parse/GroupMatcherParserTest.java| 4 + .../maven/surefire/its/AbstractFailFastIT.java | 7 + .../its/AbstractTestMultipleMethodPatterns.java| 52 ++-
[maven-doxia-converter] 02/02: Add Code Coverage - jacoco-maven-plugin
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch code-coverage in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git commit 85fcfd93bb8989821d800511aae36b8eac7206b9 Author: Sylwester Lachiewicz AuthorDate: Sat Nov 2 21:15:38 2019 +0100 Add Code Coverage - jacoco-maven-plugin --- pom.xml | 19 +++ 1 file changed, 19 insertions(+) diff --git a/pom.xml b/pom.xml index 3aea09f..10cb84d 100644 --- a/pom.xml +++ b/pom.xml @@ -212,6 +212,25 @@ under the License. + + org.jacoco + jacoco-maven-plugin + 0.8.5 + + + + prepare-agent + + + +report +prepare-package + + report + + + + \ No newline at end of file
[maven-doxia-converter] 01/02: Minor code update, Java 7 and fix ide warning, formating
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch code-coverage
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git
commit ea2afd691e7bfc14b14d7a5633a5034f69268e37
Author: Sylwester Lachiewicz
AuthorDate: Sat Nov 2 21:13:25 2019 +0100
Minor code update, Java 7 and fix ide warning, formating
---
.../org/apache/maven/doxia/DefaultConverter.java | 49 ++
.../org/apache/maven/doxia/cli/CLIManager.java | 51 ++-
.../org/apache/maven/doxia/cli/ConverterCli.java | 15 -
.../maven/doxia/wrapper/AbstractFileWrapper.java | 76 ++
.../maven/doxia/wrapper/AbstractWrapper.java | 25 +++
.../maven/doxia/wrapper/OutputFileWrapper.java | 7 +-
.../maven/doxia/wrapper/OutputStreamWrapper.java | 4 +-
.../java/org/apache/maven/doxia/ConverterTest.java | 13 ++--
8 files changed, 77 insertions(+), 163 deletions(-)
diff --git a/src/main/java/org/apache/maven/doxia/DefaultConverter.java
b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
index 0de3513..86ddad4 100644
--- a/src/main/java/org/apache/maven/doxia/DefaultConverter.java
+++ b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
@@ -55,7 +55,6 @@ import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.SelectorUtils;
import org.codehaus.plexus.util.StringUtils;
@@ -69,6 +68,8 @@ import
org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import com.ibm.icu.text.CharsetDetector;
import com.ibm.icu.text.CharsetMatch;
+import static java.lang.String.format;
+
/**
* Default implementation of Converter
*
@@ -194,8 +195,7 @@ public class DefaultConverter
List files;
try
{
-files =
-FileUtils.getFiles( input.getFile(), "**/*." +
input.getFormat(),
+files = FileUtils.getFiles( input.getFile(), "**/*." +
input.getFormat(),
StringUtils.join(
FileUtils.getDefaultExcludes(), ", " ) );
}
catch ( IOException e )
@@ -466,17 +466,16 @@ public class DefaultConverter
private void parse( Parser parser, Reader reader, Sink sink )
throws ConverterException
{
-try
+try ( Reader r = reader )
{
-parser.parse( reader, sink );
+parser.parse( r, sink );
}
-catch ( ParseException e )
+catch ( ParseException | IOException e )
{
throw new ConverterException( "ParseException: " + e.getMessage(),
e );
}
finally
{
-IOUtil.close( reader );
sink.flush();
sink.close();
}
@@ -534,39 +533,31 @@ public class DefaultConverter
throw new IllegalArgumentException( "The file '" +
f.getAbsolutePath()
+ "' is not a file, could not detect encoding." );
}
-
-Reader reader = null;
-InputStream is = null;
try
{
if ( XmlUtil.isXml( f ) )
{
-reader = new XmlStreamReader( f );
-return ( (XmlStreamReader) reader ).getEncoding();
+try ( XmlStreamReader reader = new XmlStreamReader( f ) )
+{
+return reader.getEncoding();
+}
}
-is = new BufferedInputStream( new FileInputStream( f ) );
-CharsetDetector detector = new CharsetDetector();
-detector.setText( is );
-CharsetMatch match = detector.detect();
+try ( InputStream is = new BufferedInputStream( new
FileInputStream( f ) ) )
+{
+CharsetDetector detector = new CharsetDetector();
+detector.setText( is );
+CharsetMatch match = detector.detect();
-return match.getName().toUpperCase( Locale.ENGLISH );
+return match.getName().toUpperCase( Locale.ENGLISH );
+}
}
catch ( IOException e )
{
// nop
}
-finally
-{
-IOUtil.close( reader );
-IOUtil.close( is );
-}
-
-StringBuilder msg = new StringBuilder();
-msg.append( "Could not detect the encoding for file: " );
-msg.append( f.getAbsolutePath() );
-msg.append( "\n Specify explicitly the encoding." );
-throw new UnsupportedOperationException( msg.toString() );
+throw new UnsupportedOperationException( format( "Could not detect the
encoding for file: %s\n"
+
[maven-doxia-converter] branch code-coverage created (now 85fcfd9)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch code-coverage in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git. at 85fcfd9 Add Code Coverage - jacoco-maven-plugin This branch includes the following new commits: new ea2afd6 Minor code update, Java 7 and fix ide warning, formating new 85fcfd9 Add Code Coverage - jacoco-maven-plugin 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] branch checkstyle updated (dbee3c8 -> 541e6b8)
This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a change to branch checkstyle in repository https://gitbox.apache.org/repos/asf/maven-surefire.git. discard dbee3c8 [SUREFIRE-1706] Use the checkstyle in tests and se includeTestSourceDirectory=true discard 68b81cf [SUREFIRE-1706] Use the checkstyle in tests and se includeTestSourceDirectory=true add 8801286 [jenkinsfile] enabled H42 and jenkins-win-he-de-4 new 541e6b8 [SUREFIRE-1706] Use the checkstyle in tests and se includeTestSourceDirectory=true This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (dbee3c8) \ N -- N -- N refs/heads/checkstyle (541e6b8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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. Summary of changes: Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-surefire] branch master updated: [jenkinsfile] enabled H42 and jenkins-win-he-de-4
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 8801286 [jenkinsfile] enabled H42 and jenkins-win-he-de-4 8801286 is described below commit 880128607da4552cc438023a7802dd1800c5eca7 Author: tibordigana AuthorDate: Sat Nov 2 20:17:16 2019 +0100 [jenkinsfile] enabled H42 and jenkins-win-he-de-4 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 80048ff..de51324 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,7 @@ properties( ] ) -final def oses = ['linux':'ubuntu && !H42', 'windows':'Windows && !jenkins-win-he-de-4'] +final def oses = ['linux':'ubuntu', '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 = [14, 13, 11, 8, 7]
[maven-surefire] branch SUREFIRE-1705 deleted (was 80659dc)
This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a change to branch SUREFIRE-1705 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git. was 80659dc [SUREFIRE-1705] new config parameter Exclude Environment Variables The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[maven-surefire] branch master updated (254cce6 -> 80659dc)
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 254cce6 '--no-transfer-progress' for 3.6.1+ builds
add 80659dc [SUREFIRE-1705] new config parameter Exclude Environment
Variables
No new revisions were added by this update.
Summary of changes:
.../maven/plugin/failsafe/IntegrationTestMojo.java | 27 -
.../plugin/failsafe/IntegrationTestMojoTest.java | 2 +-
.../maven/plugin/failsafe/RunResultTest.java | 11 --
.../plugin/surefire/AbstractSurefireMojo.java | 15 +++
.../AbstractClasspathForkConfiguration.java| 3 +-
.../booterclient/ClasspathForkConfiguration.java | 6 +-
.../booterclient/DefaultForkConfiguration.java | 13 ++-
.../surefire/booterclient/ForkConfiguration.java | 1 +
.../booterclient/JarManifestForkConfiguration.java | 6 +-
.../ModularClasspathForkConfiguration.java | 3 +-
...eceiver.java => OutputStreamFlushReceiver.java} | 27 +++--
.../OutputStreamFlushableCommandline.java | 47 +---
.../AbstractSurefireMojoJava7PlusTest.java | 5 +
.../plugin/surefire/AbstractSurefireMojoTest.java | 50
.../maven/plugin/surefire/MojoMocklessTest.java| 5 +
.../booterclient/DefaultForkConfigurationTest.java | 34 +++---
.../booterclient/ForkConfigurationTest.java| 3 +-
.../ModularClasspathForkConfigurationTest.java | 7 +-
.../OutputStreamFlushableCommandlineTest.java | 129 +
.../maven/plugin/surefire/SurefirePlugin.java | 26 +
.../maven/plugin/surefire/SurefirePluginTest.java | 16 +++
.../maven/surefire/its/EnvironmentVariablesIT.java | 21 +++-
22 files changed, 385 insertions(+), 72 deletions(-)
copy
maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/{FlushReceiver.java
=> OutputStreamFlushReceiver.java} (64%)
create mode 100644
maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/OutputStreamFlushableCommandlineTest.java
[maven-surefire] branch checkstyle updated: [SUREFIRE-1706] Use the checkstyle in tests and se includeTestSourceDirectory=true
This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a commit to branch checkstyle in repository https://gitbox.apache.org/repos/asf/maven-surefire.git The following commit(s) were added to refs/heads/checkstyle by this push: new dbee3c8 [SUREFIRE-1706] Use the checkstyle in tests and se includeTestSourceDirectory=true dbee3c8 is described below commit dbee3c8832622f9f4a59c71738a331544868d9e1 Author: tibordigana AuthorDate: Sat Nov 2 20:03:38 2019 +0100 [SUREFIRE-1706] Use the checkstyle in tests and se includeTestSourceDirectory=true --- pom.xml| 7 +++ .../java/org/apache/maven/plugin/surefire/log/api/LoggersTest.java | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1cc826b..1acbc65 100644 --- a/pom.xml +++ b/pom.xml @@ -678,6 +678,13 @@ +org.apache.maven.plugins +maven-checkstyle-plugin + + true + + + org.jacoco jacoco-maven-plugin diff --git a/surefire-logger-api/src/test/java/org/apache/maven/plugin/surefire/log/api/LoggersTest.java b/surefire-logger-api/src/test/java/org/apache/maven/plugin/surefire/log/api/LoggersTest.java index 7de9148..192d209 100644 --- a/surefire-logger-api/src/test/java/org/apache/maven/plugin/surefire/log/api/LoggersTest.java +++ b/surefire-logger-api/src/test/java/org/apache/maven/plugin/surefire/log/api/LoggersTest.java @@ -21,8 +21,6 @@ package org.apache.maven.plugin.surefire.log.api; import org.junit.Test; import org.mockito.ArgumentCaptor; -import org.mockito.Mockito; -import org.mockito.internal.matchers.CapturesArguments; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -65,7 +63,7 @@ public class LoggersTest logger.error( e ); assertThat( outputStream.toString() ) .contains( "java.lang.Exception: exception" ) -.contains( "at " + getClass().getName() + ".testPrintStreamLogger(LoggersTest.java:63)" ); +.contains( "at " + getClass().getName() + ".testPrintStreamLogger(LoggersTest.java:61)" ); } @Test( expected = NullPointerException.class )
[maven-surefire] branch checkstyle created (now 68b81cf)
This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a change to branch checkstyle in repository https://gitbox.apache.org/repos/asf/maven-surefire.git. at 68b81cf [SUREFIRE-1706] Use the checkstyle in tests and se includeTestSourceDirectory=true This branch includes the following new commits: new 68b81cf [SUREFIRE-1706] Use the checkstyle in tests and se includeTestSourceDirectory=true 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-site-plugin] branch master updated: MSITE-851 make output jars reproducible like m-source-p
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 19be00a MSITE-851 make output jars reproducible like m-source-p
19be00a is described below
commit 19be00a9bf2a410abb7132487dc24055060b2c70
Author: Hervé Boutemy
AuthorDate: Sat Nov 2 18:11:54 2019 +0100
MSITE-851 make output jars reproducible like m-source-p
---
pom.xml | 8
src/it/projects/site-jar/pom.xml | 1 +
src/it/projects/site-jar/verify.bsh | 5 +
.../apache/maven/plugins/site/render/SiteJarMojo.java| 16 +++-
4 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 556df16..67efc68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
maven-site-plugin
- 3.8.3-SNAPSHOT
+ 3.9.0-SNAPSHOT
maven-plugin
Apache Maven Site Plugin
@@ -283,7 +283,7 @@ under the License.
org.apache.maven
maven-archiver
- 3.1.1
+ 3.5.0
@@ -302,7 +302,7 @@ under the License.
org.codehaus.plexus
plexus-archiver
- 3.4
+ 4.2.1
@@ -319,7 +319,7 @@ under the License.
org.codehaus.plexus
plexus-utils
- 3.0.24
+ 3.3.0
diff --git a/src/it/projects/site-jar/pom.xml b/src/it/projects/site-jar/pom.xml
index dcd739f..d76a8ea 100644
--- a/src/it/projects/site-jar/pom.xml
+++ b/src/it/projects/site-jar/pom.xml
@@ -34,6 +34,7 @@ under the License.
2.0.7
UTF-8
+
2019-11-02T17:48:12Z
diff --git a/src/it/projects/site-jar/verify.bsh
b/src/it/projects/site-jar/verify.bsh
index d28a242..c512531 100644
--- a/src/it/projects/site-jar/verify.bsh
+++ b/src/it/projects/site-jar/verify.bsh
@@ -50,6 +50,11 @@ try
while ( jarEntries.hasMoreElements() )
{
JarEntry entry = (JarEntry) jarEntries.nextElement();
+if ( entry.getTime() != 1572713292000L )
+{
+System.out.println( "wrong entry time for " + entry.getName() + ":
" + entry.getTime() );
+return false;
+}
if ( !entry.isDirectory() )
{
// Only compare files
diff --git
a/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java
b/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java
index 211eb6a..26be6d4 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/SiteJarMojo.java
@@ -116,6 +116,16 @@ public class SiteJarMojo
private String[] archiveExcludes;
/**
+ * Timestamp for reproducible output archive entries, either formatted as
ISO 8601
+ * -MM-dd'T'HH:mm:ssXXX or as an int representing seconds
since the epoch (like
+ * https://reproducible-builds.org/docs/source-date-epoch/;>SOURCE_DATE_EPOCH).
+ *
+ * @since 3.9.0
+ */
+@Parameter( defaultValue = "${project.build.outputTimestamp}" )
+private String outputTimestamp;
+
+/**
* @see org.apache.maven.plugin.Mojo#execute()
*/
public void execute()
@@ -179,14 +189,18 @@ public class SiteJarMojo
File siteJar = new File( jarOutputDirectory, jarFilename );
MavenArchiver archiver = new MavenArchiver();
+archiver.setCreatedBy( "Maven Site Plugin",
"org.apache.maven.plugins", "maven-site-plugin" );
archiver.setArchiver( this.jarArchiver );
archiver.setOutputFile( siteJar );
+// configure for Reproducible Builds based on outputTimestamp value
+archiver.configureReproducible( outputTimestamp );
+
if ( !siteDirectory.isDirectory() )
{
-getLog().warn( "JAR will be empty - no content was marked for
inclusion !" );
+getLog().warn( "JAR will be empty - no content was marked for
inclusion!" );
}
else
{
[maven-doxia-converter] branch xmlapi deleted (was 37f8657)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch xmlapi in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git. was 37f8657 Remove obsolete dependency to xml-api The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[maven-doxia-converter] branch master updated (7b8e6de -> 37f8657)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git. from 7b8e6de Fix checkstyle reported error (and improve code a bit) add 37f8657 Remove obsolete dependency to xml-api No new revisions were added by this update. Summary of changes: pom.xml | 5 - 1 file changed, 5 deletions(-)
svn commit: r1869298 [3/5] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/guides/introduction/introduction-to-archetypes.html == --- maven/website/content/guides/introduction/introduction-to-archetypes.html (original) +++ maven/website/content/guides/introduction/introduction-to-archetypes.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to Archetypes https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-archetypes.apt;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html == --- maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html (original) +++ maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -44,7 +44,7 @@ Karl Heinz Marbaise" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to the Dependency Mechanism https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-dependency-mechanism.apt;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html == --- maven/website/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html (original) +++ maven/website/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Optional Dependencies and Dependency Exclusions https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-optional-and-excludes-dependencies.apt;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-plugin-prefix-mapping.html == --- maven/website/content/guides/introduction/introduction-to-plugin-prefix-mapping.html (original) +++ maven/website/content/guides/introduction/introduction-to-plugin-prefix-mapping.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to Plugin Prefix Resolution https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-plugins.html == --- maven/website/content/guides/introduction/introduction-to-plugins.html (original) +++ maven/website/content/guides/introduction/introduction-to-plugins.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to Maven Plugin Development https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-plugins.apt;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-profiles.html == --- maven/website/content/guides/introduction/introduction-to-profiles.html (original) +++ maven/website/content/guides/introduction/introduction-to-profiles.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to build profiles https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-profiles.apt;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources
svn commit: r1869298 [4/5] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/mailing-lists.html == --- maven/website/content/mailing-lists.html (original) +++ maven/website/content/mailing-lists.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Project Mailing Lists -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/maven-1.x-eol.html == --- maven/website/content/maven-1.x-eol.html (original) +++ maven/website/content/maven-1.x-eol.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ End Of Life Apache Maven 1.x https://github.com/apache/maven-site/tree/master/content/markdown/maven-1.x-eol.md;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/maven-2.x-eol.html == --- maven/website/content/maven-2.x-eol.html (original) +++ maven/website/content/maven-2.x-eol.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -8,9 +8,7 @@ - - -Maven End Of Life of Maven 2.x +Maven End Of Life Apache Maven 2.x @@ -40,8 +38,8 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ -End Of Life of Maven 2.x https://github.com/apache/maven-site/tree/master/content/apt/maven-2.x-eol.apt;> -| Last Published: 2019-10-26 +End Of Life Apache Maven 2.x https://github.com/apache/maven-site/tree/master/content/markdown/maven-2.x-eol.md;> +| Last Published: 2019-11-02 | Get Sources Download @@ -122,351 +120,343 @@ - -End Of Life Apache Maven 2.x +End Of Life Apache Maven 2.x The Apache Maven Project Team would like to inform you that the Apache Maven 2.x has reached its end of life and is no longer supported. Apache Maven 2.x had its last release - version 2.2.1 - in November 2009. This means: + security vulnerability reports will not be checked against the 2.x branch -the 2.x download pages will be removed. +the 2.x download pages will be removed the latest 2.x release will be removed from the mirror system -the links to any 2.x specific documentation will be moved to https://maven.apache.org/archives/maven-2.x/ -List Of Last Plugins Versions Which Support Maven 2.x +the links to any 2.x specific documentation will be moved to https://maven.apache.org/archives/maven-2.x/;>Maven 2.x Archives + +List Of Last Plugins Versions Which Support Maven 2.x This list contains the list of plugins with the last version that supports Maven 2.x, which means if you have to use Maven 2, this list is the reference to the last version of plugins you can use. NOTE: If you find plugins which are not mentioned or issues please report on the users mailing list. - + + + + +Plugin +Type* +Version +Release Date +Description + + + +Core plugins +Plugins corresponding to default core phases (ie. clean, compile). They may have multiple goals as well -Plugin -Type* -Version -Release Date -Description - -Core plugins - - - -Plugins corresponding to default core phases (ie. clean, compile). They may have multiple goals as well. - - clean -B -2.6.1 -2014-10-26 -Clean up after the build. - - compiler -B -3.3 -2015-03-26 -Compiles Java sources. - - deploy -B -2.8.2 -2014-08-27 -Deploy the built artifact to the remote repository. - - failsafe -B -2.19.1 -2016-01-03 -Run the JUnit integration tests in an isolated classloader. - - install -B -2.5.2 -2014-08-27 -Install the built artifact into the local repository. - - resources -B -2.7 -2014-09-29 -Copy the resources to the output directory for including in the JAR. - - site -B -2.4 -2012-04-03 -Generate a site for the current project. - - surefire -B -2.19.1 -2016-01-03 -Run the JUnit unit tests in an isolated classloader. - - verifier -B -1.1 -2015-04-14 -Useful for integration tests - verifies the existence of certain conditions. - -Packaging types/tools - - - -These plugins relate to packaging respective artifact types. - - ear -B -2.10.1 -2015-06-27 -Generate an EAR from the current project. - - ejb -B -2.5.1 -2015-06-20 -Build an EJB (and optional client) from the current project. - - jar -B -2.6 -2015-03-09 -Build a JAR from the current project. - - rar -B -2.4 -2014-09-08 -Build a RAR from the current project. - - war -B -2.6 -2015-01-08 -Build a WAR from the current project. -
svn commit: r1869298 [1/5] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Author: svn-site-role Date: Sat Nov 2 16:14:04 2019 New Revision: 1869298 Log: Site checkin for project Apache Maven Site Modified: maven/website/content/about.html maven/website/content/aether.html maven/website/content/apache-resource-bundles/index.html maven/website/content/archives/maven-2.x/index.html maven/website/content/articles.html maven/website/content/background/history-of-maven.html maven/website/content/background/philosophy-of-maven.html maven/website/content/ci-management.html maven/website/content/code-quality-management.html maven/website/content/community.html maven/website/content/configure.html maven/website/content/continuous-integration.html maven/website/content/developers/committer-environment.html maven/website/content/developers/committer-settings.html maven/website/content/developers/conventions/code.html maven/website/content/developers/conventions/git.html maven/website/content/developers/conventions/jira.html maven/website/content/developers/dependency-policies.html maven/website/content/developers/index.html maven/website/content/developers/java6.html maven/website/content/developers/mojo-api-specification.html maven/website/content/developers/release/index.html maven/website/content/developers/release/maven-core-release.html maven/website/content/developers/release/maven-project-release-procedure.html maven/website/content/developers/release/parent-pom-release.html maven/website/content/developers/release/pmc-gpg-keys.html maven/website/content/developers/retirement-plan-plugins.html maven/website/content/developers/website/component-reference-documentation-helper.html maven/website/content/developers/website/deploy-component-reference-documentation.html maven/website/content/developers/website/deploy-maven-website.html maven/website/content/developers/website/index.html maven/website/content/developers/website/website-overview.html maven/website/content/developers/welcome-to-new-committers.html maven/website/content/docs-required.html maven/website/content/docs/2.0.1/release-notes.html maven/website/content/docs/2.0.10/release-notes.html maven/website/content/docs/2.0.11/release-notes.html maven/website/content/docs/2.0.2/release-notes.html maven/website/content/docs/2.0.3/release-notes.html maven/website/content/docs/2.0.4/release-notes.html maven/website/content/docs/2.0.5/release-notes.html maven/website/content/docs/2.0.6/release-notes.html maven/website/content/docs/2.0.7/release-notes.html maven/website/content/docs/2.0.8/release-notes.html maven/website/content/docs/2.0.9/release-notes.html maven/website/content/docs/2.0/release-notes.html maven/website/content/docs/2.1.0/release-notes.html maven/website/content/docs/2.2.0/release-notes.html maven/website/content/docs/2.2.1/release-notes.html maven/website/content/docs/3.0-alpha-3/release-notes.html maven/website/content/docs/3.0-alpha-4/release-notes.html maven/website/content/docs/3.0-alpha-5/release-notes.html maven/website/content/docs/3.0-alpha-6/release-notes.html maven/website/content/docs/3.0-alpha-7/release-notes.html maven/website/content/docs/3.0-beta-1/release-notes.html maven/website/content/docs/3.0-beta-2/release-notes.html maven/website/content/docs/3.0-beta-3/release-notes.html maven/website/content/docs/3.0.1/release-notes.html maven/website/content/docs/3.0.2/release-notes.html maven/website/content/docs/3.0.3/release-notes.html maven/website/content/docs/3.0.4/release-notes.html maven/website/content/docs/3.0.5/release-notes.html maven/website/content/docs/3.0/release-notes.html maven/website/content/docs/3.1.0-alpha-1/release-notes.html maven/website/content/docs/3.1.0/release-notes.html maven/website/content/docs/3.1.1/release-notes.html maven/website/content/docs/3.2.1/release-notes.html maven/website/content/docs/3.2.2/release-notes.html maven/website/content/docs/3.2.3/release-notes.html maven/website/content/docs/3.2.5/release-notes.html maven/website/content/docs/3.3.1/release-notes.html maven/website/content/docs/3.3.3/release-notes.html maven/website/content/docs/3.3.9/release-notes.html maven/website/content/docs/3.5.0-alpha-1/release-notes.html maven/website/content/docs/3.5.0-beta-1/release-notes.html maven/website/content/docs/3.5.0/release-notes.html maven/website/content/docs/3.5.2/release-notes.html maven/website/content/docs/3.5.3/release-notes.html maven/website/content/docs/3.5.4/release-notes.html maven/website/content/docs/3.6.0/release-notes.html maven/website/content/docs/3.6.1/release-notes.html maven/website/content/docs/3.6.2/release-notes.html maven/website/content/docs/history.html maven/website/content/download.html
svn commit: r1869298 [5/5] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/run-maven/index.html == --- maven/website/content/run-maven/index.html (original) +++ maven/website/content/run-maven/index.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Running Maven https://github.com/apache/maven-site/tree/master/content/apt/run-maven/index.apt;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/run.html == --- maven/website/content/run.html (original) +++ maven/website/content/run.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Running Apache Maven https://github.com/apache/maven-site/tree/master/content/markdown/run.md;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/scm.html == --- maven/website/content/scm.html (original) +++ maven/website/content/scm.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -40,7 +40,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Source Repository https://github.com/apache/maven-site/tree/master/content/xdoc/scm.xml;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/security-plexus-archiver.html == --- maven/website/content/security-plexus-archiver.html (original) +++ maven/website/content/security-plexus-archiver.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Zip Slip Vulnerability https://github.com/apache/maven-site/tree/master/content/markdown/security-plexus-archiver.md;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/security.html == --- maven/website/content/security.html (original) +++ maven/website/content/security.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Security Vulnerabilities https://github.com/apache/maven-site/tree/master/content/markdown/security.md;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/settings.html == --- maven/website/content/settings.html (original) +++ maven/website/content/settings.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Settings Reference https://github.com/apache/maven-site/tree/master/content/markdown/settings.md;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/shared/index.html == --- maven/website/content/shared/index.html (original) +++ maven/website/content/shared/index.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -43,7 +43,7 @@ Karl Heinz Marbaise" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Shared Components https://github.com/apache/maven-site/tree/master/content/apt/shared/index.apt;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/skins/index.html == --- maven/website/content/skins/index.html (original) +++ maven/website/content/skins/index.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -43,7 +43,7 @@ Michael Osipov" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Available Skins
svn commit: r1869298 [2/5] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/docs/2.2.1/release-notes.html == --- maven/website/content/docs/2.2.1/release-notes.html (original) +++ maven/website/content/docs/2.2.1/release-notes.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 2.2.1 https://github.com/apache/maven-site/tree/master/content/apt/docs/2.2.1/release-notes.apt.vm;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-3/release-notes.html == --- maven/website/content/docs/3.0-alpha-3/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-3/release-notes.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-3 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-3/release-notes.apt.vm;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-4/release-notes.html == --- maven/website/content/docs/3.0-alpha-4/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-4/release-notes.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-4 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-4/release-notes.apt.vm;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-5/release-notes.html == --- maven/website/content/docs/3.0-alpha-5/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-5/release-notes.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-5 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-5/release-notes.apt.vm;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-6/release-notes.html == --- maven/website/content/docs/3.0-alpha-6/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-6/release-notes.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-6 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-6/release-notes.apt.vm;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-7/release-notes.html == --- maven/website/content/docs/3.0-alpha-7/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-7/release-notes.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-7 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-7/release-notes.apt.vm;> -| Last Published: 2019-10-26 +| Last Published: 2019-11-02 | Get Sources Download Modified: maven/website/content/docs/3.0-beta-1/release-notes.html == --- maven/website/content/docs/3.0-beta-1/release-notes.html (original) +++ maven/website/content/docs/3.0-beta-1/release-notes.html Sat Nov 2 16:14:04 2019 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-beta-1 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-beta-1/release-notes.apt.vm;>
[maven-site] branch master updated: Convert to Markdown
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site.git
The following commit(s) were added to refs/heads/master by this push:
new f9def8c Convert to Markdown
f9def8c is described below
commit f9def8c88f34d6a95a71738994e5369e9b23f3d7
Author: Sylwester Lachiewicz
AuthorDate: Sat Nov 2 17:12:19 2019 +0100
Convert to Markdown
---
content/apt/maven-2.x-eol.apt | 177 --
content/markdown/maven-2.x-eol.md | 82 ++
2 files changed, 82 insertions(+), 177 deletions(-)
diff --git a/content/apt/maven-2.x-eol.apt b/content/apt/maven-2.x-eol.apt
deleted file mode 100644
index 9508b58..000
--- a/content/apt/maven-2.x-eol.apt
+++ /dev/null
@@ -1,177 +0,0 @@
- -
- End Of Life of Maven 2.x
- -
- Karl-Heinz Marbaise
- -
- 2015-03-03
- -
-
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ https://maven.apache.org/doxia/references/apt-format.html
-
-End Of Life Apache Maven 2.x
-
- The Apache Maven Project Team would like to inform you that the Apache
- Maven 2.x has reached its end of life and is no longer supported.
-
- Apache Maven 2.x had its last release - version 2.2.1 - in November
- 2009.
-
- This means:
-
- * security vulnerability reports will not be checked against the 2.x branch
-
- * the 2.x download pages will be removed.
-
- * the latest 2.x release will be removed from the mirror system
-
- * the links to any 2.x specific documentation will be moved to
-
{{{./archives/maven-2.x/index.html}https://maven.apache.org/archives/maven-2.x/}}
-
- []
-
-* List Of Last Plugins Versions Which Support Maven 2.x
-
-~~ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-~~ The release dates in this table must follow the ISO-8601 standard:
-MM-dd
-~~ See
https://maven.apache.org/guides/development/guide-documentation-style.html
-~~ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- This list contains the list of plugins with the last version that supports
Maven 2.x, which means
- if you have to use Maven 2, this list is the reference to the last version
of plugins you can use.
-
- NOTE: If you find plugins which are not mentioned or issues please report on
the users mailing list.
-
-*--++--++--+
-|| <> || <> ||
<> || <> || <>
-*--++--++--+
-| <> ||
|| <> |
-*--++--++--++
-| {{{/plugins/maven-clean-plugin/} <<>>}} | B |
{{{/plugins-archives/maven-clean-plugin-2.6.1/}<<2.6.1>>}}| 2014-10-26
| Clean up after the build.
-*--++--++--++
-| {{{/plugins/maven-compiler-plugin/} <<>>}} | B |
{{{/plugins-archives/maven-compiler-plugin-3.3/}<<3.3>>}} | 2015-03-26
| Compiles Java sources.
-*--++--++--++
-| {{{/plugins/maven-deploy-plugin/} <<>>}} | B |
{{{/plugins-archives/maven-deploy-plugin-2.8.2/}<<2.8.2>>}} | 2014-08-27
| Deploy the built artifact to the remote repository.
-*--++--++--++
-| {{{/surefire/maven-failsafe-plugin/} <<>>}}| B |
{{{/surefire-archives/surefire-2.19.1/maven-failsafe-plugin/}<<2.19.1>>}} |
2016-01-03 | Run the
[maven-doxia-converter] 01/01: Remove obsolete dependency to xml-api
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch xmlapi in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git commit 37f8657105d6104c346997d614ad1a34544ee3fe Author: Sylwester Lachiewicz AuthorDate: Sat Nov 2 15:17:48 2019 +0100 Remove obsolete dependency to xml-api --- pom.xml | 5 - 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index 528f919..3aea09f 100644 --- a/pom.xml +++ b/pom.xml @@ -152,11 +152,6 @@ under the License. icu4j 3.8 - - xml-apis - xml-apis - 1.3.04 -
[maven-doxia-converter] branch xmlapi created (now 37f8657)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch xmlapi in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git. at 37f8657 Remove obsolete dependency to xml-api This branch includes the following new commits: new 37f8657 Remove obsolete dependency to xml-api 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] branch MNG-6771 updated (16d1322 -> ac105ff)
This is an automated email from the ASF dual-hosted git repository. eolivelli pushed a change to branch MNG-6771 in repository https://gitbox.apache.org/repos/asf/maven.git. from 16d1322 MNG-6771 Fix license issues on binary distribution - Start fixing the template for LICENSE file - Have consistent naming for LICENSE file and final jars by removing 'classifier' from the name of jars - Introduce a script to check for license, from Apache BookKeeper project, original author iv...@apache.org add ac105ff Upgrade do SLF4j 1.7.29 that fixes license issue No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-dependency-plugin] branch MDEP-579 deleted (was 12384f7)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MDEP-579 in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git. was 12384f7 [MDEP-579] reactivate unittests This change permanently discards the following revisions: discard 12384f7 [MDEP-579] reactivate unittests discard 67718ad - Review changes, use random port for Jetty server. discard 21029c6 - Add mirrors, proxies and authentication for remote repositories, including Jetty test server.
[maven-dependency-plugin] branch dependabot/maven/jettyVersion-9.4.22.v20191022 created (now a777c1d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/jettyVersion-9.4.22.v20191022 in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git. at a777c1d Bump jettyVersion from 9.2.28.v20190418 to 9.4.22.v20191022 No new revisions were added by this update.
[maven-dependency-plugin] branch master updated: [MDEP-579] Regression: get goal does not pass server credentials to BasicRepositoryConnector
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new e897911 [MDEP-579] Regression: get goal does not pass server
credentials to BasicRepositoryConnector
e897911 is described below
commit e897911067c643ee891bfc2b05a85f8c7ca658d5
Author: Pim Moerenhout
AuthorDate: Sat Nov 2 11:54:20 2019 +0100
[MDEP-579] Regression: get goal does not pass server credentials to
BasicRepositoryConnector
---
pom.xml| 25 +
.../apache/maven/plugins/dependency/GetMojo.java | 17 +++-
.../maven/plugins/dependency/TestGetMojo.java | 101 -
src/test/resources/unit/get-test/realm.properties | 19
.../get-test/repository/test/test/1.0/test-1.0.jar | Bin 0 -> 2178 bytes
.../repository/test/test/1.0/test-1.0.jar.sha1 | 1 +
.../get-test/repository/test/test/1.0/test-1.0.pom | 34 +++
.../repository/test/test/1.0/test-1.0.pom.sha1 | 1 +
8 files changed, 191 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7c2d4e0..6f864f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,7 @@ under the License.
3.0
1.9
+9.2.28.v20190418
2.1
7
@@ -314,6 +315,25 @@ under the License.
provided
+
+ org.eclipse.jetty
+ jetty-server
+ ${jettyVersion}
+ test
+
+
+ org.eclipse.jetty
+ jetty-servlet
+ ${jettyVersion}
+ test
+
+
+ org.eclipse.jetty
+ jetty-webapp
+ ${jettyVersion}
+ test
+
+
@@ -334,6 +354,11 @@ under the License.
src/it/projects/tree-multimodule/module-a/expected.txt
src/it/projects/tree-multimodule/module-b/expected.txt
src/it/projects/tree-verbose/expected.txt
+
+
src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.jar.sha1
+
src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.pom.sha1
diff --git a/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
index d434e64..420c71b 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
@@ -41,6 +41,8 @@ import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.settings.Settings;
import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate;
import org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate;
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
@@ -71,8 +73,8 @@ public class GetMojo
private ArtifactResolver artifactResolver;
/**
-*
-*/
+ *
+ */
@Component
private DependencyResolver dependencyResolver;
@@ -85,6 +87,12 @@ public class GetMojo
@Component( role = ArtifactRepositoryLayout.class )
private Map repositoryLayouts;
+/**
+ * The repository system.
+ */
+@Component
+private RepositorySystem repositorySystem;
+
private DefaultDependableCoordinate coordinate = new
DefaultDependableCoordinate();
/**
@@ -214,6 +222,11 @@ public class GetMojo
ProjectBuildingRequest buildingRequest =
new DefaultProjectBuildingRequest(
session.getProjectBuildingRequest() );
+Settings settings = session.getSettings();
+repositorySystem.injectMirror( repoList, settings.getMirrors() );
+repositorySystem.injectProxy( repoList, settings.getProxies() );
+repositorySystem.injectAuthentication( repoList,
settings.getServers() );
+
buildingRequest.setRemoteRepositories( repoList );
if ( transitive )
diff --git a/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
b/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
index 32d602c..d1a94c9 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
@@ -20,13 +20,27 @@ package org.apache.maven.plugins.dependency;
*/
import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+import
[maven-install-plugin] 01/01: [MINSTALL-164] - Create GitHub Actions
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MINSTALL-164
in repository https://gitbox.apache.org/repos/asf/maven-install-plugin.git
commit 3b534ac27dc333f653efb75672c10156947160c7
Author: Karl Heinz Marbaise
AuthorDate: Sat Nov 2 11:32:39 2019 +0100
[MINSTALL-164] - Create GitHub Actions
---
.github/workflows/jdkbuilds.yml | 23
.github/workflows/main.yml | 59 +
2 files changed, 82 insertions(+)
diff --git a/.github/workflows/jdkbuilds.yml b/.github/workflows/jdkbuilds.yml
new file mode 100644
index 000..c9d54a1
--- /dev/null
+++ b/.github/workflows/jdkbuilds.yml
@@ -0,0 +1,23 @@
+name: JDKBuilds
+
+on:
+ push:
+branches:
+ - master
+ - 'releases/*'
+ pull_request:
+branches:
+ - '*'
+
+jobs:
+ openjdk:
+strategy:
+ matrix:
+jdk: [8-slim, 11-slim, 13, 14]
+name: "OpenJDK ${{ matrix.jdk }}"
+runs-on: ubuntu-latest
+container: "maven:3.6.2-jdk-${{ matrix.jdk }}"
+steps:
+ - uses: actions/checkout@master
+ - name: Test
+run: mvn -V --no-transfer-progress clean verify -Prun-its
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 000..72d8482
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,59 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+on:
+ push:
+branches:
+ - master
+ - 'releases/*'
+ pull_request:
+branches:
+ - '*'
+
+jobs:
+ linux:
+name: 'Linux'
+runs-on: ubuntu-latest
+container: "maven:3.6.2-jdk-8-slim"
+steps:
+ - uses: actions/checkout@master
+ - name: 'Test'
+run: mvn -V --no-transfer-progress clean verify -Prun-its
+
+ windows:
+name: 'Windows'
+runs-on: windows-latest
+steps:
+ - uses: actions/checkout@master
+ - name: 'Set up JDK 8'
+uses: actions/setup-java@v1
+with:
+ java-version: 8
+ - name: 'Test'
+shell: bash
+run: mvn -V --no-transfer-progress clean verify -Prun-its
+ mac:
+name: 'Mac OS'
+runs-on: macos-latest
+steps:
+ - uses: actions/checkout@master
+ - name: 'Set up JDK 8'
+uses: actions/setup-java@v1
+with:
+ java-version: 8
+ - name: 'Test'
+run: mvn -V --no-transfer-progress clean verify -Prun-its
[maven-install-plugin] branch MINSTALL-164 created (now 3b534ac)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MINSTALL-164 in repository https://gitbox.apache.org/repos/asf/maven-install-plugin.git. at 3b534ac [MINSTALL-164] - Create GitHub Actions This branch includes the following new commits: new 3b534ac [MINSTALL-164] - Create GitHub Actions 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-install-plugin] branch MINSTALL-162 updated (cdcb4ff -> 6d75ff3)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MINSTALL-162 in repository https://gitbox.apache.org/repos/asf/maven-install-plugin.git. discard cdcb4ff [MINSTALL-162] - Add GitHub Information add 9490dbf [MINSTALL-153] - Remove the updateReleaseInfo parameter's leftovers new 6d75ff3 [MINSTALL-162] - Add GitHub Information This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (cdcb4ff) \ N -- N -- N refs/heads/MINSTALL-162 (6d75ff3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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. Summary of changes: CONTRIBUTING.md | 2 +- src/site/apt/examples/update-release-info.apt | 42 --- src/site/site.xml | 1 - 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 src/site/apt/examples/update-release-info.apt
[maven-install-plugin] 01/01: [MINSTALL-162] - Add GitHub Information
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MINSTALL-162 in repository https://gitbox.apache.org/repos/asf/maven-install-plugin.git commit 6d75ff372b575b3d5aacbcf9829b68128ae2aee1 Author: Karl Heinz Marbaise AuthorDate: Sat Oct 19 14:45:17 2019 +0200 [MINSTALL-162] - Add GitHub Information --- .github/pull_request_template.md | 29 CONTRIBUTING.md | 91 README.md| 99 3 files changed, 219 insertions(+) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 000..c41d1c4 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,29 @@ +Following this checklist to help us incorporate your +contribution quickly and easily: + + - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/MINSTALL) filed + for the change (usually before you start working on it). Trivial changes like typos do not + require a JIRA issue. Your pull request should address just this issue, without + pulling in other changes. + - [ ] Each commit in the pull request should have a meaningful subject line and body. + - [ ] Format the pull request title like `[MINSTALL-XXX] - Fixes bug in ApproximateQuantiles`, + where you replace `MPH-XXX` with the appropriate JIRA issue. Best practice + is to use the JIRA issue title in the pull request title and in the first line of the + commit message. + - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. + - [ ] Run `mvn clean verify` to make sure basic checks pass. A more thorough check will + be performed on your pull request automatically. + - [ ] You have run the integration tests successfully (`mvn -Prun-its clean verify`). + +If your pull request is about ~20 lines of code you don't need to sign an +[Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf) if you are unsure +please ask on the developers list. + +To make clear that you license your contribution under +the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0) +you have to acknowledge this by using the following check-box. + + - [ ] I hereby declare this contribution to be licenced under the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0) + + - [ ] In any other case, please file an [Apache Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). + diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000..15aab40 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,91 @@ + +Contributing to Apache Maven Install Plugin +== + +You have found a bug or you have an idea for a cool new feature? Contributing +code is a great way to give something back to the open source community. Before +you dig right into the code, there are a few guidelines that we need +contributors to follow so that we can have a chance of keeping on top of +things. + +Some of the ideas are documented in the [Maven Wiki][maven-wiki] +which might be interesting to read and for further discussion. + +Getting Started +--- + ++ Make sure you have a [JIRA account](https://issues.apache.org/jira/). ++ Make sure you have a [GitHub account](https://github.com/signup/free). ++ If you're planning to implement a new feature, it makes sense to discuss your changes + on the [dev list](https://maven.apache.org/mail-lists.html) first. + This way you can make sure you're not wasting your time on something that isn't + considered to be in Apache Maven's scope. ++ Submit a ticket for your issue, assuming one does not already exist. + + Clearly describe the issue, including steps to reproduce when it is a bug. + + Make sure you fill in the earliest version that you know has the issue. ++ Fork the repository on GitHub. + +Making and Submitting Changes +-- + +We accept Pull Requests via GitHub. The [developer mailing list][dev-ml-list] is the +main channel of communication for contributors. +There are some guidelines which will make applying PRs easier for us: ++ Create a topic branch from where you want to base your work (this is usually the master branch). + Push your changes to a topic branch in your fork of the repository. ++ Make commits of logical units. ++ Respect the original code style: by using the same [codestyle][code-style], + patches should only highlight the actual difference, not being disturbed by any formatting issues: + + Only use spaces for indentation. + + Create minimal diffs - disable on save actions like reformat source code or organize imports. +If you feel the source code should be reformatted, create a separate PR for this change. + + Check
[maven-install-plugin] branch MINSTALL-153 deleted (was 9490dbf)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MINSTALL-153 in repository https://gitbox.apache.org/repos/asf/maven-install-plugin.git. was 9490dbf [MINSTALL-153] - Remove the updateReleaseInfo parameter's leftovers The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[maven-install-plugin] branch master updated (1fffad7 -> 9490dbf)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-install-plugin.git. from 1fffad7 Fix typo in InstallMojo.java add 9490dbf [MINSTALL-153] - Remove the updateReleaseInfo parameter's leftovers No new revisions were added by this update. Summary of changes: src/site/apt/examples/update-release-info.apt | 42 --- src/site/site.xml | 1 - 2 files changed, 43 deletions(-) delete mode 100644 src/site/apt/examples/update-release-info.apt
[maven-compiler-plugin] 01/01: [MCOMPILER-320] Introduce additionalClasspathElements property
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch MCOMPILER-320
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git
commit 3b320687a4220f45654629f4416d926eccbd8088
Author: David M. Lloyd
AuthorDate: Wed Jan 17 12:04:04 2018 -0600
[MCOMPILER-320] Introduce additionalClasspathElements property
---
.../apache/maven/plugin/compiler/CompilerMojo.java | 17 +++--
.../maven/plugin/compiler/TestCompilerMojo.java| 29 +++---
2 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
index 78d3908..0f46c07 100644
--- a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
+++ b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
@@ -124,6 +124,14 @@ public class CompilerMojo
@Parameter
private boolean multiReleaseOutput;
+/**
+ * A list of additional filesystem paths to include on the compile class
path beyond the resolved dependency
+ * set. This is useful in conjunction with the dependency plugin for
cases where there are items that must not
+ * be included in other phases of the build, but are nevertheless required
during compilation.
+ */
+@Parameter
+private List additionalClasspathElements = new ArrayList<>();
+
@Component
private LocationManager locationManager;
@@ -275,7 +283,9 @@ public class CompilerMojo
}
}
}
-
+
+classpathElements.addAll( additionalClasspathElements );
+
for ( File file :
resolvePathsResult.getModulepathElements().keySet() )
{
modulepathElements.add( file.getPath() );
@@ -292,7 +302,10 @@ public class CompilerMojo
}
else
{
-classpathElements = compilePath;
+List list = new ArrayList<>( compilePath.size() +
additionalClasspathElements.size() );
+list.addAll( compilePath );
+list.addAll( additionalClasspathElements );
+classpathElements = list;
modulepathElements = Collections.emptyList();
}
}
diff --git
a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
index 5b0518b..16cf038 100644
--- a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
+++ b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
@@ -163,6 +163,14 @@ public class TestCompilerMojo
@Component
private LocationManager locationManager;
+/**
+ * A list of additional filesystem paths to include on the compile class
path beyond the resolved dependency
+ * set. This is useful in conjunction with the dependency plugin for
cases where there are items that must not
+ * be included in other phases of the build, but are nevertheless required
during compilation.
+ */
+@Parameter
+private List additionalClasspathElements = new ArrayList<>();
+
private Map pathElements;
private Collection classpathElements;
@@ -306,7 +314,10 @@ public class TestCompilerMojo
{
pathElements = Collections.emptyMap();
modulepathElements = Collections.emptyList();
-classpathElements = testPath;
+List list = new ArrayList<>( testPath.size() +
additionalClasspathElements.size() );
+list.addAll( testPath );
+list.addAll( additionalClasspathElements );
+classpathElements = list;
return;
}
}
@@ -314,14 +325,17 @@ public class TestCompilerMojo
{
pathElements = Collections.emptyMap();
modulepathElements = Collections.emptyList();
-classpathElements = testPath;
+List list = new ArrayList<>( testPath.size() +
additionalClasspathElements.size() );
+list.addAll( testPath );
+list.addAll( additionalClasspathElements );
+classpathElements = list;
return;
}
if ( testModuleDescriptor != null )
{
modulepathElements = testPath;
-classpathElements = Collections.emptyList();
+classpathElements = new ArrayList<>( additionalClasspathElements );
if ( mainModuleDescriptor != null )
{
@@ -392,6 +406,10 @@ public class TestCompilerMojo
{
patchModuleValue.append( root ).append( PS );
}
+for ( String item : additionalClasspathElements )
+{
+patchModuleValue.append( item ).append( PS );
+}
[maven-compiler-plugin] branch MCOMPILER-320 updated (0b52a5d -> 3b32068)
This is an automated email from the ASF dual-hosted git repository. eolivelli pushed a change to branch MCOMPILER-320 in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git. discard 0b52a5d [MCOMPILER-320] Allow additional class path items to be given during compilation Use multiReleaseOutput, which seems sufficient. No need for additionalClasspathElements discard aebe4d1 [MCOMPILER-323] Support multi-release jars discard c8f439b [MCOMPILER-320] Move Java 10 config to specific profile discard 6b7cdda [MCOMPILER-320] cleanup unused setup_x discard fce7d90 [MCOMPILER-320] Show cases where failures occur discard ed60147 [MCOMPILER-320] Allow additional class path items to be given during compilation add 82d86c8 [MCOMPILER-323] Support multi-release jars add 1b34392 [MCOMPILER-323] Improve documentation add 348c90d [MCOMPILER-335] Update default source/target Change source/target defaults to 1.6, so you can compile with Java 9 & 10 without settings these values. Print a warning when target or release isn't set. add f86c20a Change version to 3.8.0-SNAPSHOT add 74e9f27 Fix singleproject-toolchains add 5a9a03c [MCOMPILER-332] - Java 10 not supported o Fix MCOMPILER-332 integration test folder name add 0399519 [MCOMPILER-350] - Add GitHub Documentation add 0602751 Fixed relativePath Bump to version 3.7.1-SNAPSHOT add 854a480 [MCOMPILER-351] - Upgrade maven-plugins parent to version 32 add 0076b37 [MCOMPILER-352] - Upgrade maven-shared-utils to 3.2.1 add 4f495db [MCOMPILER-353] - Upgrade plexus-compiler to 2.8.4 add 5eea113 [maven-release-plugin] prepare release maven-compiler-plugin-3.7.1 add 5d12115 [maven-release-plugin] prepare for next development iteration add f7a1899 Revert "[maven-release-plugin] prepare for next development iteration" * Failure during release. add b696442 Revert "[maven-release-plugin] prepare release maven-compiler-plugin-3.7.1" o Failure during release. add ab435ca [maven-release-plugin] prepare release maven-compiler-plugin-3.7.1 add e6079a2 [maven-release-plugin] prepare for next development iteration add f4878b9 Bumping the version number based on the changes. add d85ad7d [maven-release-plugin] prepare release maven-compiler-plugin-3.8.0 add d350bb4 [maven-release-plugin] prepare for next development iteration add 2ba3f26 [MCOMPILER-322] Set the JPMS module version add 9c00842 [MCOMPILER-349] - changed dependency detection. Default fileExtensions contained '.class', while FileUtils#getExtension( method used in AbstractCompilerMojo#hasNewFile returns file extension without '.' (e.g. 'class') add 678360d [MCOMPILER-349] - changed dependency detection. add f085331 [MNGSITE-341] use https for sigs, hashes and KEYS add 429e1bf [MPOM-205] use sha512 checksums instead of sha1 add e1446cc upgraded parent POM from 32 to 33 add e637279 [MCOMPILER-360] nullpointer exception add 8a6b4cf [MCOMPILER-360] NPE when calculating modulepath with invalid entries add 38c9208 Disable error-prone-compiler for Java 11 (for now, can't be fixed here) add 00f8ee7 [MCOMPILER-306] Fix `compilerArgs` example usage (#9) add 98895a8 fix typo add 782112f get rid of @version $ we are now using git :) add 8759478 use some 1.7 sugar syntax add d8bfa28 Make unit/integration tests Java 12 compatible add 3d6b27c [MCOMPILER 366] - Warning about automodules should provide the list of offending libraries - Collected filename based automodules detected and added to the log message. - Updated unit tests accordingly. - Added new integration test with 2 modules. - Make unit/integration tests Java 12 compatible add e09eb57 [maven-release-plugin] prepare release maven-compiler-plugin-3.8.1 add 6c576ab [maven-release-plugin] prepare for next development iteration add a5c6bc5 (doc) Fixed broken links to scm, issue tracker, and mailing list page. (#15) add 6fd3a46 [MCOMPILER-379] - Fatal error compiling: basedir ... arget/generated-sources/annotations does not exist - Created Integration test which currently fails. add 114487b Revert "[maven-release-plugin] prepare for next development iteration" add 4f37195 Revert "[maven-release-plugin] prepare release maven-compiler-plugin-3.8.1" add 0747073 [maven-release-plugin] prepare release maven-compiler-plugin-3.8.1 add d94a573 Revert "[maven-release-plugin] prepare release maven-compiler-plugin-3.8.1" add 1b206fe [maven-release-plugin] prepare release maven-compiler-plugin-3.8.1 add 6873a7b [maven-release-plugin] prepare for next development iteration add 62438bb Fix typos add 997206f MCOMPILER-383: Use Java7 type inference more add c8019dd MCOMPILER-384: Stop checking for null before instanceof add 3596083 MCOMPILER-385:
[maven] 01/01: [MNG-6399] - Lift JDK minimum to JDK 8
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MNG-6399 in repository https://gitbox.apache.org/repos/asf/maven.git commit 106d79e32fb0c04eae9da55737c52b9b66b3e8ca Author: Karl Heinz Marbaise AuthorDate: Sat Nov 2 10:27:41 2019 +0100 [MNG-6399] - Lift JDK minimum to JDK 8 --- Jenkinsfile | 2 +- pom.xml | 8 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5d5d998..2d9183e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,7 @@ def buildOs = 'linux' def buildJdk = '8' def buildMvn = '3.6.0' def runITsOses = ['linux', 'windows'] -def runITsJdks = ['7', '8', '11','12'] +def runITsJdks = ['8', '11','12', '13'] def runITsMvn = '3.6.0' def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true def tests diff --git a/pom.xml b/pom.xml index c7ac485..e53a463 100644 --- a/pom.xml +++ b/pom.xml @@ -47,8 +47,8 @@ under the License. 3.0.5 -1.7 -1.7 +1.8 +1.8 2.6.0 1.4 3.8.1 @@ -579,11 +579,11 @@ under the License. org.codehaus.mojo animal-sniffer-maven-plugin -1.17 +1.18 org.codehaus.mojo.signature -java17 +java18 1.0
[maven] branch MNG-6399 updated (10bae6c -> 106d79e)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MNG-6399 in repository https://gitbox.apache.org/repos/asf/maven.git. discard 10bae6c [MNG-6399] - Lift JDK minimum to JDK 8 new 106d79e [MNG-6399] - Lift JDK minimum to JDK 8 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (10bae6c) \ N -- N -- N refs/heads/MNG-6399 (106d79e) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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. Summary of changes: Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven] branch MAVEN-3.6/MNG-6399 deleted (was a32160d)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MAVEN-3.6/MNG-6399 in repository https://gitbox.apache.org/repos/asf/maven.git. was a32160d [MNG-3699] - Lift JDK minimum to JDK 8 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[maven] 01/01: [MNG-6399] - Lift JDK minimum to JDK 8
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MNG-6399 in repository https://gitbox.apache.org/repos/asf/maven.git commit 10bae6c521e7d7e760d9a0c2e2e70a4858f5b9c8 Author: Karl Heinz Marbaise AuthorDate: Sat Nov 2 10:27:41 2019 +0100 [MNG-6399] - Lift JDK minimum to JDK 8 --- pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c7ac485..e53a463 100644 --- a/pom.xml +++ b/pom.xml @@ -47,8 +47,8 @@ under the License. 3.0.5 -1.7 -1.7 +1.8 +1.8 2.6.0 1.4 3.8.1 @@ -579,11 +579,11 @@ under the License. org.codehaus.mojo animal-sniffer-maven-plugin -1.17 +1.18 org.codehaus.mojo.signature -java17 +java18 1.0
[maven] branch MNG-6399 created (now 10bae6c)
This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MNG-6399 in repository https://gitbox.apache.org/repos/asf/maven.git. at 10bae6c [MNG-6399] - Lift JDK minimum to JDK 8 This branch includes the following new commits: new 10bae6c [MNG-6399] - Lift JDK minimum to JDK 8 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.
