diff --git a/releng/org.eclipse.xsemantics.parent/README.txt b/releng/org.eclipse.xsemantics.parent/README.txt index 1b6469fa..7de35810 100644 --- a/releng/org.eclipse.xsemantics.parent/README.txt +++ b/releng/org.eclipse.xsemantics.parent/README.txt @@ -9,4 +9,13 @@ Contributors: Lorenzo Bettini - Initial contribution and API ******************************************************************************* -MAVEN_OPTS="-Xms40m -Xmx384m -XX:MaxPermSize=256m" \ No newline at end of file +To test a composite release locally, from the root folder + +mkdir -p ${HOME}/tmp/download-area + +mvn -f releng/org.eclipse.xsemantics.releng/pom.xml package \ + -DskipTests=true \ + -Dxtext.maven.skip=true \ + -Dcbi.jarsigner.skip=true \ + -Dxsemantics.download.area=${HOME}/tmp/download-area \ + -Prelease-composite,release-milestone \ No newline at end of file diff --git a/releng/org.eclipse.xsemantics.parent/ant/packaging-p2composite.ant b/releng/org.eclipse.xsemantics.parent/ant/packaging-p2composite.ant index d8f012ec..7b3543f8 100644 --- a/releng/org.eclipse.xsemantics.parent/ant/packaging-p2composite.ant +++ b/releng/org.eclipse.xsemantics.parent/ant/packaging-p2composite.ant @@ -1,22 +1,19 @@ + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + version=1 +metadata.repository.factory.order=compositeContent.xml,\! +artifact.repository.factory.order=compositeArtifacts.xml,\! + + + + + + + diff --git a/releng/org.eclipse.xsemantics.parent/pom.xml b/releng/org.eclipse.xsemantics.parent/pom.xml index e459bcbe..d0934521 100644 --- a/releng/org.eclipse.xsemantics.parent/pom.xml +++ b/releng/org.eclipse.xsemantics.parent/pom.xml @@ -64,6 +64,7 @@ Contributors: 1.8 2.33.0 ${xtext.version} + 2023-12 2.16.0 [3.9,4.0) 3.5.1 @@ -507,6 +508,30 @@ Contributors: ${maven-antrun-plugin.version} + + org.eclipse.tycho + tycho-p2-plugin + ${tycho-version} + + + true + + + + + org.eclipse.tycho.extras + tycho-eclipserun-plugin + ${tycho-version} + + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho-version} + @@ -622,7 +647,6 @@ Contributors: org.eclipse.tycho tycho-p2-plugin - ${tycho-version} attach-p2-metadata @@ -655,14 +679,6 @@ Contributors: - - org.eclipse.tycho - tycho-p2-repository-plugin - ${tycho-version} - - ${project.artifactId}-${qualifiedVersion} - - diff --git a/releng/org.eclipse.xsemantics.repository/pom.xml b/releng/org.eclipse.xsemantics.repository/pom.xml index 202f86f7..aff4f4dd 100644 --- a/releng/org.eclipse.xsemantics.repository/pom.xml +++ b/releng/org.eclipse.xsemantics.repository/pom.xml @@ -24,6 +24,8 @@ Contributors: eclipse-repository + ${xsemantics.updates.dir} + /xsemantics/${xsemantics.updates.dir} 1.23 http://download.eclipse.org/stats @@ -36,9 +38,12 @@ Contributors: org.eclipse.tycho tycho-p2-repository-plugin - ${tycho-version} ${project.artifactId}-${qualifiedVersion} + + ${p2.statsURL} + ${p2.mirrorsURL} + @@ -54,63 +59,30 @@ Contributors: - org.eclipse.tycho.extras - tycho-eclipserun-plugin - ${tycho-version} + org.codehaus.mojo + build-helper-maven-plugin + - - add-repo-properties + parse-version - eclipse-run + parse-version - package - - - -application - org.eclipse.wtp.releng.tools.addRepoProperties - - - -DartifactRepoDirectory=${project.build.directory}/repository - -Dp2MirrorsURL=${p2.mirrorsURL} - -Dp2StatsURI=${p2.statsURL} - -DstatsTrackedArtifacts=${p2.statsTrackedArtifacts} - -DstatsArtifactsSuffix=-${project.version} - - ${project.build.directory}/eclipserun-work-first - - - org.eclipse.wtp.releng.tools.feature - eclipse-feature - - - - - http://download.eclipse.org/webtools/releng/repository - p2 - - - http://download.eclipse.org/releases/neon - p2 - - - + + + + + org.eclipse.tycho.extras + tycho-eclipserun-plugin + add-p2-composite-repository eclipse-run - - verify + package -application @@ -119,17 +91,19 @@ Contributors: ${ant-files-path}/packaging-p2composite.ant p2.composite.add -Dsoftware.download.area=${xsemantics.download.area} - -Dupdates.dir=${xsemantics.updates.dir} + -Dupdates.dir=${updates.dir} -Dsite.label="${site.label}" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -DbuildQualifier=${buildQualifier} + -DparsedVersion.majorVersion=${parsedVersion.majorVersion} + -DparsedVersion.minorVersion=${parsedVersion.minorVersion} - 2021-12 + ${eclipse-version} p2 - https://download.eclipse.org/releases/2021-12 + https://download.eclipse.org/releases/${eclipse-version} @@ -158,8 +132,8 @@ Contributors: eclipse-plugin - org.eclipse.equinox.ds - eclipse-plugin + org.eclipse.rcp + eclipse-feature org.eclipse.core.net @@ -170,19 +144,9 @@ Contributors: - maven-antrun-plugin - ${maven-antrun-plugin.version} - - - - org.apache.ant - ant-compress - 1.4 - - copy-to-zips-download @@ -205,53 +169,6 @@ Contributors: run - - - unjar-artifacts - package - - - - - - - run - - - - - xz-artifacts - package - - run - - - - - - - - - - - remove-artifacts-xml - package - - run - - - - - - -