Skip to content

Commit b7ffe35

Browse files
Somi BiswasSomi Biswas
Somi Biswas
authored and
Somi Biswas
committed
Queue enforcer specific changes
1 parent de351e3 commit b7ffe35

File tree

46 files changed

+250
-47
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+250
-47
lines changed

‎assembly/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.1.2</version>
24+
<version>3.1.2.fdp.1</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎common/kvstore/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.1.2</version>
25+
<version>3.1.2.fdp.1</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/network-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.1.2</version>
25+
<version>3.1.2.fdp.1</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/network-shuffle/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.1.2</version>
25+
<version>3.1.2.fdp.1</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/network-yarn/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.1.2</version>
25+
<version>3.1.2.fdp.1</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/sketch/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.1.2</version>
25+
<version>3.1.2.fdp.1</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/tags/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.1.2</version>
25+
<version>3.1.2.fdp.1</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/unsafe/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.1.2</version>
25+
<version>3.1.2.fdp.1</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.1.2</version>
24+
<version>3.1.2.fdp.1</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎dev/create-release/release-build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ GIT_REF=${GIT_REF:-master}
8585
RELEASE_STAGING_LOCATION="https://dist.apache.org/repos/dist/dev/spark"
8686

8787
GPG="gpg -u $GPG_KEY --no-tty --batch --pinentry-mode loopback"
88-
NEXUS_ROOT=https://repository.apache.org/service/local/staging
88+
NEXUS_ROOT=https://jfrog.fkinternal.com/artifactory/maven_virtual/
8989
NEXUS_PROFILE=d63f592e7eac0 # Profile for Spark staging uploads
9090
BASE_DIR=$(pwd)
9191

‎dev/create-release/vote.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Signatures used for Spark RCs can be found in this file:
1818
https://dist.apache.org/repos/dist/dev/spark/KEYS
1919

2020
The staging repository for this release can be found at:
21-
https://repository.apache.org/content/repositories/orgapachespark-{repo_id}/
21+
https://jfrog.fkinternal.com/artifactory/maven_virtual/
2222

2323
The documentation corresponding to this release can be found at:
2424
https://dist.apache.org/repos/dist/dev/spark/{tag}-docs/

‎dev/make-distribution.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ export MAVEN_OPTS="${MAVEN_OPTS:--Xmx2g -XX:ReservedCodeCacheSize=1g}"
166166
# Store the command as an array because $MVN variable might have spaces in it.
167167
# Normal quoting tricks don't work.
168168
# See: http://mywiki.wooledge.org/BashFAQ/050
169-
BUILD_COMMAND=("$MVN" clean package -DskipTests $@)
169+
BUILD_COMMAND=("$MVN" clean package deploy -DskipTests $@)
170170

171171
# Actually build the jar
172172
echo -e "\nBuilding with..."

‎examples/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.1.2</version>
24+
<version>3.1.2.fdp.1</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎external/avro/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.1.2</version>
24+
<version>3.1.2.fdp.1</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/docker-integration-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.1.2</version>
25+
<version>3.1.2.fdp.1</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎external/kafka-0-10-assembly/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.1.2</version>
24+
<version>3.1.2.fdp.1</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kafka-0-10-sql/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.1.2</version>
24+
<version>3.1.2.fdp.1</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kafka-0-10-token-provider/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.1.2</version>
24+
<version>3.1.2.fdp.1</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kafka-0-10/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.1.2</version>
24+
<version>3.1.2.fdp.1</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kinesis-asl-assembly/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.1.2</version>
24+
<version>3.1.2.fdp.1</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kinesis-asl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>spark-parent_2.12</artifactId>
23-
<version>3.1.2</version>
23+
<version>3.1.2.fdp.1</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

‎external/spark-ganglia-lgpl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>spark-parent_2.12</artifactId>
23-
<version>3.1.2</version>
23+
<version>3.1.2.fdp.1</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

‎graphx/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.1.2</version>
24+
<version>3.1.2.fdp.1</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎hadoop-cloud/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.1.2</version>
25+
<version>3.1.2.fdp.1</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

‎launcher/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.1.2</version>
25+
<version>3.1.2.fdp.1</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

‎mllib-local/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.1.2</version>
24+
<version>3.1.2.fdp.1</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎mllib/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.1.2</version>
24+
<version>3.1.2.fdp.1</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎pom.xml

+31-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</parent>
2727
<groupId>org.apache.spark</groupId>
2828
<artifactId>spark-parent_2.12</artifactId>
29-
<version>3.1.2</version>
29+
<version>3.1.2.fdp.1</version>
3030
<packaging>pom</packaging>
3131
<name>Spark Project Parent POM</name>
3232
<url>http://spark.apache.org/</url>
@@ -279,6 +279,14 @@
279279
<!--
280280
This is used as a fallback when the first try fails.
281281
-->
282+
<id>flipkart-libs-snapshots-local</id>
283+
<url>https://jfrog.fkinternal.com/artifactory/maven_virtual</url>
284+
</repository>
285+
<repository>
286+
<id>flipkart-libs-release-local</id>
287+
<url>https://jfrog.fkinternal.com/artifactory/maven_virtual</url>
288+
</repository>
289+
<repository>
282290
<id>central</id>
283291
<name>Maven Repository</name>
284292
<url>https://repo.maven.apache.org/maven2</url>
@@ -306,6 +314,14 @@
306314
<enabled>false</enabled>
307315
</snapshots>
308316
</pluginRepository>
317+
<pluginRepository>
318+
<id>flipkart-libs-snapshots-local</id>
319+
<url>https://jfrog.fkinternal.com/artifactory/maven_virtual</url>
320+
</pluginRepository>
321+
<pluginRepository>
322+
<id>flipkart-libs-release-local</id>
323+
<url>https://jfrog.fkinternal.com/artifactory/maven_virtual</url>
324+
</pluginRepository>
309325
<pluginRepository>
310326
<id>central</id>
311327
<url>https://repo.maven.apache.org/maven2</url>
@@ -3316,8 +3332,8 @@
33163332
<id>snapshots-and-staging</id>
33173333
<properties>
33183334
<!-- override point for ASF staging/snapshot repos -->
3319-
<asf.staging>https://repository.apache.org/content/groups/staging/</asf.staging>
3320-
<asf.snapshots>https://repository.apache.org/content/repositories/snapshots/</asf.snapshots>
3335+
<asf.staging>https://jfrog.fkinternal.com/artifactory/maven_virtual</asf.staging>
3336+
<asf.snapshots>https://jfrog.fkinternal.com/artifactory/maven_virtual/</asf.snapshots>
33213337
</properties>
33223338

33233339
<pluginRepositories>
@@ -3383,4 +3399,16 @@
33833399
</properties>
33843400
</profile>
33853401
</profiles>
3402+
<distributionManagement>
3403+
<snapshotRepository>
3404+
<id>fk-jfrog-snapshot</id>
3405+
<name>libs-snapshot</name>
3406+
<url>https://jfrog.fkinternal.com/artifactory/maven_virtual</url>
3407+
</snapshotRepository>
3408+
<repository>
3409+
<id>fk-jfrog-release</id>
3410+
<name>libs-rel</name>
3411+
<url>https://jfrog.fkinternal.com/artifactory/maven_virtual</url>
3412+
</repository>
3413+
</distributionManagement>
33863414
</project>

‎repl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.1.2</version>
24+
<version>3.1.2.fdp.1</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎resource-managers/kubernetes/core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>spark-parent_2.12</artifactId>
23-
<version>3.1.2</version>
23+
<version>3.1.2.fdp.1</version>
2424
<relativePath>../../../pom.xml</relativePath>
2525
</parent>
2626

‎resource-managers/kubernetes/integration-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>spark-parent_2.12</artifactId>
23-
<version>3.1.2</version>
23+
<version>3.1.2.fdp.1</version>
2424
<relativePath>../../../pom.xml</relativePath>
2525
</parent>
2626

‎resource-managers/mesos/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>spark-parent_2.12</artifactId>
23-
<version>3.1.2</version>
23+
<version>3.1.2.fdp.1</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

‎resource-managers/yarn/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>spark-parent_2.12</artifactId>
23-
<version>3.1.2</version>
23+
<version>3.1.2.fdp.1</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

0 commit comments

Comments
 (0)