Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move o.e.m2e.maven.runtime to m2e's git-repo root #1492

Merged
merged 2 commits into from
Jul 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/licensecheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ jobs:
uses: eclipse/dash-licenses/.github/workflows/mavenLicenseCheck.yml@master
with:
projectId: technology.m2e
setupScript: 'cd m2e-maven-runtime && mvn generate-resources'
setupScript: 'cd org.eclipse.m2e.maven.runtime && mvn generate-resources'
secrets:
gitlabAPIToken: ${{ secrets.M2E_GITLAB_API_TOKEN }}
6 changes: 1 addition & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Step by Step guide:
3. Click *Next* .
7. Press *Finish* on the *Confirmation* page will start the installation process.
8. The installer will download the selected Eclipse version, starts Eclipse and will perform all the additional steps (cloning the git repos, etc...). When the downloaded Eclispe started, the progress bar in the status bar shows the progress of the overall setup.
9. Once the *Executing startup task* job is finished you should have all the *m2-core*, *m2-core-tests* and *m2e-maven-runtime* projects imported into three working sets called *m2-core*, *m2-core-tests* and *m2e-maven-runtime*.
9. Once the *Executing startup task* job is finished you should have all the *m2-core* and *m2-core-tests* projects imported into three working sets called *m2-core* and *m2-core-tests*.
10. Remaining errors are resolved after a restart of Eclipse.
11. Happy coding!

Expand All @@ -70,10 +70,6 @@ Some tests are in a separate repository which is referenced as a Git submodule i
* Use latest release of the Eclipse SDK or Eclipse IDE with the Plugin Development Environment installed.
* Make sure m2e is installed in this IDE, including the "m2e PDE" feature,
* _File > Open Projects from Filesystem..._ , select the path to m2e-core Git repo and the relevant children projects you want to import; approve m2e connectors installation if prompted
* Depending on the task you're planning to work on, multiple workflows are available to configure the [target-platform](https://help.eclipse.org/2021-03/topic/org.eclipse.pde.doc.user/concepts/target.htm?cp=4_1_5)
* In many cases, this simplest workflow will be sufficient: Install latest m2e snapshot in your target-platform (can be your current IDE), or
* If you don't want to mix versions of m2e, open __target-platform/dev-worksace.target__ and _Set as Target-Platform_ from the editor, or
* In case you're working on the content of the `m2e-maven-runtime` folder, then run `mvn install -f m2e-maven-runtime/` after your changes to deploy them locally and then tweak the _target-platform/dev-worksace.target_ to reference the versions of those artifacts you build locally and reload this target platform
* Open the project modules you want to work on (right-click > Open project) and their dependencies; approve m2e connectors installation if prompted
* Happy coding!

Expand Down
1 change: 0 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ pipeline {
archiveArtifacts artifacts: 'org.eclipse.m2e.repository/target/*.zip,\
*/target/work/data/.metadata/.log,\
m2e-core-tests/*/target/work/data/.metadata/.log,\
m2e-maven-runtime/target/*.properties,\
**/target/artifactcomparison/*'
archiveArtifacts (artifacts: '**/target/products/*.zip,**/target/products/*.tar.gz', onlyIfSuccessful: true)
junit '*/target/surefire-reports/TEST-*.xml,*/*/target/surefire-reports/TEST-*.xml'
Expand Down
208 changes: 0 additions & 208 deletions m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml

This file was deleted.

1 change: 1 addition & 0 deletions org.eclipse.m2e.feature/forceQualifierUpdate.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# To force a version qualifier update add the bug here
Update build-qualifier because maven-runtime components currently use the committer's time-zone for their qualifier and don't align with the other projects that use UTC.
Update build-qualifier because maven-runtime components now use again UTC+0-based qualifiers.
Move o.e.m2e.maven.runtime to m2e's git-repo root
File renamed without changes.
File renamed without changes.
Loading
Loading