From d9e4cca2936006e095a64d1a6f42a5d739cd91c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= Date: Wed, 29 Jan 2025 09:08:22 +0100 Subject: [PATCH] Rename master > main MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christoph Läubrich --- .github/workflows/licensecheck.yml | 4 ++-- .github/workflows/maven.yml | 4 ++-- CONTRIBUTING.md | 2 +- Jenkinsfile | 6 +++--- README.md | 8 ++++---- RELEASE_NOTES.md | 4 ++-- m2e-parent/pom.xml | 1 + org.eclipse.m2e.editor.lemminx/HOWTO-DEV.md | 2 +- setup/m2e.setup | 8 ++++---- setup/m2eDevelopmentEnvironmentConfiguration.setup | 4 ++-- 10 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.github/workflows/licensecheck.yml b/.github/workflows/licensecheck.yml index 322b7baf67..81d4b04e7c 100644 --- a/.github/workflows/licensecheck.yml +++ b/.github/workflows/licensecheck.yml @@ -5,11 +5,11 @@ name: License vetting status check on: push: branches: - - 'master' + - 'main' - 'm2e-*' pull_request: branches: - - 'master' + - 'main' - 'm2e-*' issue_comment: types: [created] diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 2ce6b0bba4..0c4ebafdd8 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -4,10 +4,10 @@ name: Build M2Eclipse on: push: branches: - - 'master' + - 'main' pull_request: branches: - - 'master' + - 'main' jobs: build: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cb70b4eb92..2ce44492a9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,7 +39,7 @@ Java 17 and Maven 3.8.6 (only if you want to build from the command-line), or ne ### ⌨️ Setting up the Development Environment automatically, using the Eclipse Installer (Oomph) -[![Create Eclipse Development Environment for m2e](https://download.eclipse.org/oomph/www/setups/svg/m2e.svg)](https://www.eclipse.org/setups/installer/?url=https://raw.githubusercontent.com/eclipse-m2e/m2e-core/master/setup/m2eDevelopmentEnvironmentConfiguration.setup&show=true "Click to open Eclipse-Installer Auto Launch or drag into your running installer") +[![Create Eclipse Development Environment for m2e](https://download.eclipse.org/oomph/www/setups/svg/m2e.svg)](https://www.eclipse.org/setups/installer/?url=https://raw.githubusercontent.com/eclipse-m2e/m2e-core/main/setup/m2eDevelopmentEnvironmentConfiguration.setup&show=true "Click to open Eclipse-Installer Auto Launch or drag into your running installer") Step by Step guide: diff --git a/Jenkinsfile b/Jenkinsfile index 0ecfbfff59..c49aa63c50 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { options { timeout(time: 45, unit: 'MINUTES') - buildDiscarder(logRotator(numToKeepStr:'5', artifactNumToKeepStr: 'master'.equals(env.BRANCH_NAME) ? '5' : '1' )) + buildDiscarder(logRotator(numToKeepStr:'5', artifactNumToKeepStr: 'main'.equals(env.BRANCH_NAME) ? '5' : '1' )) disableConcurrentBuilds(abortPrevious: true) timestamps() } @@ -27,7 +27,7 @@ pipeline { xvnc(useXauthority: true) { sh '''#!/bin/bash -x mavenArgs="clean verify --batch-mode -Dmaven.test.failure.ignore=true -Dtycho.p2.baselineMode=failCommon" - if [[ ${BRANCH_NAME} == master ]] || [[ ${BRANCH_NAME} =~ m2e-[0-9]+\\.[0-9]+\\.x ]]; then + if [[ ${BRANCH_NAME} == main ]] || [[ ${BRANCH_NAME} =~ m2e-[0-9]+\\.[0-9]+\\.x ]]; then mvn ${mavenArgs} -Peclipse-sign,its -Dtycho.pgp.signer.bc.secretKeys="${KEYRING}" else # Clear signing environment variables for PRs @@ -50,7 +50,7 @@ pipeline { } stage('Deploy Snapshot') { when { - branch 'master' + branch 'main' } steps { sshagent(['projects-storage.eclipse.org-bot-ssh']) { diff --git a/README.md b/README.md index 4f6dad63a0..0070e0cd7a 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ [![Build m2e-core](https://github.com/eclipse-m2e/m2e-core/actions/workflows/maven.yml/badge.svg)](https://github.com/eclipse-m2e/m2e-core/actions/workflows/maven.yml) ![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/eclipse-m2e/m2e-core?label=Version&sort=semver) -[![GitHub license](https://img.shields.io/github/license/eclipse-m2e/m2e-core?label=License)](https://github.com/eclipse-m2e/m2e-core/blob/master/LICENSE) -[![Jenkins](https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.eclipse.org%2Fm2e%2Fjob%2Fm2e%2Fjob%2Fmaster%2F&label=Build)](https://ci.eclipse.org/m2e/job/m2e/) -![Jenkins tests](https://img.shields.io/jenkins/tests?jobUrl=https%3A%2F%2Fci.eclipse.org%2Fm2e%2Fjob%2Fm2e%2Fjob%2Fmaster%2F&label=Tests) +[![GitHub license](https://img.shields.io/github/license/eclipse-m2e/m2e-core?label=License)](https://github.com/eclipse-m2e/m2e-core/blob/main/LICENSE) +[![Jenkins](https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.eclipse.org%2Fm2e%2Fjob%2Fm2e%2Fjob%2Fmain%2F&label=Build)](https://ci.eclipse.org/m2e/job/m2e/) +![Jenkins tests](https://img.shields.io/jenkins/tests?jobUrl=https%3A%2F%2Fci.eclipse.org%2Fm2e%2Fjob%2Fm2e%2Fjob%2Fmain%2F&label=Tests) M2Eclipse provides tight integration for Apache Maven into the Eclipse IDE with the following features: * Rich editor for pom.xml files leveraging @@ -51,7 +51,7 @@ The variable `` has to be replaced by the current ver See [RELEASE_NOTES.md](RELEASE_NOTES.md) ## ⌨️ Contributing -[![Create Eclipse Development Environment for m2e](https://download.eclipse.org/oomph/www/setups/svg/m2e.svg)](https://www.eclipse.org/setups/installer/?url=https://raw.githubusercontent.com/eclipse-m2e/m2e-core/master/setup/m2eDevelopmentEnvironmentConfiguration.setup&show=true "Click to open Eclipse-Installer Auto Launch or drag into your running installer") +[![Create Eclipse Development Environment for m2e](https://download.eclipse.org/oomph/www/setups/svg/m2e.svg)](https://www.eclipse.org/setups/installer/?url=https://raw.githubusercontent.com/eclipse-m2e/m2e-core/main/setup/m2eDevelopmentEnvironmentConfiguration.setup&show=true "Click to open Eclipse-Installer Auto Launch or drag into your running installer")    or just    [![Clone to Eclipse IDE](https://mickaelistria.github.io/redirctToEclipseIDECloneCommand/cloneToEclipseBadge.png)](https://mickaelistria.github.io/redirctToEclipseIDECloneCommand/redirect.html) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 460548410e..4b2f166330 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -216,9 +216,9 @@ The connector for the `bnd-maven-plugin` and `maven-bundle-plugin`, which is inc The M2E Maven-Console now also supports tracking of so called _polyglot_ Maven-projects. Those are projects that don't have a standard `pom.xml` and whose Maven-model is instead created from another source. One prominent example in the Eclipse world are Eclipse-PDE projects that are build with Tycho(-pomless). Due to this new support, polyglot Maven projects now also benefit from the -[Improved links to JUnit test-reports and project file in the Console](https://github.com/eclipse-m2e/m2e-core/blob/master/RELEASE_NOTES.md#improved-links-to-junit-test-reports-and-project-pomxml-in-the-console-of-a-maven-build) +[Improved links to JUnit test-reports and project file in the Console](https://github.com/eclipse-m2e/m2e-core/blob/main/RELEASE_NOTES.md#improved-links-to-junit-test-reports-and-project-pomxml-in-the-console-of-a-maven-build) as well as the capability to -[Automatically launch and attach Remote-Application-Debugger when Maven plug-in starts a forked JVM that waits for a debugger](https://github.com/eclipse-m2e/m2e-core/blob/master/RELEASE_NOTES.md#automatically-launch-and-attach-remote-application-debugger-when-maven-plug-in-starts-a-forked-jvm-that-waits-for-a-debugger) introduced in previous releases. +[Automatically launch and attach Remote-Application-Debugger when Maven plug-in starts a forked JVM that waits for a debugger](https://github.com/eclipse-m2e/m2e-core/blob/main/RELEASE_NOTES.md#automatically-launch-and-attach-remote-application-debugger-when-maven-plug-in-starts-a-forked-jvm-that-waits-for-a-debugger) introduced in previous releases. ## 2.0.2 diff --git a/m2e-parent/pom.xml b/m2e-parent/pom.xml index b698432b31..e5abb198a8 100644 --- a/m2e-parent/pom.xml +++ b/m2e-parent/pom.xml @@ -119,6 +119,7 @@ META-INF/ECLIPSE_.SF jars/*.jar Eclipse-SourceReferences + *.MD true diff --git a/org.eclipse.m2e.editor.lemminx/HOWTO-DEV.md b/org.eclipse.m2e.editor.lemminx/HOWTO-DEV.md index 886e7e372f..e388a15918 100644 --- a/org.eclipse.m2e.editor.lemminx/HOWTO-DEV.md +++ b/org.eclipse.m2e.editor.lemminx/HOWTO-DEV.md @@ -14,7 +14,7 @@ In your development IDE, make sure the org.eclipse.m2e.editor.lemminx plugin is Note that this process needs to be performed after any Maven build: running `mvn verify` will restore the maven-lemminx.jar to the version that's defined in the pom.xml, overriding your changes. -## How to build m2e master with the latest builds from lemminx-maven +## How to build m2e main with the latest builds from lemminx-maven `mvn install` to install maven-lemminx then `mvn verify` on m2e-core does a nice part of the job for testing *from the IDE*. Unfortunately, it's currently a bit more complex for the Tycho build because of Git-based qualifiers and baseline replacement replacing the newly built bundle (which contains local lemminx-maven jar) by the baseline one because they have the exact same version. To avoid this replacement and get the latest lemminx-maven cascading to a newer org.eclipse.m2e.editor.lemminx bundle and so on, you need to make an extra commit somewhere under the `org.eclipse.m2e.editor.lemminx` bundle. In Eclipse Platform, there is usually a file named `forceQualifierUpdate.txt` that's committed and updated whenever we want to enforce usage of local build vs baseline. diff --git a/setup/m2e.setup b/setup/m2e.setup index 56a2939f8e..2cf28a97f9 100644 --- a/setup/m2e.setup +++ b/setup/m2e.setup @@ -20,7 +20,7 @@ source="http://www.eclipse.org/oomph/setup/BrandingInfo"> - https://raw.githubusercontent.com/eclipse-m2e/m2e-core/master/org.eclipse.m2e.core/m2eclipse.gif + https://raw.githubusercontent.com/eclipse-m2e/m2e-core/main/org.eclipse.m2e.core/m2eclipse.gif @@ -120,7 +120,7 @@ Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone. @@ -189,8 +189,8 @@ xsi:type="projects:ProjectsBuildTask" refresh="true" clean="true"/> - + diff --git a/setup/m2eDevelopmentEnvironmentConfiguration.setup b/setup/m2eDevelopmentEnvironmentConfiguration.setup index 0d48dcd757..8404716678 100644 --- a/setup/m2eDevelopmentEnvironmentConfiguration.setup +++ b/setup/m2eDevelopmentEnvironmentConfiguration.setup @@ -8,7 +8,7 @@ source="http://www.eclipse.org/oomph/setup/BrandingInfo"> - https://raw.githubusercontent.com/eclipse-m2e/m2e-core/master/org.eclipse.m2e.core/m2eclipse.gif + https://raw.githubusercontent.com/eclipse-m2e/m2e-core/main/org.eclipse.m2e.core/m2eclipse.gif @@ -26,7 +26,7 @@ name="m2e.development.environment.workspace" label="m2e Development Environment Workspace"> + href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='m2e']/@streams[name='main']"/> The m2e development environment workspace includes m2e-core and m2e-core-tests