[maven-release] branch dependabot/maven/org.apache.maven-maven-parent-36 created (now 25d09241)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven-maven-parent-36 in repository https://gitbox.apache.org/repos/asf/maven-release.git at 25d09241 Bump maven-parent from 34 to 36 No new revisions were added by this update.
[maven-release] branch dependabot/maven/org.sonatype.plexus-plexus-sec-dispatcher-1.4 created (now 9c5404fd)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.sonatype.plexus-plexus-sec-dispatcher-1.4 in repository https://gitbox.apache.org/repos/asf/maven-release.git at 9c5404fd Bump plexus-sec-dispatcher from 1.3 to 1.4 No new revisions were added by this update.
[maven-release] branch dependabot/maven/org.mockito-mockito-core-4.5.1 created (now 594152cc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.mockito-mockito-core-4.5.1 in repository https://gitbox.apache.org/repos/asf/maven-release.git at 594152cc Bump mockito-core from 2.28.2 to 4.5.1 No new revisions were added by this update.
[maven-release] branch master updated: [MRELEASE-1022] Use versions defined in `release.properties` when doing `release:prepare` (#111)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-release.git The following commit(s) were added to refs/heads/master by this push: new eb2ac920 [MRELEASE-1022] Use versions defined in `release.properties` when doing `release:prepare` (#111) eb2ac920 is described below commit eb2ac920b34a86555a17428d3fea1088bb2da29f Author: Samuel Le Berrigaud AuthorDate: Tue Apr 26 03:49:45 2022 +0200 [MRELEASE-1022] Use versions defined in `release.properties` when doing `release:prepare` (#111) this also works with version passed as arguments on the command line. --- .../shared/release/phase/MapVersionsPhase.java | 53 --- .../shared/release/phase/MapVersionsPhaseTest.java | 102 - 2 files changed, 139 insertions(+), 16 deletions(-) diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java index 3d405ebc..a04f027d 100644 --- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java +++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java @@ -93,6 +93,10 @@ public class MapVersionsPhase */ private Map versionPolicies; +void setConvertToSnapshot( boolean convertToSnapshot ) +{ +this.convertToSnapshot = convertToSnapshot; +} void setPrompter( Prompter prompter ) { this.prompter = prompter; @@ -138,8 +142,13 @@ public class MapVersionsPhase if ( convertToSnapshot ) { +String subProjectNextVersion = releaseDescriptor.getProjectDevelopmentVersion( subProjectId ); String v; -if ( ArtifactUtils.isSnapshot( subProject.getVersion() ) ) +if ( subProjectNextVersion != null ) +{ +v = subProjectNextVersion; +} +else if ( ArtifactUtils.isSnapshot( subProject.getVersion() ) ) { v = nextVersion; } @@ -159,7 +168,15 @@ public class MapVersionsPhase } else { -releaseDescriptor.addReleaseVersion( subProjectId, nextVersion ); +String subProjectNextVersion = releaseDescriptor.getProjectReleaseVersion( subProjectId ); +if ( subProjectNextVersion != null ) +{ +releaseDescriptor.addReleaseVersion( subProjectId, subProjectNextVersion ); +} +else +{ +releaseDescriptor.addReleaseVersion( subProjectId, nextVersion ); +} } } } @@ -332,22 +349,36 @@ public class MapVersionsPhase private String getDevelopmentVersion( String projectId, ReleaseDescriptor releaseDescriptor ) { -String defaultVersion = releaseDescriptor.getDefaultDevelopmentVersion(); -if ( StringUtils.isEmpty( defaultVersion ) ) +String projectVersion = releaseDescriptor.getProjectDevelopmentVersion( projectId ); + +if ( StringUtils.isEmpty( projectVersion ) ) { -defaultVersion = releaseDescriptor.getProjectDevelopmentVersion( projectId ); +projectVersion = releaseDescriptor.getDefaultDevelopmentVersion(); } -return defaultVersion; + +if ( StringUtils.isEmpty( projectVersion ) ) +{ +return null; +} + +return projectVersion; } private String getReleaseVersion( String projectId, ReleaseDescriptor releaseDescriptor ) { -String nextVersion = releaseDescriptor.getDefaultReleaseVersion(); -if ( StringUtils.isEmpty( nextVersion ) ) +String projectVersion = releaseDescriptor.getProjectReleaseVersion( projectId ); + +if ( StringUtils.isEmpty( projectVersion ) ) { -nextVersion = releaseDescriptor.getProjectReleaseVersion( projectId ); +projectVersion = releaseDescriptor.getDefaultReleaseVersion(); } -return nextVersion; + +if ( StringUtils.isEmpty( projectVersion ) ) +{ +return null; +} + +return projectVersion; } @@ -387,7 +418,7 @@ public class MapVersionsPhase return result; } - + private ResourceBundle getResourceBundle( Locale locale ) { return ResourceBundle.getBundle( "release-messages", locale, MapVersionsPhase.class.getClassLoader() ); diff --git
[maven-dependency-tree] branch master updated: Bump maven-project-info-reports-plugin from 3.1.2 to 3.2.2
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-dependency-tree.git The following commit(s) were added to refs/heads/master by this push: new df56085 Bump maven-project-info-reports-plugin from 3.1.2 to 3.2.2 df56085 is described below commit df560858b249f5a3803aaf1b4e4cfcaa5d5634d0 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Feb 28 22:57:14 2022 + Bump maven-project-info-reports-plugin from 3.1.2 to 3.2.2 Bumps [maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.1.2 to 3.2.2. - [Release notes](https://github.com/apache/maven-project-info-reports-plugin/releases) - [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.1.2...maven-project-info-reports-plugin-3.2.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-project-info-reports-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 56c4991..5f5042c 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ maven-project-info-reports-plugin - 3.1.2 + 3.2.2 maven-site-plugin
svn commit: r1900282 [3/4] - 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/development/guide-plugin-documentation.html == --- maven/website/content/guides/development/guide-plugin-documentation.html (original) +++ maven/website/content/guides/development/guide-plugin-documentation.html Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -47,7 +47,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to the Plugin Documentation Standard https://github.com/apache/maven-site/tree/master/content/apt/guides/development/guide-plugin-documentation.apt;> -| Last Published: 2022-04-23 +| Last Published: 2022-04-25 | Get Sources Download Modified: maven/website/content/guides/development/guide-testing-development-plugins.html == --- maven/website/content/guides/development/guide-testing-development-plugins.html (original) +++ maven/website/content/guides/development/guide-testing-development-plugins.html Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -47,7 +47,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Testing Development Versions of Plugins https://github.com/apache/maven-site/tree/master/content/apt/guides/development/guide-testing-development-plugins.apt;> -| Last Published: 2022-04-23 +| Last Published: 2022-04-25 | Get Sources Download Modified: maven/website/content/guides/development/guide-testing-releases.html == --- maven/website/content/guides/development/guide-testing-releases.html (original) +++ maven/website/content/guides/development/guide-testing-releases.html Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -47,7 +47,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Testing Staged Releases https://github.com/apache/maven-site/tree/master/content/apt/guides/development/guide-testing-releases.apt;> -| Last Published: 2022-04-23 +| Last Published: 2022-04-25 | Get Sources Download Modified: maven/website/content/guides/getting-started/index.html == --- maven/website/content/guides/getting-started/index.html (original) +++ maven/website/content/guides/getting-started/index.html Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -48,7 +48,7 @@ Vincent Siveton" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven Getting Started Guide https://github.com/apache/maven-site/tree/master/content/apt/guides/getting-started/index.apt;> -| Last Published: 2022-04-23 +| Last Published: 2022-04-25 | Get Sources Download Modified: maven/website/content/guides/getting-started/maven-in-five-minutes.html == --- maven/website/content/guides/getting-started/maven-in-five-minutes.html (original) +++ maven/website/content/guides/getting-started/maven-in-five-minutes.html Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -47,7 +47,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven in 5 Minutes https://github.com/apache/maven-site/tree/master/content/apt/guides/getting-started/maven-in-five-minutes.apt;> -| Last Published: 2022-04-23 +| Last Published: 2022-04-25 | Get Sources Download Modified: maven/website/content/guides/getting-started/windows-prerequisites.html == --- maven/website/content/guides/getting-started/windows-prerequisites.html (original) +++ maven/website/content/guides/getting-started/windows-prerequisites.html Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -47,7 +47,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven on Windows https://github.com/apache/maven-site/tree/master/content/apt/guides/getting-started/windows-prerequisites.apt;> -| Last Published: 2022-04-23 +| Last Published: 2022-04-25 | Get Sources Download Modified: maven/website/content/guides/index.html == --- maven/website/content/guides/index.html (original) +++ maven/website/content/guides/index.html Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@
svn commit: r1900282 [2/4] - 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 Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -47,7 +47,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: 2022-04-23 +| Last Published: 2022-04-25 | 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 Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -47,7 +47,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: 2022-04-23 +| Last Published: 2022-04-25 | 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 Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -47,7 +47,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: 2022-04-23 +| Last Published: 2022-04-25 | 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 Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -47,7 +47,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: 2022-04-23 +| Last Published: 2022-04-25 | 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 Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -47,7 +47,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: 2022-04-23 +| Last Published: 2022-04-25 | 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 Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -47,7 +47,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: 2022-04-23 +| Last Published: 2022-04-25 | 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 Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -47,7 +47,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;>
svn commit: r1900282 [1/4] - 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: Mon Apr 25 22:27:30 2022 New Revision: 1900282 Log: Site checkin for project Apache Maven Site Modified: maven/website/content/about.html maven/website/content/aether.html maven/website/content/apache-maven.pdf maven/website/content/apache-resource-bundles/index.html maven/website/content/archives/maven-2.x/index.html maven/website/content/archives/maven-2.x/maven-2.1-architectural-goals.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/developers/committer-environment.html maven/website/content/developers/committer-settings.html maven/website/content/developers/compatibility-plan.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/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/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/3.6.3/release-notes.html
svn commit: r1900282 [4/4] - 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/mini/guide-using-toolchains.html == --- maven/website/content/guides/mini/guide-using-toolchains.html (original) +++ maven/website/content/guides/mini/guide-using-toolchains.html Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -49,7 +49,7 @@ Karl Heinz Marbaise" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Using Toolchains https://github.com/apache/maven-site/tree/master/content/apt/guides/mini/guide-using-toolchains.apt;> -| Last Published: 2022-04-23 +| Last Published: 2022-04-25 | Get Sources Download Modified: maven/website/content/guides/mini/guide-wagon-providers.html == --- maven/website/content/guides/mini/guide-wagon-providers.html (original) +++ maven/website/content/guides/mini/guide-wagon-providers.html Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -47,7 +47,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Selecting Alternative Wagon Providers https://github.com/apache/maven-site/tree/master/content/apt/guides/mini/guide-wagon-providers.apt;> -| Last Published: 2022-04-23 +| Last Published: 2022-04-25 | Get Sources Download Modified: maven/website/content/guides/mini/index.html == --- maven/website/content/guides/mini/index.html (original) +++ maven/website/content/guides/mini/index.html Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -47,7 +47,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven Mini Guides https://github.com/apache/maven-site/tree/master/content/apt/guides/mini/index.apt.vm;> -| Last Published: 2022-04-23 +| Last Published: 2022-04-25 | Get Sources Download Modified: maven/website/content/guides/plugin/guide-java-plugin-development.html == --- maven/website/content/guides/plugin/guide-java-plugin-development.html (original) +++ maven/website/content/guides/plugin/guide-java-plugin-development.html Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -49,7 +49,7 @@ Olivier Lamy" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Developing Java Plugins https://github.com/apache/maven-site/tree/master/content/apt/guides/plugin/guide-java-plugin-development.apt;> -| Last Published: 2022-04-23 +| Last Published: 2022-04-25 | Get Sources Download Modified: maven/website/content/guides/plugin/guide-java-report-plugin-development.html == --- maven/website/content/guides/plugin/guide-java-report-plugin-development.html (original) +++ maven/website/content/guides/plugin/guide-java-report-plugin-development.html Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -48,7 +48,7 @@ Bertrand Martin" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Developing Java Report Plugins https://github.com/apache/maven-site/tree/master/content/apt/guides/plugin/guide-java-report-plugin-development.apt;> -| Last Published: 2022-04-23 +| Last Published: 2022-04-25 | Get Sources Download Modified: maven/website/content/ide.html == --- maven/website/content/ide.html (original) +++ maven/website/content/ide.html Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -45,7 +45,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Apache Maven IDE Integration https://github.com/apache/maven-site/tree/master/content/markdown/ide.md;> -| Last Published: 2022-04-23 +| Last Published: 2022-04-25 | Get Sources Download Modified: maven/website/content/index.html == --- maven/website/content/index.html (original) +++ maven/website/content/index.html Mon Apr 25 22:27:30 2022 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -48,7 +48,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Welcome to Apache Maven https://github.com/apache/maven-site/tree/master/content/xdoc/index.xml.vm;> -| Last Published:
[maven-dependency-tree] branch dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.4.0 created (now 6bfaf6c)
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-javadoc-plugin-3.4.0 in repository https://gitbox.apache.org/repos/asf/maven-dependency-tree.git at 6bfaf6c Bump maven-javadoc-plugin from 3.3.1 to 3.4.0 No new revisions were added by this update.
[maven-site] branch master updated: maven-reporting-impl 4.0.0-M1 released
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 f5810ca4 maven-reporting-impl 4.0.0-M1 released f5810ca4 is described below commit f5810ca4fb67a3d3aaad2b6f469cc581c395516e Author: Sylwester Lachiewicz AuthorDate: Tue Apr 26 00:26:31 2022 +0200 maven-reporting-impl 4.0.0-M1 released --- content/apt/shared/index.apt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/apt/shared/index.apt b/content/apt/shared/index.apt index 5dbc7241..f96b0f76 100644 --- a/content/apt/shared/index.apt +++ b/content/apt/shared/index.apt @@ -61,7 +61,7 @@ Shared Components *+--+---+--++-+ | {{{/shared/maven-reporting-exec/} <<>>}} | 1.6.0| 2022-02-10| API to manage report plugins preparation with Maven 3. | {{{https://gitbox.apache.org/repos/asf/maven-reporting-exec.git}Git}} / {{{https://github.com/apache/maven-reporting-exec/}GitHub}} | {{{https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status != Closed AND component = maven-reporting-exec}JIRA}} *+--+---+--++-+ -| {{{/shared/maven-reporting-impl/} <<>>}} | 3.1.0| 2022-02-05| Abstract classes to manage report generation. | {{{https://gitbox.apache.org/repos/asf/maven-reporting-impl.git}Git}} / {{{https://github.com/apache/maven-reporting-impl/}GitHub}} | {{{https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status != Closed AND component = maven-reporting-impl}JIRA}} +| {{{/shared/maven-reporting-impl/} <<>>}} | 4.0.0-M1 | 2022-04-20| Abstract classes to manage report generation. | {{{https://gitbox.apache.org/repos/asf/maven-reporting-impl.git}Git}} / {{{https://github.com/apache/maven-reporting-impl/}GitHub}} | {{{https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status != Closed AND component = maven-reporting-impl}JIRA}} *+--+---+--++-+ | {{{/shared/maven-script-interpreter/} <<>>}} | 1.3 | 2020-11-15| Utilities to interpret/execute some scripts for various implementations: groovy or beanshell. | {{{https://gitbox.apache.org/repos/asf/maven-script-interpreter.git}Git}} / {{{https://github.com/apache/maven-script-interpreter/}GitHub}} | {{{https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status != Closed AND component = maven-script-interpreter}JIRA}} *+--+---+--++-+
[maven-war-plugin] branch master updated: [MWAR-454] Upgrade Parent to 36
This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git The following commit(s) were added to refs/heads/master by this push: new f8fd1a2 [MWAR-454] Upgrade Parent to 36 f8fd1a2 is described below commit f8fd1a2a09d3f32f57be03bea0a7eb0739bacdbc Author: Slawomir Jaranowski AuthorDate: Mon Apr 25 18:49:32 2022 +0200 [MWAR-454] Upgrade Parent to 36 --- pom.xml | 69 +-- src/it/MWAR-128/{prebuild.groovy => setup.groovy} | 0 2 files changed, 14 insertions(+), 55 deletions(-) diff --git a/pom.xml b/pom.xml index 188f1bb..fe5e2c8 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ maven-plugins org.apache.maven.plugins -34 +36 @@ -84,6 +84,18 @@ + + + + +org.apache.maven +maven-settings +${mavenVersion} +provided + + + + org.apache.maven @@ -158,7 +170,6 @@ org.eclipse.sisu org.eclipse.sisu.plexus - 0.3.5 provided @@ -191,35 +202,6 @@ - - maven-javadoc-plugin - 3.2.0 - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.1.2 - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-bytecode-version - -enforce - - - - -${maven.compiler.target} - - -true - - - - org.apache.rat apache-rat-plugin @@ -232,9 +214,9 @@ - + org.apache.maven.plugins @@ -262,30 +244,7 @@ clean package - src/it - verify - prebuild - ${project.build.directory}/local-repo - src/it/settings.xml - ${project.build.directory}/it - - -install -pre-integration-tests - - install - - - - javax.servlet:servlet-api:2.4:jar - javax.servlet:javax.servlet-api:3.0.1:jar - org.apache.struts:struts-core:1.3.9:jar - org.codehaus.plexus:plexus-utils:1.4.7:jar:sources - - - - diff --git a/src/it/MWAR-128/prebuild.groovy b/src/it/MWAR-128/setup.groovy similarity index 100% rename from src/it/MWAR-128/prebuild.groovy rename to src/it/MWAR-128/setup.groovy
[maven-war-plugin] branch MWAR-452 created (now f61dd01)
This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a change to branch MWAR-452 in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git at f61dd01 [MWAR-452] One page about Skinny WARs This branch includes the following new commits: new f61dd01 [MWAR-452] One page about Skinny WARs 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-war-plugin] 01/01: [MWAR-452] One page about Skinny WARs
This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a commit to branch MWAR-452 in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git commit f61dd01b5039240a517a23fc8f1e99ebd232b4fa Author: Slawomir Jaranowski AuthorDate: Mon Apr 25 19:08:33 2022 +0200 [MWAR-452] One page about Skinny WARs --- src/site/apt/examples/skinny-wars.apt.vm | 112 --- src/site/apt/index.apt.vm| 2 +- src/site/site.xml| 2 +- 3 files changed, 2 insertions(+), 114 deletions(-) diff --git a/src/site/apt/examples/skinny-wars.apt.vm b/src/site/apt/examples/skinny-wars.apt.vm deleted file mode 100644 index f530dbd..000 --- a/src/site/apt/examples/skinny-wars.apt.vm +++ /dev/null @@ -1,112 +0,0 @@ - -- - Creating Skinny WARs - -- - Mike Perham - Karl-Heinz Marbaise - -- - 2014-10-01 - -- - -~~ 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: -~~ http://maven.apache.org/doxia/references/apt-format.html - -Creating Skinny WARs - - In a typical J2EE environment, a WAR is packaged within an EAR for deployment. The - WAR can contain all its dependent JARs in <<>> but then the EAR can quickly grow - very large if there are multiple WARs, due to the presence of duplicate JARs. Instead - the J2EE specification allows WARs to reference external JARs packaged within the EAR - via the <<>> setting in their <<>>. - - The Maven EAR Plugin has direct support for creating skinny wars which simply - means to {{{http://maven.apache.org/plugins/maven-ear-plugin/examples/skinny-wars.html}configure the maven-ear-plugin}} - accordingly. - - You need to change the EAR project's <<>> to package those dependent JARs in the EAR. - Notice that we package everything into a <<>> directory within the EAR. This is - just my own personal preference to distinguish between J2EE modules (which will - be packaged in the root of the EAR) and Java libraries (which are packaged in <<>>). - -+-+ - - ... - - - -maven-ear-plugin -2.9.1 - - lib/ - true - - - - - ... - -+-+ - - Now the painful part. Your EAR project's <<>> needs to list every dependency that the WAR has. - This is because Maven assumes fat WARs and does not include transitive dependencies - of WARs within the EAR. - -+-+ - - - - - com.acme - shared-jar - 1.0.0 - - - com.acme - war1 - 1.0.0 - war - - - com.acme - war2 - 1.0.0 - war - - - ... - -+-+ - - Your EAR will contain something like this: - -- - . - |-- META-INF - | `-- application.xml - |-- lib - | `-- shared-jar-1.0.0.jar - |-- war1-1.0.0.war - `-- war2-1.0.0.war -- - - -* Alternatives - - Our users have submitted alternatives to the above recipe on - {{{http://docs.codehaus.org/display/MAVENUSER/Solving+the+Skinny+Wars+problem}the Wiki}}. diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm index edcc5c5..466bacc 100644 --- a/src/site/apt/index.apt.vm +++ b/src/site/apt/index.apt.vm @@ -83,7 +83,7 @@ ${project.name} * {{{./examples/rapid-testing-jetty6-plugin.html}Rapid Testing the Jetty Plugin}} - * {{{./examples/skinny-wars.html}Creating Skinny WARs}} + * {{{https://maven.apache.org/plugins/maven-ear-plugin/examples/skinny-wars.html}Creating Skinny WARs}} * {{{./examples/including-excluding-files-from-war.html}Including and Excluding Files From the WAR}} diff --git a/src/site/site.xml b/src/site/site.xml index 2f81f26..98febf3 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -40,7 +40,7 @@ under the License. - + https://maven.apache.org/plugins/maven-ear-plugin/examples/skinny-wars.html"/>
[maven-war-plugin] 01/01: [MWAR-454] Upgrade Parent to 36
This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a commit to branch MWAR-454 in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git commit 2a002d1ba7b69fd070f4385f92d79d368224fc84 Author: Slawomir Jaranowski AuthorDate: Mon Apr 25 18:49:32 2022 +0200 [MWAR-454] Upgrade Parent to 36 --- pom.xml | 69 +-- src/it/MWAR-128/{prebuild.groovy => setup.groovy} | 0 2 files changed, 14 insertions(+), 55 deletions(-) diff --git a/pom.xml b/pom.xml index 188f1bb..fe5e2c8 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ maven-plugins org.apache.maven.plugins -34 +36 @@ -84,6 +84,18 @@ + + + + +org.apache.maven +maven-settings +${mavenVersion} +provided + + + + org.apache.maven @@ -158,7 +170,6 @@ org.eclipse.sisu org.eclipse.sisu.plexus - 0.3.5 provided @@ -191,35 +202,6 @@ - - maven-javadoc-plugin - 3.2.0 - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.1.2 - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-bytecode-version - -enforce - - - - -${maven.compiler.target} - - -true - - - - org.apache.rat apache-rat-plugin @@ -232,9 +214,9 @@ - + org.apache.maven.plugins @@ -262,30 +244,7 @@ clean package - src/it - verify - prebuild - ${project.build.directory}/local-repo - src/it/settings.xml - ${project.build.directory}/it - - -install -pre-integration-tests - - install - - - - javax.servlet:servlet-api:2.4:jar - javax.servlet:javax.servlet-api:3.0.1:jar - org.apache.struts:struts-core:1.3.9:jar - org.codehaus.plexus:plexus-utils:1.4.7:jar:sources - - - - diff --git a/src/it/MWAR-128/prebuild.groovy b/src/it/MWAR-128/setup.groovy similarity index 100% rename from src/it/MWAR-128/prebuild.groovy rename to src/it/MWAR-128/setup.groovy
[maven-war-plugin] branch MWAR-454 created (now 2a002d1)
This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a change to branch MWAR-454 in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git at 2a002d1 [MWAR-454] Upgrade Parent to 36 This branch includes the following new commits: new 2a002d1 [MWAR-454] Upgrade Parent to 36 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-indexer] branch update-lucene-9 updated (61edd8f -> 6fbbb0b)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch update-lucene-9 in repository https://gitbox.apache.org/repos/asf/maven-indexer.git from 61edd8f Merge remote-tracking branch 'origin/master' into update-lucene-9 add c231db6 [MINDEXER-147] Move allGroups/rootGroups to in memory only (#202) add 6fbbb0b Merge remote-tracking branch 'origin/master' into update-lucene-9 No new revisions were added by this update. Summary of changes: .../index/context/DefaultIndexingContext.java | 64 +++--- .../maven/index/updater/IndexDataReader.java | 6 +- .../maven/index/updater/IndexDataWriter.java | 44 ++- .../index/packer/NEXUS4149TransferFormatTest.java | 7 ++- 4 files changed, 24 insertions(+), 97 deletions(-)
[maven-indexer] branch master updated: [MINDEXER-147] Move allGroups/rootGroups to in memory only (#202)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-indexer.git The following commit(s) were added to refs/heads/master by this push: new c231db6 [MINDEXER-147] Move allGroups/rootGroups to in memory only (#202) c231db6 is described below commit c231db602b5cea9ed20eba617de5a5a846ef5faa Author: Tamas Cservenak AuthorDate: Mon Apr 25 17:40:34 2022 +0200 [MINDEXER-147] Move allGroups/rootGroups to in memory only (#202) Do not (mis)use Lucene index to store potentially huge dataset, while this field is really not even searched, it just contains aggregated artifact groups that are present on index. --- .../index/context/DefaultIndexingContext.java | 64 +++--- .../maven/index/updater/IndexDataReader.java | 6 +- .../maven/index/updater/IndexDataWriter.java | 44 ++- .../index/packer/NEXUS4149TransferFormatTest.java | 7 ++- 4 files changed, 24 insertions(+), 97 deletions(-) diff --git a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java index 4e3a4ce..243de94 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java +++ b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java @@ -26,13 +26,14 @@ import java.nio.channels.FileLock; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardOpenOption; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Date; +import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import java.util.concurrent.atomic.AtomicReference; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Document; @@ -48,7 +49,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.SearcherManager; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; @@ -812,77 +812,29 @@ public class DefaultIndexingContext } public Set getAllGroups() -throws IOException { -return getGroups( ArtifactInfo.ALL_GROUPS, ArtifactInfo.ALL_GROUPS_VALUE, ArtifactInfo.ALL_GROUPS_LIST ); +return allGroups.get(); } public synchronized void setAllGroups( Collection groups ) -throws IOException { -setGroups( groups, ArtifactInfo.ALL_GROUPS, ArtifactInfo.ALL_GROUPS_VALUE, ArtifactInfo.ALL_GROUPS_LIST ); -commit(); +allGroups.set( new HashSet<>( groups ) ); } public Set getRootGroups() throws IOException { -return getGroups( ArtifactInfo.ROOT_GROUPS, ArtifactInfo.ROOT_GROUPS_VALUE, ArtifactInfo.ROOT_GROUPS_LIST ); +return rootGroups.get(); } public synchronized void setRootGroups( Collection groups ) -throws IOException { -setGroups( groups, ArtifactInfo.ROOT_GROUPS, ArtifactInfo.ROOT_GROUPS_VALUE, ArtifactInfo.ROOT_GROUPS_LIST ); -commit(); -} - -protected Set getGroups( String field, String filedValue, String listField ) -throws IOException, CorruptIndexException -{ -final TopScoreDocCollector collector = TopScoreDocCollector.create( 1, Integer.MAX_VALUE ); -final IndexSearcher indexSearcher = acquireIndexSearcher(); -try -{ -indexSearcher.search( new TermQuery( new Term( field, filedValue ) ), collector ); -TopDocs topDocs = collector.topDocs(); -// In Lucene 7 topDocs.totalHits is now a long, but we can safely cast this to an int because -// indexes are still bound to at most 2 billion (Integer.MAX_VALUE) documents -Set groups = new LinkedHashSet( (int) Math.max( 10L, topDocs.totalHits.value ) ); -if ( topDocs.totalHits.value > 0 ) -{ -Document doc = indexSearcher.doc( topDocs.scoreDocs[0].doc ); -String groupList = doc.get( listField ); -if ( groupList != null ) -{ -groups.addAll( Arrays.asList( groupList.split( "\\|" ) ) ); -} -} -return groups; -} -finally -{ -releaseIndexSearcher( indexSearcher ); -} +rootGroups.set( new HashSet<>( groups ) ); } -protected void setGroups( Collection groups, String groupField, String groupFieldValue, - String groupListField ) -throws IOException, CorruptIndexException
[maven-indexer] branch MINDEXER-147-groups-in-mem created (now aae3194)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch MINDEXER-147-groups-in-mem in repository https://gitbox.apache.org/repos/asf/maven-indexer.git at aae3194 [MINDEXER-147] Move allGroups/rootGroups to in memory only This branch includes the following new commits: new aae3194 [MINDEXER-147] Move allGroups/rootGroups to in memory only 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-indexer] 01/01: [MINDEXER-147] Move allGroups/rootGroups to in memory only
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch MINDEXER-147-groups-in-mem in repository https://gitbox.apache.org/repos/asf/maven-indexer.git commit aae3194b70264404dcf511e6523b2f0ad1f21dda Author: Tamas Cservenak AuthorDate: Mon Apr 25 17:23:28 2022 +0200 [MINDEXER-147] Move allGroups/rootGroups to in memory only Do not (mis)use Lucene index to store potentially huge dataset, while this field is really not even searched, it just contains aggregated artifact groups that are present on index. --- .../index/context/DefaultIndexingContext.java | 64 +++--- .../maven/index/updater/IndexDataReader.java | 6 +- .../maven/index/updater/IndexDataWriter.java | 44 ++- .../index/packer/NEXUS4149TransferFormatTest.java | 7 ++- 4 files changed, 24 insertions(+), 97 deletions(-) diff --git a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java index 4e3a4ce..243de94 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java +++ b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java @@ -26,13 +26,14 @@ import java.nio.channels.FileLock; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardOpenOption; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Date; +import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import java.util.concurrent.atomic.AtomicReference; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Document; @@ -48,7 +49,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.SearcherManager; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; @@ -812,77 +812,29 @@ public class DefaultIndexingContext } public Set getAllGroups() -throws IOException { -return getGroups( ArtifactInfo.ALL_GROUPS, ArtifactInfo.ALL_GROUPS_VALUE, ArtifactInfo.ALL_GROUPS_LIST ); +return allGroups.get(); } public synchronized void setAllGroups( Collection groups ) -throws IOException { -setGroups( groups, ArtifactInfo.ALL_GROUPS, ArtifactInfo.ALL_GROUPS_VALUE, ArtifactInfo.ALL_GROUPS_LIST ); -commit(); +allGroups.set( new HashSet<>( groups ) ); } public Set getRootGroups() throws IOException { -return getGroups( ArtifactInfo.ROOT_GROUPS, ArtifactInfo.ROOT_GROUPS_VALUE, ArtifactInfo.ROOT_GROUPS_LIST ); +return rootGroups.get(); } public synchronized void setRootGroups( Collection groups ) -throws IOException { -setGroups( groups, ArtifactInfo.ROOT_GROUPS, ArtifactInfo.ROOT_GROUPS_VALUE, ArtifactInfo.ROOT_GROUPS_LIST ); -commit(); -} - -protected Set getGroups( String field, String filedValue, String listField ) -throws IOException, CorruptIndexException -{ -final TopScoreDocCollector collector = TopScoreDocCollector.create( 1, Integer.MAX_VALUE ); -final IndexSearcher indexSearcher = acquireIndexSearcher(); -try -{ -indexSearcher.search( new TermQuery( new Term( field, filedValue ) ), collector ); -TopDocs topDocs = collector.topDocs(); -// In Lucene 7 topDocs.totalHits is now a long, but we can safely cast this to an int because -// indexes are still bound to at most 2 billion (Integer.MAX_VALUE) documents -Set groups = new LinkedHashSet( (int) Math.max( 10L, topDocs.totalHits.value ) ); -if ( topDocs.totalHits.value > 0 ) -{ -Document doc = indexSearcher.doc( topDocs.scoreDocs[0].doc ); -String groupList = doc.get( listField ); -if ( groupList != null ) -{ -groups.addAll( Arrays.asList( groupList.split( "\\|" ) ) ); -} -} -return groups; -} -finally -{ -releaseIndexSearcher( indexSearcher ); -} +rootGroups.set( new HashSet<>( groups ) ); } -protected void setGroups( Collection groups, String groupField, String groupFieldValue, - String groupListField ) -throws IOException, CorruptIndexException -{ -final IndexWriter w = getIndexWriter(); -w.updateDocument( new Term( groupField, groupFieldValue ), -createGroupsDocument( groups,
[maven-compiler-plugin] branch dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.4.0 created (now 0e57d0c)
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-javadoc-plugin-3.4.0 in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git at 0e57d0c Bump maven-javadoc-plugin from 3.3.2 to 3.4.0 No new revisions were added by this update.
[maven-war-plugin] 01/01: Merge branch 'master' into master
This is an automated email from the ASF dual-hosted git repository. dennisl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git commit 6abd29bfa95cd2c78ae206bac9595328201e4a77 Merge: 35cec22 41f4875 Author: Dennis Lundberg AuthorDate: Mon Apr 25 15:32:28 2022 +0200 Merge branch 'master' into master pom.xml| 4 +- src/it/MWAR-450/pom.xml| 55 + .../src/main/webapp/WEB-INF/classes/log4j.xml | 30 +++ .../src/main/webapp/WEB-INF/classes/my.properties | 18 + .../src/main/webapp/WEB-INF/classes/myfile.txt | 18 + src/it/MWAR-450/src/main/webapp/WEB-INF/web.xml| 26 ++ src/it/MWAR-450/src/main/webapp/index.jsp | 23 ++ src/it/MWAR-450/verify.bsh | 94 ++ .../apache/maven/plugins/war/AbstractWarMojo.java | 25 +- .../war/packaging/AbstractWarPackagingTask.java| 32 +++- .../plugins/war/packaging/WarPackagingContext.java | 8 ++ 11 files changed, 327 insertions(+), 6 deletions(-)
[maven-war-plugin] branch master updated (35cec22 -> 6abd29b)
This is an automated email from the ASF dual-hosted git repository. dennisl pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git from 35cec22 Merge pull request #20 from apache/update-plugin add f3aead9 [MWAR-450] ISO-8859-1 properties files get changed into UTF-8 when filtered. add f0ccbbf Fix suggestions from code review by @michael-o. add 136f2df Update maven-shared-utils to version 3.3.4. add 41f4875 Merge remote-tracking branch 'origin/update-plugin' new 6abd29b Merge branch 'master' into master 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: pom.xml| 4 +- .../{MWAR-352_custom-webXml => MWAR-450}/pom.xml | 15 -- .../src/main/webapp/WEB-INF/classes/log4j.xml} | 16 -- .../src/main/webapp}/WEB-INF/classes/my.properties | 0 .../src/main/webapp/WEB-INF/classes/myfile.txt}| 2 +- .../src/main/webapp/WEB-INF/web.xml| 0 .../web => MWAR-450}/src/main/webapp/index.jsp | 0 .../verify.bsh | 62 +- .../apache/maven/plugins/war/AbstractWarMojo.java | 25 +++-- .../war/packaging/AbstractWarPackagingTask.java| 32 ++- .../plugins/war/packaging/WarPackagingContext.java | 8 +++ 11 files changed, 111 insertions(+), 53 deletions(-) copy src/it/{MWAR-352_custom-webXml => MWAR-450}/pom.xml (72%) copy src/it/{MWAR-311/src/main/webapp/WEB-INF/web.xml => MWAR-450/src/main/webapp/WEB-INF/classes/log4j.xml} (59%) copy src/it/{web-resources-filtering-delimiter/web/src/main/webresources => MWAR-450/src/main/webapp}/WEB-INF/classes/my.properties (100%) copy src/it/{MWAR-167/invoker.properties => MWAR-450/src/main/webapp/WEB-INF/classes/myfile.txt} (94%) copy src/it/{web-resources-filtering-delimiter/web => MWAR-450}/src/main/webapp/WEB-INF/web.xml (100%) copy src/it/{web-resources-filtering-delimiter/web => MWAR-450}/src/main/webapp/index.jsp (100%) mode change 100755 => 100644 copy src/it/{web-resources-filtering-delimiter => MWAR-450}/verify.bsh (69%)
[maven-indexer] branch update-lucene-9 updated (0e6131c -> 61edd8f)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch update-lucene-9 in repository https://gitbox.apache.org/repos/asf/maven-indexer.git from 0e6131c This cannot build on 8 anymore add b8233c0 [MINDEXER-146] Fix issues reported by Lucene 9 (#201) add 61edd8f Merge remote-tracking branch 'origin/master' into update-lucene-9 No new revisions were added by this update. Summary of changes:
[maven-war-plugin] branch dependabot/maven/commons-io-commons-io-2.7 created (now 2e7db20)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/commons-io-commons-io-2.7 in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git at 2e7db20 Bump commons-io from 2.6 to 2.7 No new revisions were added by this update.
[maven-war-plugin] 01/01: Merge pull request #20 from apache/update-plugin
This is an automated email from the ASF dual-hosted git repository. dennisl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git commit 35cec220825a5e97d3a70792d15601a10311a3d0 Merge: 4355af5 bf5a235 Author: Dennis Lundberg AuthorDate: Mon Apr 25 15:12:40 2022 +0200 Merge pull request #20 from apache/update-plugin [MWAR-444] Update plugin (requires Maven 3.2.5+) pom.xml | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-)
[maven-war-plugin] branch master updated (4355af5 -> 35cec22)
This is an automated email from the ASF dual-hosted git repository. dennisl pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git from 4355af5 Add Shared GitHub Actions add bf5a235 Update plugin new 35cec22 Merge pull request #20 from apache/update-plugin 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: pom.xml | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-)
[maven-resolver] branch master updated: [MRESOLVER-252] Make LRM path composition reusable (#167) [MRESOLVER-253] Split LRM (#168)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-resolver.git The following commit(s) were added to refs/heads/master by this push: new b1aa64fb [MRESOLVER-252] Make LRM path composition reusable (#167) [MRESOLVER-253] Split LRM (#168) b1aa64fb is described below commit b1aa64fbe6d1460d1b98d57039ec4a00de3d1a91 Author: Tamas Cservenak AuthorDate: Mon Apr 25 14:41:04 2022 +0200 [MRESOLVER-252] Make LRM path composition reusable (#167) [MRESOLVER-253] Split LRM (#168) [MRESOLVER-252] Make LRM path composition reusable (#167) LocalRepositoryManager path composition was enclosed into SimpleLocalRepositoryManager in not-quite reusable manner. Make it reusable, by making it into a component. Currently FileProvidedChecksumsSource was reusing local paths, is adjusted now. Also, make LRM implementations more encapsulated and clear up many ctors leaving only one for simplicity. [MRESOLVER-253] Split LRM (#168) Enhances existing "enhanced" LRM (local repository manager) with "prefix" from from composer. Default behaviour is not changed (will not use prefix, local repo will be as today). The point in change is that it introduces a "composer", that is composing LRM path prefix, and is able to apply different strategies, and split local repository into "installed" (locally built and installed) and "cached" (downloaded from remote), etc. There are several composers options out of the box. --- .../eclipse/aether/impl/DefaultServiceLocator.java | 3 + .../eclipse/aether/impl/guice/AetherModule.java| 10 + .../internal/impl/DefaultLocalPathComposer.java| 117 + .../DefaultLocalPathPrefixComposerFactory.java | 61 + .../impl/EnhancedLocalRepositoryManager.java | 136 +-- .../EnhancedLocalRepositoryManagerFactory.java | 46 +++- .../internal/impl/FileProvidedChecksumsSource.java | 10 +- .../aether/internal/impl/LocalPathComposer.java| 53 + .../internal/impl/LocalPathPrefixComposer.java | 66 ++ .../impl/LocalPathPrefixComposerFactory.java | 38 +++ .../LocalPathPrefixComposerFactorySupport.java | 261 + .../impl/SimpleLocalRepositoryManager.java | 157 + .../impl/SimpleLocalRepositoryManagerFactory.java | 30 ++- .../DefaultLocalPathPrefixComposerFactoryTest.java | 229 ++ .../impl/EnhancedLocalRepositoryManagerTest.java | 24 +- .../EnhancedSplitLocalRepositoryManagerTest.java | 74 ++ .../impl/FileProvidedChecksumsSourceTest.java | 2 +- .../impl/SimpleLocalRepositoryManagerTest.java | 3 +- src/site/markdown/configuration.md | 9 + src/site/markdown/local-repository.md | 162 + src/site/site.xml | 1 + 21 files changed, 1341 insertions(+), 151 deletions(-) diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/DefaultServiceLocator.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/DefaultServiceLocator.java index c17e2378..815c07cd 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/DefaultServiceLocator.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/DefaultServiceLocator.java @@ -31,6 +31,8 @@ import java.util.Map; import static java.util.Objects.requireNonNull; import org.eclipse.aether.RepositorySystem; +import org.eclipse.aether.internal.impl.LocalPathComposer; +import org.eclipse.aether.internal.impl.DefaultLocalPathComposer; import org.eclipse.aether.internal.impl.DefaultArtifactResolver; import org.eclipse.aether.internal.impl.DefaultChecksumPolicyProvider; import org.eclipse.aether.internal.impl.DefaultTrackingFileManager; @@ -227,6 +229,7 @@ public final class DefaultServiceLocator addService( TrackingFileManager.class, DefaultTrackingFileManager.class ); addService( NamedLockFactorySelector.class, SimpleNamedLockFactorySelector.class ); addService( ChecksumAlgorithmFactorySelector.class, DefaultChecksumAlgorithmFactorySelector.class ); +addService( LocalPathComposer.class, DefaultLocalPathComposer.class ); } private Entry getEntry( Class type, boolean create ) diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/guice/AetherModule.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/guice/AetherModule.java index 93ef99ec..02bd7b08 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/guice/AetherModule.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/guice/AetherModule.java @@ -40,7 +40,11 @@ import org.eclipse.aether.impl.OfflineController; import org.eclipse.aether.impl.RemoteRepositoryManager; import
[maven-resolver] branch make-local-path-composer-reusable updated (3b99ad43 -> 9e65732c)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch make-local-path-composer-reusable in repository https://gitbox.apache.org/repos/asf/maven-resolver.git from 3b99ad43 Merge remote-tracking branch 'origin/master' into make-local-path-composer-reusable add 9e65732c [MRESOLVER-253] Split LRM (#168) No new revisions were added by this update. Summary of changes: .../eclipse/aether/impl/guice/AetherModule.java| 8 +- .../DefaultLocalPathPrefixComposerFactory.java | 61 + .../impl/EnhancedLocalRepositoryManager.java | 133 +-- .../EnhancedLocalRepositoryManagerFactory.java | 25 +- .../internal/impl/LocalPathPrefixComposer.java | 66 ++ .../impl/LocalPathPrefixComposerFactory.java} | 25 +- .../LocalPathPrefixComposerFactorySupport.java | 261 + .../impl/SimpleLocalRepositoryManager.java | 59 +++-- .../impl/SimpleLocalRepositoryManagerFactory.java | 1 + .../DefaultLocalPathPrefixComposerFactoryTest.java | 229 ++ .../impl/EnhancedLocalRepositoryManagerTest.java | 23 +- .../EnhancedSplitLocalRepositoryManagerTest.java | 74 ++ src/site/markdown/configuration.md | 9 + src/site/markdown/local-repository.md | 162 + src/site/site.xml | 1 + 15 files changed, 1075 insertions(+), 62 deletions(-) create mode 100644 maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalPathPrefixComposerFactory.java create mode 100644 maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/LocalPathPrefixComposer.java copy maven-resolver-impl/src/{test/java/org/eclipse/aether/internal/impl/IniArtifactDescriptorReader.java => main/java/org/eclipse/aether/internal/impl/LocalPathPrefixComposerFactory.java} (63%) create mode 100644 maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/LocalPathPrefixComposerFactorySupport.java create mode 100644 maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultLocalPathPrefixComposerFactoryTest.java create mode 100644 maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedSplitLocalRepositoryManagerTest.java create mode 100644 src/site/markdown/local-repository.md
[maven-indexer] branch master updated: [MINDEXER-146] Fix issues reported by Lucene 9 (#201)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-indexer.git The following commit(s) were added to refs/heads/master by this push: new b8233c0 [MINDEXER-146] Fix issues reported by Lucene 9 (#201) b8233c0 is described below commit b8233c08a9cadf168bc8b53bb354506f363c2a32 Author: Tamas Cservenak AuthorDate: Mon Apr 25 14:38:12 2022 +0200 [MINDEXER-146] Fix issues reported by Lucene 9 (#201) There were several "sloppy" spots especially about indexing options and norms (field type options), that are now fixed. Also, replaced uses of deprecated RAMDirectory with new ByteBuffersDirectory, that affects only test code. --- .../index/context/DefaultIndexingContext.java | 5 +++-- .../maven/index/updater/IndexDataReader.java | 3 +-- .../maven/index/updater/IndexDataWriter.java | 5 +++-- .../maven/index/AbstractNexusIndexerTest.java | 8 ++-- .../index/ConcurrentUseWithMergedContextTest.java | 6 +++--- .../apache/maven/index/DuplicateSearchTest.java| 6 +++--- .../maven/index/Nexus13NexusIndexerTest.java | 4 ++-- .../maven/index/Nexus3177HitLimitChecks.java | 4 ++-- .../org/apache/maven/index/NexusIndexerTest.java | 5 +++-- .../index/context/TrackingLockFactoryTest.java | 9 + .../index/updater/DefaultIndexUpdaterTest.java | 22 +++--- .../apache/maven/index/updater/IndexDataTest.java | 12 +--- 12 files changed, 43 insertions(+), 46 deletions(-) diff --git a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java index fcf1441..4e3a4ce 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java +++ b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java @@ -369,7 +369,8 @@ public class DefaultIndexingContext hdr.add( new Field( FLD_DESCRIPTOR, FLD_DESCRIPTOR_CONTENTS, IndexerField.KEYWORD_STORED ) ); -hdr.add( new StoredField( FLD_IDXINFO, VERSION + ArtifactInfo.FS + getRepositoryId() ) ); +hdr.add( new StoredField( FLD_IDXINFO, VERSION + ArtifactInfo.FS + getRepositoryId(), +IndexerField.KEYWORD_STORED ) ); IndexWriter w = getIndexWriter(); @@ -879,7 +880,7 @@ public class DefaultIndexingContext { final Document groupDoc = new Document(); groupDoc.add( new Field( field, fieldValue, IndexerField.KEYWORD_STORED ) ); -groupDoc.add( new StoredField( listField, ArtifactInfo.lst2str( groups ) ) ); +groupDoc.add( new StoredField( listField, ArtifactInfo.lst2str( groups ), IndexerField.KEYWORD_STORED ) ); return groupDoc; } diff --git a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java index d8cc804..d670cf0 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java +++ b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java @@ -184,9 +184,8 @@ public class IndexDataReader { boolean tokenized = ( flags & IndexDataWriter.F_TOKENIZED ) > 0; fieldType.setTokenized( tokenized ); -fieldType.setOmitNorms( !tokenized ); -fieldType.setIndexOptions( IndexOptions.DOCS_AND_FREQS_AND_POSITIONS ); } +fieldType.setIndexOptions( IndexOptions.DOCS_AND_FREQS_AND_POSITIONS ); fieldType.setStored( ( flags & IndexDataWriter.F_STORED ) > 0 ); String name = dis.readUTF(); diff --git a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java index bd759fe..1be10d5 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java +++ b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java @@ -32,6 +32,7 @@ import java.util.Set; import java.util.zip.GZIPOutputStream; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexableField; @@ -124,7 +125,7 @@ public class IndexDataWriter List allGroupsFields = new ArrayList<>( 2 ); allGroupsFields.add( new Field( ArtifactInfo.ALL_GROUPS, ArtifactInfo.ALL_GROUPS_VALUE, IndexerField.KEYWORD_STORED ) ); -allGroupsFields.add( new Field( ArtifactInfo.ALL_GROUPS_LIST, ArtifactInfo.lst2str( allGroups ), +allGroupsFields.add( new
[maven-resolver] branch dynamic-lrm updated (ce715427 -> 7cf77da2)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch dynamic-lrm in repository https://gitbox.apache.org/repos/asf/maven-resolver.git from ce715427 Custom strategy add 7cf77da2 Ssss No new revisions were added by this update. Summary of changes: .../aether/internal/impl/DefaultLocalPathPrefixComposerFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[maven-indexer] 01/01: [MINDEXER-146] Fix issues reported by Lucene 9
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch MINDEXER-146-backport-fixes in repository https://gitbox.apache.org/repos/asf/maven-indexer.git commit 698cda1e8712879706ecd34e80cbd04f05de69e2 Author: Tamas Cservenak AuthorDate: Mon Apr 25 13:42:49 2022 +0200 [MINDEXER-146] Fix issues reported by Lucene 9 There were several "sloppy" spots especially about indexing options and norms (field type options), that are now fixed. Also, replaced uses of deprecated RAMDirectory with new ByteBuffersDirectory, that affects only test code. --- .../index/context/DefaultIndexingContext.java | 5 +++-- .../maven/index/updater/IndexDataReader.java | 3 +-- .../maven/index/updater/IndexDataWriter.java | 5 +++-- .../maven/index/AbstractNexusIndexerTest.java | 8 ++-- .../index/ConcurrentUseWithMergedContextTest.java | 6 +++--- .../apache/maven/index/DuplicateSearchTest.java| 6 +++--- .../maven/index/Nexus13NexusIndexerTest.java | 4 ++-- .../maven/index/Nexus3177HitLimitChecks.java | 4 ++-- .../org/apache/maven/index/NexusIndexerTest.java | 5 +++-- .../index/context/TrackingLockFactoryTest.java | 9 + .../index/updater/DefaultIndexUpdaterTest.java | 22 +++--- .../apache/maven/index/updater/IndexDataTest.java | 12 +--- 12 files changed, 43 insertions(+), 46 deletions(-) diff --git a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java index fcf1441..4e3a4ce 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java +++ b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java @@ -369,7 +369,8 @@ public class DefaultIndexingContext hdr.add( new Field( FLD_DESCRIPTOR, FLD_DESCRIPTOR_CONTENTS, IndexerField.KEYWORD_STORED ) ); -hdr.add( new StoredField( FLD_IDXINFO, VERSION + ArtifactInfo.FS + getRepositoryId() ) ); +hdr.add( new StoredField( FLD_IDXINFO, VERSION + ArtifactInfo.FS + getRepositoryId(), +IndexerField.KEYWORD_STORED ) ); IndexWriter w = getIndexWriter(); @@ -879,7 +880,7 @@ public class DefaultIndexingContext { final Document groupDoc = new Document(); groupDoc.add( new Field( field, fieldValue, IndexerField.KEYWORD_STORED ) ); -groupDoc.add( new StoredField( listField, ArtifactInfo.lst2str( groups ) ) ); +groupDoc.add( new StoredField( listField, ArtifactInfo.lst2str( groups ), IndexerField.KEYWORD_STORED ) ); return groupDoc; } diff --git a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java index d8cc804..d670cf0 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java +++ b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java @@ -184,9 +184,8 @@ public class IndexDataReader { boolean tokenized = ( flags & IndexDataWriter.F_TOKENIZED ) > 0; fieldType.setTokenized( tokenized ); -fieldType.setOmitNorms( !tokenized ); -fieldType.setIndexOptions( IndexOptions.DOCS_AND_FREQS_AND_POSITIONS ); } +fieldType.setIndexOptions( IndexOptions.DOCS_AND_FREQS_AND_POSITIONS ); fieldType.setStored( ( flags & IndexDataWriter.F_STORED ) > 0 ); String name = dis.readUTF(); diff --git a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java index bd759fe..1be10d5 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java +++ b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java @@ -32,6 +32,7 @@ import java.util.Set; import java.util.zip.GZIPOutputStream; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexableField; @@ -124,7 +125,7 @@ public class IndexDataWriter List allGroupsFields = new ArrayList<>( 2 ); allGroupsFields.add( new Field( ArtifactInfo.ALL_GROUPS, ArtifactInfo.ALL_GROUPS_VALUE, IndexerField.KEYWORD_STORED ) ); -allGroupsFields.add( new Field( ArtifactInfo.ALL_GROUPS_LIST, ArtifactInfo.lst2str( allGroups ), +allGroupsFields.add( new StoredField( ArtifactInfo.ALL_GROUPS_LIST, ArtifactInfo.lst2str( allGroups ), IndexerField.KEYWORD_STORED ) );
[maven-indexer] branch MINDEXER-146-backport-fixes created (now 698cda1)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch MINDEXER-146-backport-fixes in repository https://gitbox.apache.org/repos/asf/maven-indexer.git at 698cda1 [MINDEXER-146] Fix issues reported by Lucene 9 This branch includes the following new commits: new 698cda1 [MINDEXER-146] Fix issues reported by Lucene 9 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-indexer] branch update-lucene-9 updated (51cea4e -> 0e6131c)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch update-lucene-9 in repository https://gitbox.apache.org/repos/asf/maven-indexer.git from 51cea4e Fix sloppy code add 0e6131c This cannot build on 8 anymore No new revisions were added by this update. Summary of changes: Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-indexer] 01/02: WIP
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch update-lucene-9 in repository https://gitbox.apache.org/repos/asf/maven-indexer.git commit b8d193598a2811cf14aad5e3a3f50038cb6c44c3 Author: Tamas Cservenak AuthorDate: Mon Apr 25 12:13:46 2022 +0200 WIP --- indexer-core/pom.xml | 2 +- .../maven/index/AbstractNexusIndexerTest.java | 8 ++--- .../index/ConcurrentUseWithMergedContextTest.java | 6 ++-- .../apache/maven/index/DuplicateSearchTest.java| 6 ++-- .../maven/index/Nexus13NexusIndexerTest.java | 4 +-- .../maven/index/Nexus3177HitLimitChecks.java | 4 +-- .../org/apache/maven/index/NexusIndexerTest.java | 5 +-- .../index/context/TrackingLockFactoryTest.java | 9 +++--- .../index/updater/DefaultIndexUpdaterTest.java | 22 ++--- .../apache/maven/index/updater/IndexDataTest.java | 12 +++ pom.xml| 37 ++ 11 files changed, 47 insertions(+), 68 deletions(-) diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml index f310187..44e775b 100644 --- a/indexer-core/pom.xml +++ b/indexer-core/pom.xml @@ -71,7 +71,7 @@ under the License. org.apache.lucene - lucene-analyzers-common + lucene-analysis-common diff --git a/indexer-core/src/test/java/org/apache/maven/index/AbstractNexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/AbstractNexusIndexerTest.java index 16c1d1c..8df4d1a 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/AbstractNexusIndexerTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/AbstractNexusIndexerTest.java @@ -23,12 +23,8 @@ import java.io.IOException; import java.util.Collection; import org.apache.lucene.index.Term; import org.apache.lucene.search.PrefixQuery; +import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.RAMDirectory; -import org.apache.maven.index.ArtifactInfo; -import org.apache.maven.index.FlatSearchRequest; -import org.apache.maven.index.FlatSearchResponse; -import org.apache.maven.index.NexusIndexer; import org.apache.maven.index.context.IndexingContext; public abstract class AbstractNexusIndexerTest @@ -36,7 +32,7 @@ public abstract class AbstractNexusIndexerTest { protected NexusIndexer nexusIndexer; -protected Directory indexDir = new RAMDirectory(); +protected Directory indexDir = new ByteBuffersDirectory(); protected IndexingContext context; diff --git a/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseWithMergedContextTest.java b/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseWithMergedContextTest.java index 8db7c9e..859ea3a 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseWithMergedContextTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseWithMergedContextTest.java @@ -21,8 +21,8 @@ package org.apache.maven.index; import java.util.Arrays; +import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.RAMDirectory; import org.apache.maven.index.context.IndexingContext; /** @@ -34,11 +34,11 @@ import org.apache.maven.index.context.IndexingContext; public class ConcurrentUseWithMergedContextTest extends ConcurrentUseTest { -protected Directory indexDir1 = new RAMDirectory(); +protected Directory indexDir1 = new ByteBuffersDirectory(); protected IndexingContext context1; -protected Directory indexDir2 = new RAMDirectory(); +protected Directory indexDir2 = new ByteBuffersDirectory(); protected IndexingContext context2; diff --git a/indexer-core/src/test/java/org/apache/maven/index/DuplicateSearchTest.java b/indexer-core/src/test/java/org/apache/maven/index/DuplicateSearchTest.java index a97764e..4cab9d7 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/DuplicateSearchTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/DuplicateSearchTest.java @@ -27,8 +27,8 @@ import java.util.HashSet; import junit.framework.Assert; import org.apache.lucene.search.Query; +import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.RAMDirectory; import org.apache.maven.index.context.IndexingContext; import org.apache.maven.index.expr.SourcedSearchExpression; @@ -39,11 +39,11 @@ public class DuplicateSearchTest protected IndexingContext context1; -protected Directory contextDir1 = new RAMDirectory(); +protected Directory contextDir1 = new ByteBuffersDirectory(); protected IndexingContext context2; -protected Directory contextDir2 = new RAMDirectory(); +protected Directory contextDir2 = new ByteBuffersDirectory(); @Override protected void
[maven-indexer] 02/02: Fix sloppy code
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch update-lucene-9 in repository https://gitbox.apache.org/repos/asf/maven-indexer.git commit 51cea4eeca62189f9a0aad0ab0ec61299d5b1a4b Author: Tamas Cservenak AuthorDate: Mon Apr 25 13:30:27 2022 +0200 Fix sloppy code As Lucene 9 is now rejecting to change options and norms on the fly in same segment --- .../java/org/apache/maven/index/context/DefaultIndexingContext.java | 5 +++-- .../main/java/org/apache/maven/index/updater/IndexDataReader.java| 3 +-- .../main/java/org/apache/maven/index/updater/IndexDataWriter.java| 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java index fcf1441..4e3a4ce 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java +++ b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java @@ -369,7 +369,8 @@ public class DefaultIndexingContext hdr.add( new Field( FLD_DESCRIPTOR, FLD_DESCRIPTOR_CONTENTS, IndexerField.KEYWORD_STORED ) ); -hdr.add( new StoredField( FLD_IDXINFO, VERSION + ArtifactInfo.FS + getRepositoryId() ) ); +hdr.add( new StoredField( FLD_IDXINFO, VERSION + ArtifactInfo.FS + getRepositoryId(), +IndexerField.KEYWORD_STORED ) ); IndexWriter w = getIndexWriter(); @@ -879,7 +880,7 @@ public class DefaultIndexingContext { final Document groupDoc = new Document(); groupDoc.add( new Field( field, fieldValue, IndexerField.KEYWORD_STORED ) ); -groupDoc.add( new StoredField( listField, ArtifactInfo.lst2str( groups ) ) ); +groupDoc.add( new StoredField( listField, ArtifactInfo.lst2str( groups ), IndexerField.KEYWORD_STORED ) ); return groupDoc; } diff --git a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java index d8cc804..d670cf0 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java +++ b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java @@ -184,9 +184,8 @@ public class IndexDataReader { boolean tokenized = ( flags & IndexDataWriter.F_TOKENIZED ) > 0; fieldType.setTokenized( tokenized ); -fieldType.setOmitNorms( !tokenized ); -fieldType.setIndexOptions( IndexOptions.DOCS_AND_FREQS_AND_POSITIONS ); } +fieldType.setIndexOptions( IndexOptions.DOCS_AND_FREQS_AND_POSITIONS ); fieldType.setStored( ( flags & IndexDataWriter.F_STORED ) > 0 ); String name = dis.readUTF(); diff --git a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java index bd759fe..1be10d5 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java +++ b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java @@ -32,6 +32,7 @@ import java.util.Set; import java.util.zip.GZIPOutputStream; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexableField; @@ -124,7 +125,7 @@ public class IndexDataWriter List allGroupsFields = new ArrayList<>( 2 ); allGroupsFields.add( new Field( ArtifactInfo.ALL_GROUPS, ArtifactInfo.ALL_GROUPS_VALUE, IndexerField.KEYWORD_STORED ) ); -allGroupsFields.add( new Field( ArtifactInfo.ALL_GROUPS_LIST, ArtifactInfo.lst2str( allGroups ), +allGroupsFields.add( new StoredField( ArtifactInfo.ALL_GROUPS_LIST, ArtifactInfo.lst2str( allGroups ), IndexerField.KEYWORD_STORED ) ); writeDocumentFields( allGroupsFields ); } @@ -133,7 +134,7 @@ public class IndexDataWriter List rootGroupsFields = new ArrayList<>( 2 ); rootGroupsFields.add( new Field( ArtifactInfo.ROOT_GROUPS, ArtifactInfo.ROOT_GROUPS_VALUE, IndexerField.KEYWORD_STORED ) ); -rootGroupsFields.add( new Field( ArtifactInfo.ROOT_GROUPS_LIST, ArtifactInfo.lst2str( rootGroups ), +rootGroupsFields.add( new StoredField( ArtifactInfo.ROOT_GROUPS_LIST, ArtifactInfo.lst2str( rootGroups ), IndexerField.KEYWORD_STORED ) ); writeDocumentFields( rootGroupsFields ); }
[maven-indexer] branch update-lucene-9 created (now 51cea4e)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch update-lucene-9 in repository https://gitbox.apache.org/repos/asf/maven-indexer.git at 51cea4e Fix sloppy code This branch includes the following new commits: new b8d1935 WIP new 51cea4e Fix sloppy code 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-resolver] branch dynamic-lrm updated (4ec85544 -> ce715427)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch dynamic-lrm in repository https://gitbox.apache.org/repos/asf/maven-resolver.git from 4ec85544 Add reference to configuration add ce715427 Custom strategy No new revisions were added by this update. Summary of changes: src/site/markdown/local-repository.md | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-)
[maven-resolver] branch dynamic-lrm updated (f6cf585a -> 4ec85544)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch dynamic-lrm in repository https://gitbox.apache.org/repos/asf/maven-resolver.git from f6cf585a Make configuration keys/defaults protected as well. add 4ec85544 Add reference to configuration No new revisions were added by this update. Summary of changes: src/site/markdown/local-repository.md | 3 +++ 1 file changed, 3 insertions(+)
[maven-resolver] branch dynamic-lrm updated (118c275b -> f6cf585a)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch dynamic-lrm in repository https://gitbox.apache.org/repos/asf/maven-resolver.git from 118c275b Pull all the logic into support add f6cf585a Make configuration keys/defaults protected as well. No new revisions were added by this update. Summary of changes: .../LocalPathPrefixComposerFactorySupport.java | 40 -- 1 file changed, 22 insertions(+), 18 deletions(-)
[maven-resolver] branch dynamic-lrm updated (85f8e50c -> 118c275b)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch dynamic-lrm in repository https://gitbox.apache.org/repos/asf/maven-resolver.git from 85f8e50c Fix lineending add 118c275b Pull all the logic into support No new revisions were added by this update. Summary of changes: .../DefaultLocalPathPrefixComposerFactory.java | 86 +- .../LocalPathPrefixComposerFactorySupport.java | 84 - 2 files changed, 85 insertions(+), 85 deletions(-)
[maven-resolver] branch dynamic-lrm updated (85282572 -> 85f8e50c)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch dynamic-lrm in repository https://gitbox.apache.org/repos/asf/maven-resolver.git from 85282572 Add note about rel/snap differentiation add 85f8e50c Fix lineending No new revisions were added by this update. Summary of changes: src/site/markdown/local-repository.md | 36 +-- 1 file changed, 18 insertions(+), 18 deletions(-)
[maven-resolver] branch dynamic-lrm updated (6ccaebf5 -> 85282572)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch dynamic-lrm in repository https://gitbox.apache.org/repos/asf/maven-resolver.git from 6ccaebf5 Renamed to "releases" and "snapshots" add 85282572 Add note about rel/snap differentiation No new revisions were added by this update. Summary of changes: src/site/markdown/local-repository.md | 24 1 file changed, 24 insertions(+)
[maven-apache-parent] branch master updated (855bccb -> 370aa2b)
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-apache-parent.git from 855bccb prepare documentation for next iteration add 370aa2b Bump maven-site-plugin from 3.11.0 to 3.12.0 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-resolver] branch dynamic-lrm updated (4c1bf77b -> 6ccaebf5)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch dynamic-lrm in repository https://gitbox.apache.org/repos/asf/maven-resolver.git from 4c1bf77b Revert to original check add 6ccaebf5 Renamed to "releases" and "snapshots" No new revisions were added by this update. Summary of changes: .../DefaultLocalPathPrefixComposerFactory.java | 10 +++--- .../LocalPathPrefixComposerFactorySupport.java | 29 - .../DefaultLocalPathPrefixComposerFactoryTest.java | 36 +++--- src/site/markdown/configuration.md | 4 +-- 4 files changed, 40 insertions(+), 39 deletions(-)
[maven-resolver] branch dynamic-lrm updated (b8199793 -> 4c1bf77b)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch dynamic-lrm in repository https://gitbox.apache.org/repos/asf/maven-resolver.git from b8199793 Merge branch 'make-local-path-composer-reusable' into dynamic-lrm add 4c1bf77b Revert to original check No new revisions were added by this update. Summary of changes: .../main/java/org/eclipse/aether/artifact/AbstractArtifact.java| 7 ++- .../internal/impl/LocalPathPrefixComposerFactorySupport.java | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-)
[maven-release] branch master updated: add release drafter configuration (#112)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-release.git The following commit(s) were added to refs/heads/master by this push: new f3f5c071 add release drafter configuration (#112) f3f5c071 is described below commit f3f5c071c47491ee1c7b8697ca67c5f71cdf1002 Author: Olivier Lamy AuthorDate: Mon Apr 25 16:23:08 2022 +1000 add release drafter configuration (#112) Signed-off-by: Olivier Lamy --- .github/release-drafter.yml | 19 +++ .github/workflows/release-drafter.yml | 29 + 2 files changed, 48 insertions(+) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml new file mode 100644 index ..d8b1d8c7 --- /dev/null +++ b/.github/release-drafter.yml @@ -0,0 +1,19 @@ +# 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. + +_extends: maven-gh-actions-shared +tag-template: maven-release-$NEXT_MINOR_VERSION diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml new file mode 100644 index ..b09f471c --- /dev/null +++ b/.github/workflows/release-drafter.yml @@ -0,0 +1,29 @@ +# 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. + +name: Release Drafter +on: + push: +branches: + - master +jobs: + update_release_draft: +runs-on: ubuntu-latest +steps: + - uses: release-drafter/release-drafter@v5 +env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}