From 5452882748217c75ec90940427b27b1f37db02e4 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sun, 15 Sep 2024 17:37:05 +0200 Subject: [PATCH] [TEMP] Use own version of new workflows and add parent-pom changes --- .github/workflows/pr-checks.yml | 2 +- .github/workflows/version-increments.yml | 6 +- eclipse-platform-parent/pom.xml | 1259 ++++++++++++++++++++++ pom.xml | 2 +- 4 files changed, 1264 insertions(+), 5 deletions(-) create mode 100644 eclipse-platform-parent/pom.xml diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 2e2d4e4903..f4f42455e3 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -15,7 +15,7 @@ jobs: check-merge-commits: uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkMergeCommits.yml@master check-versions: - uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkVersions.yml@master + uses: HannesWell/eclipse.platform.releng.aggregator/.github/workflows/checkVersions.yml@master with: botName: Eclipse PDE Bot botMail: eclipse-pde-bot@eclipse.org diff --git a/.github/workflows/version-increments.yml b/.github/workflows/version-increments.yml index 1052fe62e6..1d4a77f464 100644 --- a/.github/workflows/version-increments.yml +++ b/.github/workflows/version-increments.yml @@ -7,8 +7,8 @@ on: jobs: publish-version-check-results: - uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/publishVersionCheckResults.yml@master + uses: HannesWell/eclipse.platform.releng.aggregator/.github/workflows/publishVersionCheckResults.yml@master with: - botGithubId: eclipse-pde-bot + botGithubId: HannesWell secrets: - githubBotPAT: ${{ secrets.PDE_BOT_PAT }} + githubBotPAT: ${{ secrets.HANNESWELL_PAT }} diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml new file mode 100644 index 0000000000..e394025d82 --- /dev/null +++ b/eclipse-platform-parent/pom.xml @@ -0,0 +1,1259 @@ + + + + 4.0.0 + org.eclipse + eclipse-platform-parent + 4.34.0-SNAPSHOT + pom + + + 3.9.0 + + + + false + yyyyMMdd-HHmm + false + ${maven.build.timestamp} + I + ${buildType}${buildTimestamp} + + 2024-12 + + 4.34 + 4.34 + + 4.0.9 + + 1.5.0 + 3.5.0 + + + https://download.eclipse.org/eclipse/updates/4.34-I-builds/ + + https://download.eclipse.org/eclipse/updates/4.34-I-builds + + + https://repo.eclipse.org/content/repositories/tycho-snapshots/ + + UTF-8 + https://repo.eclipse.org/content/repositories/eclipse-staging/ + 3.39.0.v20240820-0604 + + + https://repo.eclipse.org/content/repositories/cbi/ + https://repo.eclipse.org/content/repositories/cbi-snapshots/ + + https://repo.eclipse.org/content/repositories/cbi-releases/ + + + + This_URL_set_in_build-individual-bundles_profile + + + false + + + ignore + + 'v'yyyyMMdd-HHmm + + false + + false + + BREE + + true + all + https://download.eclipse.org/eclipse/updates/4.33/R-4.33-202409030240/ + + + + + + + + + + + + + 17 + false + false + ${project.build.directory}/compilelogs + + + + Eclipse Foundation + https://www.eclipse.org/ + + + + GitHub + https://github.com/eclipse-platform/.github/issues + + + + + repo.eclipse.org + Eclipse Repository - Releases + https://repo.eclipse.org/content/repositories/eclipse-releases/ + + + repo.eclipse.org + Eclipse Repository - Snapshots + https://repo.eclipse.org/content/repositories/eclipse-snapshots/ + + + + + + + tycho-snapshots + ${tycho-snapshot-repo.url} + + true + + + true + + + + + cbi-jdt + ${cbi-jdt-repo.url} + + true + + + true + + + + cbi-snapshots + ${cbi-snapshots-repo.url} + + true + + + + cbi-releases + ${cbi-releases-repo.url} + + true + + + true + + + + eclipse + ${eclipse-repo.url} + + true + + + true + + + + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + + + org.eclipse.tycho + target-platform-configuration + + + + org.eclipse + eclipse-sdk-prereqs + 4.34.0-SNAPSHOT + + + + + linux + gtk + x86_64 + + + linux + gtk + ppc64le + + + linux + gtk + aarch64 + + + win32 + win32 + x86_64 + + + win32 + win32 + aarch64 + + + macosx + cocoa + x86_64 + + + macosx + cocoa + aarch64 + + + + + + true + + + + + + org.eclipse.tycho + tycho-source-plugin + + + false + + + + + plugin-source + + plugin-source + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + filter-resources + + resources + + process-resources + + ${project.build.directory}/resources + \ + + + + saveproperties + + ${project.build.directory} + true + + + saveproperties + true + + + + validate + + copy-resources + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.5.0 + + + enforce-maven + + enforce + + + + + 3.9.0 + + + + + + + + org.eclipse.tycho.extras + tycho-p2-extras-plugin + ${tycho.version} + + + ${previous-release.baseline} + + zip + + + + compare-attached-artifacts-with-release + + compare-version-with-baselines + + + ${compare-version-with-baselines.skip} + + + + + + org.eclipse.tycho + tycho-apitools-plugin + ${tycho.version} + + + generate + + generate + + + ${project.artifactId}_${qualifiedVersion} + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-dependency-plugin + 3.8.0 + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.version} + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.3 + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho.version} + + + org.eclipse.jdt + ecj + ${cbi-ecj-version} + + + + + -verbose + -enableJavadoc + -encoding + ${project.build.sourceEncoding} + -proceedOnError + + xml + ${compileLogDir} + true + + **/package.html + + true + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + org.eclipse.tycho + tycho-buildtimestamp-jgit + ${tycho.version} + + + org.eclipse.tycho.extras + tycho-sourceref-jgit + ${tycho.version} + + + + jgit + false + + pom.xml + .polyglot.build.properties + .gitignore + + ${jgit.dirtyWorkingTree-platformDefault} + + true + + + ${tycho.addMavenDescriptor} + + ${tycho.mapP2Dependencies} + + + ${project.build.directory} + + .api_description + + + + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho.version} + + true + ${surefire.testArgLine} ${surefire.platformSystemProperties} ${surefire.systemProperties} ${surefire.moduleProperties} ${surefire.securityProperties} + true + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho.version} + + true + + false + + false + + + + org.eclipse.tycho + tycho-p2-director-plugin + ${tycho.version} + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho.version} + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho.version} + + warnCommon + true + ${compileLogDir} + + + ${comparator.repo} + + + + META-INF/ECLIPSE_.RSA + META-INF/ECLIPSE_.SF + META-INF/CODESIGN.RSA + META-INF/CODESIGN.SF + + true + + + + org.eclipse.tycho + tycho-versions-plugin + ${tycho.version} + + + org.apache.maven.plugins + maven-assembly-plugin + 3.7.1 + + + org.apache.maven.plugins + maven-clean-plugin + 3.4.0 + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + + org.codehaus.mojo + xml-maven-plugin + 1.1.0 + + + org.apache.maven.plugins + maven-toolchains-plugin + 3.2.0 + + + org.codehaus.mojo + build-helper-maven-plugin + 3.6.0 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.10.0 + + 17 + true + reference,html,syntax + true + true + true + en + UTF-8 + UTF-8 + true + + https://docs.osgi.org/javadoc/osgi.core/8.0.0/ + https://docs.osgi.org/javadoc/osgi.cmpn/8.0.0/ + https://docs.osgi.org/javadoc/osgi.enterprise/7.0.0/ + + + + noimplement + a + Restriction: + + + noextend + a + Restriction: + + + noreference + a + Restriction: + + + noinstantiate + a + Restriction: + + + nooverride + a + Restriction: + + + TrackedGetter + cm + TrackedGetter + + + model + X + EMF generated tag + + + generated + X + EMF generated tag + + + ordered + X + EMF generated tag + + + Immutable + t + + + + implNote + a + Implementation Note:]]> + + + implSpec + a + Implementation Requirements: + + + category + a + Category: + + + provisional + a + Provisional: + + + jniclass + a + JNI Class: + + + ThreadSafe + a + Thread Safe: + + + issue + a + Issue: + + + + + + org.osgi + org.osgi.annotation.bundle + 2.0.0 + + + org.osgi + org.osgi.annotation.versioning + 1.1.2 + + + org.osgi + org.osgi.service.component.annotations + 1.5.0 + + + org.eclipse.pde + org.eclipse.pde.api.tools.annotations + 1.2.0 + + + + javax.inject + javax.inject + 1 + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + + + + + + + java23patch + + 'v'yyyyMMdd-HHmm'_BETA_JAVA23' + + org.eclipse.jdt + + + + 3.19.600.v20240827-1800 + + [3.19.600.v20240827-1800,3.19.649.v20241205-1800) + + https://download.eclipse.org/eclipse/updates/4.33/R-4.33-202409030240/ + + + + eclipse-p2-repo-java23patch + https://download.eclipse.org/eclipse/updates/4.33/R-4.33-202409030240/ + p2 + + + + + build-individual-bundles + + + + !aggregatorBuild + + + + + https://download.eclipse.org/eclipse/updates/4.34-I-builds + + + + eclipse + ${eclipse-p2-repo.url} + p2 + + + + + eclipse-sign + + + + org.eclipse.cbi.maven.plugins + eclipse-jarsigner-plugin + ${cbi-plugins.version} + + + sign + + sign + + verify + + + + DO_NOT_RESIGN + ${defaultSigning-excludeInnerJars} + + 120000 + + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho.version} + + + p2-metadata + + p2-metadata + + verify + + + + + + + + bree-libs + + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho.version} + + + ${tycho.useJDK} + + + + + + + + partial-build + + + eclipse-sdk-repo.url + + + + + eclipse-sdk-repo + ${eclipse-sdk-repo.url} + p2 + + + + + api-check + + false + + + + + org.eclipse.tycho + tycho-apitools-plugin + ${tycho.version} + + + verify + + verify + + + + + ${previous-release.baseline} + + + ${skipAPIAnalysis} + false + ${compileLogDir} + true + ${printApiMessages} + + + + + + + + + + fast-version-check + + + + org.apache.maven.plugins + maven-antrun-plugin + + + set-skip-properties + + run + + generate-sources + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + org.eclipse.tycho + tycho-packaging-plugin + + + package-plugin-placeholder + + package-plugin + + generate-sources + + ${skip.packaging.plugin} + false + + + + package-feature-placeholder + + package-feature + + generate-sources + + ${skip.packaging.feature} + + + + + + org.eclipse.tycho + tycho-p2-plugin + + + generate-p2-metadata + + p2-metadata + + generate-sources + + disable + + + + + + org.eclipse.tycho.extras + tycho-p2-extras-plugin + + + compare-artifact-version-with-release + + compare-version-with-baselines + + generate-sources + + ${skip.version.check} + ** + + + + + + + + + + update-branding-plugins-about.mappings + + + ${basedir}/about.mappings + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + process-about.mappings + prepare-package + + ${project.build.directory} + true + + + ${basedir} + + about.mappings + + true + + + + + copy-resources + + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + + ${project.build.directory} + + about.mappings + + + + + + + + + + + coverage + + + + ${project.basedir}/../target/jacoco.exec + ${jacoco.destFile} + + + + + org.jacoco + jacoco-maven-plugin + 0.8.12 + + + jacoco-agent + + prepare-agent + + + + + true + + + + + + + + spotbugs + + + + com.github.spotbugs + spotbugs-maven-plugin + 4.8.6.3 + + ${java.version} + true + Max + 2000 + medium + false + spotbugs/spotbugs-exclude.xml + + + + analyze-compile + compile + + check + + + + + + + + + + pmd + + + + org.apache.maven.plugins + maven-pmd-plugin + 3.25.0 + + + ${java.version} + true + false + xml + pmd/eclipse_ruleset.xml + + 100 + true + + + + analyze-compile + compile + + check + + + + + + + + + + checkstyle + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.5.0 + + true + false + checkstyle/checkstyle.xml + + + + analyze-compile + compile + + check + + + + + + + + + + macos + + + mac + + + + -XstartOnFirstThread + + + + + jdk9-or-newer + + [9,) + + + --add-modules=ALL-SYSTEM + + + + jdk18-or-newer + + [18,) + + + -Djava.security.manager=allow + + + + javadoc + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + package + + jar + + + ${failOnJavadocErrors} + true + + + + + + + + + + scm:git:https://github.com/eclipse-platform/eclipse.platform.releng.aggregator.git + + diff --git a/pom.xml b/pom.xml index 8eeba7dbad..4e2f720e8b 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse eclipse-platform-parent 4.34.0-SNAPSHOT - ../eclipse-platform-parent + eclipse-platform-parent org.eclipse.pde