From 8fcfa30bfec8943eba6facee6be9b7c5fbce09d4 Mon Sep 17 00:00:00 2001
From: Radek Felcman <radek.felcman@oracle.com>
Date: Fri, 31 Jan 2020 09:21:50 +0100
Subject: [PATCH] Jenkins jobs - promotion fix (#697)

Jenkins jobs - promotion fix

This is fix for GPG signing used during promotion.

Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
---
 pom.xml.template  | 38 +++++++++++++++++++++++++++++++++-----
 uploadToNexus.xml |  7 ++++---
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/pom.xml.template b/pom.xml.template
index 0bcfe1de284..1c886eaeb6f 100644
--- a/pom.xml.template
+++ b/pom.xml.template
@@ -1,6 +1,27 @@
+<!--
+
+    Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0 which is available at
+    http://www.eclipse.org/legal/epl-2.0,
+    or the Eclipse Distribution License v. 1.0 which is available at
+    http://www.eclipse.org/org/documents/edl-v10.php.
+
+    SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.ee4j</groupId>
+    <artifactId>project</artifactId>
+    <version>1.0.5</version>
+  </parent>
+
   <groupId>@groupId@</groupId>
   <artifactId>@artifactId@</artifactId>
   <version>@version@</version>
@@ -8,15 +29,19 @@
   <name>@artifactName@</name>
   <description>EclipseLink build based upon Git transaction @git.hash@</description>
   <url>http://www.eclipse.org/eclipselink</url>
+
   <organization>
     <name>Eclipse.org - EclipseLink Project</name>
     <url>http://www.eclipse.org/eclipselink</url>
   </organization>
+
   <issueManagement>
     <system>bugzilla</system>
     <url>https://bugs.eclipse.org/bugs</url>
   </issueManagement>
+
   <inceptionYear>2007</inceptionYear>
+
   <mailingLists>
     <mailingList>
       <name>EclipseLink Developer List</name>
@@ -29,12 +54,13 @@
       <archive>http://dev.eclipse.org/mhonarc/lists/eclipselink-users</archive>
     </mailingList>
   </mailingLists>
+
   <licenses>
     <license>
-      <name>Eclipse Public License v1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
+      <name>Eclipse Public License v. 2.0</name>
+      <url>http://www.eclipse.org/legal/epl-v20.html</url>
       <distribution>repo</distribution>
-      <comments>Standard Eclipse Licence</comments>
+      <comments>Standard Eclipse License</comments>
     </license>
     <license>
       <name>Eclipse Distribution License v. 1.0</name>
@@ -43,10 +69,12 @@
       <comments>Standard Eclipse Distribution License</comments>
     </license>
   </licenses>
+
   <scm>
-    <connection>scm:git:http://git.eclipse.org/eclipselink/eclipselink.runtime.git</connection>
-    <url>http://git.eclipse.org/eclipselink/eclipselink.runtime.git</url>
+    <connection>scm:git:https://github.com/eclipse-ee4j/eclipselink.git</connection>
+    <url>https://github.com/eclipse-ee4j/eclipselink.git</url>
   </scm>
+
   <developers>
     <developer>
       <id>PeterKrogh</id>
diff --git a/uploadToNexus.xml b/uploadToNexus.xml
index 7907435f61a..30f111efbe3 100644
--- a/uploadToNexus.xml
+++ b/uploadToNexus.xml
@@ -1,4 +1,5 @@
 <!--/*******************************************************************************
+* Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
 * which accompanies this distribution.
@@ -64,12 +65,12 @@
              classpathref="maven-ant-tasks.classpath" />
 
     <!-- Tool version definitions -->
-    <property name="gpg.plugin.version"   value="1.4"/>
-    <property name="wagon.http.version"   value="2.4"/>
+    <property name="gpg.plugin.version"   value="1.6"/>
+    <property name="wagon.http.version"   value="3.3.3"/>
 
     <!-- The repository info of where maven artifacts will be uploaded -->
     <!--    Override value to change defaults                          -->
-    <property name="stagingId"   value="sonatype-nexus-staging"/>
+    <property name="stagingId"   value="ossrh"/>
     <property name="stagingURL"  value="https://oss.sonatype.org/service/local/staging/deploy/maven2"/>
     <property name="snapshotId"  value="sonatype-nexus-snapshots"/>
     <property name="snapshotURL" value="https://oss.sonatype.org/content/repositories/snapshots"/>