diff options
author | Ed Merks | 2022-08-31 14:06:35 +0000 |
---|---|---|
committer | Ed Merks | 2022-08-31 14:06:35 +0000 |
commit | 5f3195fc6c6d10c4d1e19cdcbe89e965b0e5c278 (patch) | |
tree | f6d1f62f1f7ecf5c134683511276438c6439cce1 /releng | |
parent | 6827924871e4b5a3df8cdd97cfb2c7b7c6c4ca42 (diff) | |
download | org.eclipse.emf-5f3195fc6c6d10c4d1e19cdcbe89e965b0e5c278.tar.gz org.eclipse.emf-5f3195fc6c6d10c4d1e19cdcbe89e965b0e5c278.tar.xz org.eclipse.emf-5f3195fc6c6d10c4d1e19cdcbe89e965b0e5c278.zip |
[releng] Updates for Maven publishing with latest cbi p2 aggregator
Diffstat (limited to 'releng')
4 files changed, 26 insertions, 20 deletions
diff --git a/releng/org.eclipse.emf.releng/publish/aggr/.settings/org.eclipse.jdt.groovy.core.prefs b/releng/org.eclipse.emf.releng/publish/aggr/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index 1e68ed69f..000000000 --- a/releng/org.eclipse.emf.releng/publish/aggr/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -groovy.compiler.level=25 -groovy.script.filters=**/*.dsld,y,**/*.gradle,n diff --git a/releng/org.eclipse.emf.releng/publish/aggr/EMF.aggr b/releng/org.eclipse.emf.releng/publish/aggr/EMF.aggr index ba385b8ee..87c8da776 100644 --- a/releng/org.eclipse.emf.releng/publish/aggr/EMF.aggr +++ b/releng/org.eclipse.emf.releng/publish/aggr/EMF.aggr @@ -13,8 +13,6 @@ <bundles name="org.eclipse.emf.codegen.ecore.xtext.source"/> <bundles name="org.eclipse.emf.common"/> <bundles name="org.eclipse.emf.common.source"/> - <bundles name="org.eclipse.emf.converter"/> - <bundles name="org.eclipse.emf.converter.source"/> <bundles name="org.eclipse.emf.databinding"/> <bundles name="org.eclipse.emf.databinding.source"/> <bundles name="org.eclipse.emf.ecore"/> @@ -31,10 +29,6 @@ <bundles name="org.eclipse.emf.ecore.xmi.source"/> <bundles name="org.eclipse.emf.edit"/> <bundles name="org.eclipse.emf.edit.source"/> - <!-- - <bundles name="org.eclipse.emf.java"/> - <bundles name="org.eclipse.emf.java.source"/> - --> <bundles name="org.eclipse.emf.mapping"/> <bundles name="org.eclipse.emf.mapping.source"/> <bundles name="org.eclipse.emf.mapping.ecore2ecore"/> @@ -60,24 +54,20 @@ <bundles name="org.eclipse.xsd.edit"/> <bundles name="org.eclipse.xsd.edit.source"/> </repositories> + <mavenMappings namePattern="org\.eclipse\.(xsd.*|core\.resources|text).*" groupId="\$maven-groupId\$" artifactId="\$maven-artifactId\$"/> <mavenMappings namePattern="org.apache.ant" groupId="org.apache.ant" artifactId="ant"/> <mavenMappings namePattern="org.eclipse.ant.core" groupId="org.eclipse.platform" artifactId="org.eclipse.ant.core"/> <mavenMappings namePattern="org.eclipse.debug.(.*)" groupId="org.eclipse.platform" artifactId="org.eclipse.debug.$1"/> <mavenMappings namePattern="org.eclipse.core.(.*)" groupId="org.eclipse.platform" artifactId="org.eclipse.core.$1"/> - <mavenMappings namePattern="org.eclipse.equinox(.*)" groupId="org.eclipse.platform" artifactId="org.eclipse.equinox$1"/> - <mavenMappings namePattern="org.eclipse.osgi(.*)" groupId="org.eclipse.platform" artifactId="org.eclipse.osgi$1"/> - <mavenMappings namePattern="org.eclipse.text(.*)" groupId="org.eclipse.platform" artifactId="org.eclipse.text$1"/> <mavenMappings namePattern="org.apache.log4j" groupId="log4j" artifactId="log4j"/> <mavenMappings namePattern="org.antlr.runtime" groupId="org.antlr" artifactId="antlr-runtime" versionPattern="3.2" versionTemplate=".*"/> <mavenMappings namePattern="org.objectweb.asm" groupId="org.ow2.asm" artifactId="asm"/> - <mavenMappings namePattern="org.eclipse.xsd(.*)" groupId="org.eclipse.emf" artifactId="org.eclipse.xsd$1"/> </contributions> - <validationRepositories location="https://download.eclipse.org/eclipse/updates/4.14"/> - <validationRepositories location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.20.0"/> - <validationRepositories location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.1"/> - <validationRepositories location="https://download.eclipse.org/tools/orbit/downloads/latest-R"/> + <validationRepositories location="https://download.eclipse.org/releases/2022-09"/> </validationSets> <configurations architecture="x86_64"/> - <configurations operatingSystem="macosx" windowSystem="cocoa"/> <configurations operatingSystem="linux" windowSystem="gtk" architecture="x86_64"/> + <configurations operatingSystem="linux" windowSystem="gtk" architecture="aarch64"/> + <configurations operatingSystem="macosx" windowSystem="cocoa" architecture="x86_64"/> + <configurations operatingSystem="macosx" windowSystem="cocoa" architecture="aarch64"/> </aggregator:Aggregation> diff --git a/releng/org.eclipse.emf.releng/publish/aggr/EMF.aggran b/releng/org.eclipse.emf.releng/publish/aggr/EMF.aggran new file mode 100644 index 000000000..347b05c4f --- /dev/null +++ b/releng/org.eclipse.emf.releng/publish/aggr/EMF.aggran @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<analyzer:Analysis + xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:analyzer="https://www.eclipse.org/cbi/p2repo/2021/aggregator/analyzer" + aggregation="EMF.aggr#/"> + <contribution + contribution="EMF.aggr#//@validationSets[label='Main']/@contributions[label='EMF%20${version.emf}']"/> +</analyzer:Analysis> diff --git a/releng/org.eclipse.emf.releng/publish/pom.xml b/releng/org.eclipse.emf.releng/publish/pom.xml index 9a285532f..568944ec9 100644 --- a/releng/org.eclipse.emf.releng/publish/pom.xml +++ b/releng/org.eclipse.emf.releng/publish/pom.xml @@ -5,7 +5,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <version.tycho>1.7.0</version.tycho> + <version.tycho>2.7.3</version.tycho> <version.emf>2.22</version.emf> <p2.emf>https://download.eclipse.org/modeling/emf/emf/builds/release/${version.emf}</p2.emf> </properties> @@ -63,7 +63,7 @@ <repository> <id>cbi-aggregator</id> <layout>p2</layout> - <url>https://download.eclipse.org/cbi/updates/aggregator/headless/4.13/I20200625-1232</url> + <url>https://download.eclipse.org/cbi/updates/p2-aggregator/products/nightly/latest</url> </repository> </repositories> <executionEnvironment>JavaSE-11</executionEnvironment> @@ -94,10 +94,20 @@ <arch>x86_64</arch> </environment> <environment> + <os>macosx</os> + <ws>cocoa</ws> + <arch>aarch64</arch> + </environment> + <environment> <os>linux</os> <ws>gtk</ws> <arch>x86_64</arch> </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>aarch64</arch> + </environment> </environments> </configuration> </plugin> |