summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2018-06-14 14:38:08 -0400
committerStephan Herrmann2018-06-14 14:38:08 -0400
commit707d4e59743f5437391dc2e732473816938995fd (patch)
treed9633caef035fe99dbb76814a6270792a61dc63d
parent9d91b8f119d88c490901c254b2a0dfe059b6e161 (diff)
downloadorg.eclipse.objectteams-707d4e59743f5437391dc2e732473816938995fd.tar.gz
org.eclipse.objectteams-707d4e59743f5437391dc2e732473816938995fd.tar.xz
org.eclipse.objectteams-707d4e59743f5437391dc2e732473816938995fd.zip
Bug 510072: Scripts & tool for publishing to Maven Central should
migrate to releng git - update for 4.8.0 (from temporary locations during quiet week)
-rw-r--r--releng/EnrichPoms/CBIaggregator.sh12
-rw-r--r--releng/EnrichPoms/SDK4Mvn.aggr12
-rw-r--r--releng/EnrichPoms/properties.sh8
-rw-r--r--releng/EnrichPoms/sourceBundles.txt37
4 files changed, 18 insertions, 51 deletions
diff --git a/releng/EnrichPoms/CBIaggregator.sh b/releng/EnrichPoms/CBIaggregator.sh
index bf4778ad3..42413b74c 100644
--- a/releng/EnrichPoms/CBIaggregator.sh
+++ b/releng/EnrichPoms/CBIaggregator.sh
@@ -367,18 +367,6 @@ done < ${WORKSPACE}/sourceBundles.txt
# copy ecj-src from build output (NB: we are mapping from SDK version (4.x) back to ECJ version (3.x)):
/bin/cp ${DROPS4}/${SDK_BUILD_DIR}/ecjsrc-${SDK_VERSION}.jar org/eclipse/jdt/ecj/${ECJ_VERSION}/ecj-${ECJ_VERSION}-sources.jar
-# special hack for missing source bundle with several source folders with blanks:
-buildSourceJar platform/eclipse.platform.swt.git \
- bundles/org.eclipse.swt.tools \
- R4_7_3_a \
- org/eclipse/platform org.eclipse.swt.tools 3.106.0 \
- "JNI Generation" \
- "Mac Generation" \
- "Icon Exe" \
- "NativeStats" \
- "Mozilla Generation" \
- "JavadocBasher"
-
echo "========== Repo completed ========="
create_baseline
diff --git a/releng/EnrichPoms/SDK4Mvn.aggr b/releng/EnrichPoms/SDK4Mvn.aggr
index d224fa11b..85a8bea29 100644
--- a/releng/EnrichPoms/SDK4Mvn.aggr
+++ b/releng/EnrichPoms/SDK4Mvn.aggr
@@ -2,25 +2,25 @@
<aggregator:Aggregation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aggregator="http://www.eclipse.org/cbi/p2repo/2011/aggregator/1.1.0" label="SDK4Mvn" packedStrategy="UNPACK_AS_SIBLING" type="R" mavenResult="true" versionFormat="MavenRelease">
<validationSets label="main">
<contributions enabled="true" label="sdk">
- <repositories location="/home/data/httpd/download.eclipse.org/eclipse/updates/4.7/R-4.7.3a-201803300640/">
+ <repositories location="/home/data/httpd/download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC4a-201806110500/">
<mapRules xsi:type="aggregator:ExclusionRule" name="org.eclipse.e4.core.tools.feature.feature.group"/>
<mapRules xsi:type="aggregator:ExclusionRule" name="org.eclipse.e4.core.tools.feature.source.feature.group"/>
</repositories>
- <repositories location="/home/data/httpd/download.eclipse.org/eclipse/updates/4.7/R-4.7.3a-201803300640/">
+ <repositories location="/home/data/httpd/download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC4a-201806110500/">
<bundles name="org.eclipse.jdt.core.compiler.batch"/>
</repositories>
</contributions>
<contributions enabled="false" label="sdk_http">
- <repositories location="http://download.eclipse.org/eclipse/updates/4.7/R-4.7.3a-201803300640/">
+ <repositories location="http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC4a-201806110500/">
<mapRules xsi:type="aggregator:ExclusionRule" name="org.eclipse.e4.core.tools.feature.feature.group"/>
<mapRules xsi:type="aggregator:ExclusionRule" name="org.eclipse.e4.core.tools.feature.source.feature.group"/>
</repositories>
- <repositories location="http://download.eclipse.org/eclipse/updates/4.7/R-4.7.3a-201803300640/">
+ <repositories location="http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC4a-201806110500/">
<bundles name="org.eclipse.jdt.core.compiler.batch"/>
</repositories>
</contributions>
- <validationRepositories enabled="true" location="/home/data/httpd/download.eclipse.org/modeling/emf/emf/updates/2.13"/>
- <validationRepositories enabled="false" location="http://download.eclipse.org/modeling/emf/emf/updates/2.13"/>
+ <validationRepositories enabled="true" location="/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201805310718"/>
+ <validationRepositories enabled="false" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201805310718"/>
</validationSets>
<configurations operatingSystem="aix" windowSystem="gtk" architecture="ppc"/>
<configurations operatingSystem="aix" windowSystem="gtk" architecture="ppc64"/>
diff --git a/releng/EnrichPoms/properties.sh b/releng/EnrichPoms/properties.sh
index 7800167ab..95e0d317c 100644
--- a/releng/EnrichPoms/properties.sh
+++ b/releng/EnrichPoms/properties.sh
@@ -12,16 +12,16 @@
# ECLIPSE:
APP_NAME_P2DIRECTOR=org.eclipse.equinox.p2.director
DROPS4=/home/data/httpd/download.eclipse.org/eclipse/downloads/drops4
-SDK_BUILD_DIR=R-4.7.3a-201803300640
-SDK_VERSION=4.7.3a
+SDK_BUILD_DIR=S-4.8RC4a-201806110500
+SDK_VERSION=4.8RC4a
FILE_ECLIPSE=${DROPS4}/${SDK_BUILD_DIR}/eclipse-SDK-${SDK_VERSION}-linux-gtk-x86_64.tar.gz
# JDT / ECJ:
-ECJ_VERSION=3.13.102
+ECJ_VERSION=3.14.0
# AGGREGATOR:
IU_AGG_PRODUCT=org.eclipse.cbi.p2repo.cli.product
-URL_AGG_UPDATES=http://download.eclipse.org/cbi/updates/aggregator/headless/4.6/I20170329-0008
+URL_AGG_UPDATES=http://download.eclipse.org/cbi/updates/aggregator/headless/4.8/I20180518-0759
# LOCAL TOOLS:
LOCAL_TOOLS=${WORKSPACE}/tools
diff --git a/releng/EnrichPoms/sourceBundles.txt b/releng/EnrichPoms/sourceBundles.txt
index cd3f04bf4..659998e06 100644
--- a/releng/EnrichPoms/sourceBundles.txt
+++ b/releng/EnrichPoms/sourceBundles.txt
@@ -1,37 +1,16 @@
platform/eclipse.platform.team.git \
bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64 \
- R4_7_3_a \
- org/eclipse/platform org.eclipse.core.net.win32.x86_64 1.1.0
+ S4_8_0_RC4a \
+ org/eclipse/platform org.eclipse.core.net.win32.x86_64 1.1.100
platform/eclipse.platform.team.git \
bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86 \
- R4_7_3_a \
- org/eclipse/platform org.eclipse.core.net.win32.x86 1.1.0
+ S4_8_0_RC4a \
+ org/eclipse/platform org.eclipse.core.net.win32.x86 1.1.100
platform/eclipse.platform.team.git \
bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64 \
- R4_7_3_a \
- org/eclipse/platform org.eclipse.core.net.linux.x86_64 1.2.0
+ S4_8_0_RC4a \
+ org/eclipse/platform org.eclipse.core.net.linux.x86_64 1.2.100
platform/eclipse.platform.team.git \
bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86 \
- R4_7_3_a \
- org/eclipse/platform org.eclipse.core.net.linux.x86 1.2.0
-platform/eclipse.platform.releng.git \
- bundles/org.eclipse.releng.tools \
- R4_7_3_a \
- org/eclipse/platform org.eclipse.releng.tools 3.9.100
-platform/eclipse.platform.releng.git \
- bundles/org.eclipse.pde.tools.versioning \
- R4_7_3_a \
- org/eclipse/pde org.eclipse.pde.tools.versioning 1.0.200
-platform/eclipse.platform.git \
- update/org.eclipse.update.core \
- R4_7_3_a \
- org/eclipse/platform org.eclipse.update.core 3.2.800 \
- schema
-platform/eclipse.platform.swt.git \
- bundles/org.eclipse.swt.tools.spies \
- R4_7_3_a \
- org/eclipse/platform org.eclipse.swt.tools.spies 3.106.0
-equinox/rt.equinox.framework.git \
- bundles/org.eclipse.osgi.compatibility.plugins \
- R4_7_3_a \
- org/eclipse/platform org.eclipse.osgi.compatibility.plugins 1.1.0
+ S4_8_0_RC4a \
+ org/eclipse/platform org.eclipse.core.net.linux.x86 1.2.100