Bug 406557 - Allow exporting maven2 repository as -SNAPSHOT
Change-Id: I39b263aab2c82ec671b0dddd4db16780b2fcad4f
diff --git a/releng/EnrichPoms/SDK4Mvn.aggr b/releng/EnrichPoms/SDK4Mvn.aggr
index f42a518..eaa7402 100644
--- a/releng/EnrichPoms/SDK4Mvn.aggr
+++ b/releng/EnrichPoms/SDK4Mvn.aggr
@@ -2,20 +2,20 @@
<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.10-I-builds/I20181023-1200">
+ <repositories location="/home/data/httpd/download.eclipse.org/eclipse/updates/4.10-I-builds/I20181031-1800">
<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.10-I-builds/I20181023-1200">
+ <repositories location="/home/data/httpd/download.eclipse.org/eclipse/updates/4.10-I-builds/I20181031-1800">
<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.10-I-builds/I20181023-1200">
+ <repositories location="http://download.eclipse.org/eclipse/updates/4.10-I-builds/I20181031-1800">
<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.10-I-builds/I20181023-1200">
+ <repositories location="http://download.eclipse.org/eclipse/updates/4.10-I-builds/I20181031-1800">
<bundles name="org.eclipse.jdt.core.compiler.batch"/>
</repositories>
</contributions>
@@ -31,13 +31,13 @@
<configurations operatingSystem="win32" windowSystem="win32" architecture="x86"/>
<configurations operatingSystem="win32" windowSystem="win32" architecture="x86_64"/>
<configurations/>
- <mavenMappings namePattern="(org\.eclipse\.jdt)\.core\.compiler\.batch" groupId="$1" artifactId="ecj"/>
- <mavenMappings namePattern="(org\.eclipse\.jdt)(.*)" groupId="$1" artifactId="$1$2"/>
- <mavenMappings namePattern="(org\.eclipse\.pde)(.*)" groupId="$1" artifactId="$1$2"/>
+ <mavenMappings namePattern="(org\.eclipse\.jdt)\.core\.compiler\.batch" groupId="$1" artifactId="ecj" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.(.*)" versionTemplate="$1.$2.$3-SNAPSHOT-$4"/>
+ <mavenMappings namePattern="(org\.eclipse\.jdt)(.*)" groupId="$1" artifactId="$1$2" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.(.*)" versionTemplate="$1.$2.$3-SNAPSHOT-$4"/>
+ <mavenMappings namePattern="(org\.eclipse\.pde)(.*)" groupId="$1" artifactId="$1$2" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.(.*)" versionTemplate="$1.$2.$3-SNAPSHOT-$4"/>
<mavenMappings namePattern="(org.eclipse.jetty)(.*)" groupId="$1" artifactId="$1$2"/>
<mavenMappings namePattern="(org.eclipse.ecf)(.*)" groupId="$1" artifactId="$1$2"/>
<mavenMappings namePattern="(org.eclipse.emf)(.*)" groupId="$1" artifactId="$1$2"/>
- <mavenMappings namePattern="(org\.eclipse)(.*)$" groupId="$1.platform" artifactId="$1$2"/>
+ <mavenMappings namePattern="(org\.eclipse)(.*)$" groupId="$1.platform" artifactId="$1$2" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.(.*)" versionTemplate="$1.$2.$3-SNAPSHOT-$4"/>
<mavenMappings namePattern="com\.ibm\.icu" groupId="com.ibm.icu" artifactId="icu4j" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
<mavenMappings namePattern="(com\.jcraft)\.(.*)" groupId="$1" artifactId="$2"/>
<mavenMappings namePattern="com\.sun\.el" groupId="org.eclipse.jetty.orbit" artifactId="com.sun.el"/>
diff --git a/releng/EnrichPoms/properties.sh b/releng/EnrichPoms/properties.sh
index 33ba094..571b50c 100644
--- a/releng/EnrichPoms/properties.sh
+++ b/releng/EnrichPoms/properties.sh
@@ -12,12 +12,12 @@
# ECLIPSE:
APP_NAME_P2DIRECTOR=org.eclipse.equinox.p2.director
DROPS4=/home/data/httpd/download.eclipse.org/eclipse/downloads/drops4
-SDK_BUILD_DIR=I20181023-1200
-SDK_VERSION=I20181023-1200
+SDK_BUILD_DIR=I20181031-1800
+SDK_VERSION=I20181031-1800
FILE_ECLIPSE=${DROPS4}/${SDK_BUILD_DIR}/eclipse-SDK-${SDK_VERSION}-linux-gtk-x86_64.tar.gz
# JDT / ECJ:
-ECJ_VERSION=3.15.1
+ECJ_VERSION=3.16.0-SNAPSHOT-I20181031-1800
# AGGREGATOR:
IU_AGG_PRODUCT=org.eclipse.cbi.p2repo.cli.product
diff --git a/releng/EnrichPoms/sourceBundles.txt b/releng/EnrichPoms/sourceBundles.txt
index d3eb1f1..048b716 100644
--- a/releng/EnrichPoms/sourceBundles.txt
+++ b/releng/EnrichPoms/sourceBundles.txt
@@ -1,16 +1,16 @@
platform/eclipse.platform.team.git \
bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64 \
R4_9 \
- org/eclipse/platform org.eclipse.core.net.win32.x86_64 1.1.200
+ org/eclipse/platform org.eclipse.core.net.win32.x86_64 1.1.300
platform/eclipse.platform.team.git \
bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86 \
R4_9 \
- org/eclipse/platform org.eclipse.core.net.win32.x86 1.1.200
+ org/eclipse/platform org.eclipse.core.net.win32.x86 1.1.300
platform/eclipse.platform.team.git \
bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64 \
R4_9 \
- org/eclipse/platform org.eclipse.core.net.linux.x86_64 1.2.200
+ org/eclipse/platform org.eclipse.core.net.linux.x86_64 1.2.300
platform/eclipse.platform.team.git \
bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86 \
R4_9 \
- org/eclipse/platform org.eclipse.core.net.linux.x86 1.2.200
+ org/eclipse/platform org.eclipse.core.net.linux.x86 1.2.300