Skip to content

Commit 0e7d484

Browse files
committed
Move o.e.m2e.maven.runtime to m2e's git-repo root
and delete the now empty m2e-maven-runtime project. Since o.e.m2e.maven.runtime is the only remaining module in m2e-maven-runtime there is no need anymore to keep m2e-maven-runtime as its parent project.
1 parent e055c0a commit 0e7d484

File tree

18 files changed

+11
-53
lines changed

18 files changed

+11
-53
lines changed

.github/workflows/licensecheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ jobs:
1919
uses: eclipse/dash-licenses/.github/workflows/mavenLicenseCheck.yml@master
2020
with:
2121
projectId: technology.m2e
22-
setupScript: 'cd m2e-maven-runtime && mvn generate-resources'
22+
setupScript: 'cd org.eclipse.m2e.maven.runtime && mvn generate-resources'
2323
secrets:
2424
gitlabAPIToken: ${{ secrets.M2E_GITLAB_API_TOKEN }}

CONTRIBUTING.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Step by Step guide:
5757
3. Click *Next* .
5858
7. Press *Finish* on the *Confirmation* page will start the installation process.
5959
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.
60-
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*.
60+
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*.
6161
10. Remaining errors are resolved after a restart of Eclipse.
6262
11. Happy coding!
6363

@@ -70,10 +70,6 @@ Some tests are in a separate repository which is referenced as a Git submodule i
7070
* Use latest release of the Eclipse SDK or Eclipse IDE with the Plugin Development Environment installed.
7171
* Make sure m2e is installed in this IDE, including the "m2e PDE" feature,
7272
* _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
73-
* 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)
74-
* In many cases, this simplest workflow will be sufficient: Install latest m2e snapshot in your target-platform (can be your current IDE), or
75-
* 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
76-
* 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
7773
* Open the project modules you want to work on (right-click > Open project) and their dependencies; approve m2e connectors installation if prompted
7874
* Happy coding!
7975

Jenkinsfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ pipeline {
5858
archiveArtifacts artifacts: 'org.eclipse.m2e.repository/target/*.zip,\
5959
*/target/work/data/.metadata/.log,\
6060
m2e-core-tests/*/target/work/data/.metadata/.log,\
61-
m2e-maven-runtime/target/*.properties,\
6261
**/target/artifactcomparison/*'
6362
archiveArtifacts (artifacts: '**/target/products/*.zip,**/target/products/*.tar.gz', onlyIfSuccessful: true)
6463
junit '*/target/surefire-reports/TEST-*.xml,*/*/target/surefire-reports/TEST-*.xml'

m2e-maven-runtime/pom.xml

Lines changed: 0 additions & 30 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# To force a version qualifier update add the bug here
22
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.
33
Update build-qualifier because maven-runtime components now use again UTC+0-based qualifiers.
4+
Move o.e.m2e.maven.runtime to m2e's git-repo root
File renamed without changes.
File renamed without changes.

m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml renamed to org.eclipse.m2e.maven.runtime/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414

1515
<parent>
1616
<groupId>org.eclipse.m2e</groupId>
17-
<artifactId>m2e-maven-runtime</artifactId>
17+
<artifactId>m2e-parent</artifactId>
1818
<version>2.1.0-SNAPSHOT</version>
19+
<relativePath>../m2e-parent</relativePath>
1920
</parent>
2021

2122
<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
22-
<version>3.9.100-SNAPSHOT</version>
23+
<version>3.9.101-SNAPSHOT</version>
2324
<packaging>jar</packaging>
2425

2526
<name>M2E Embedded Maven Runtime (includes Incubating components)</name>

0 commit comments

Comments
 (0)