From e58911090660eb966ce30df7c46aa87f92519a23 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Wed, 1 Mar 2017 12:49:35 -0500 Subject: [PATCH] Add artifact name formatting used by autorelease As recommended by the autorelease project we're now requesting projects use a specific format for their definitions in their pom files. Please refer to the Trello link for further details. Trello: https://trello.com/c/EGYoCYXX Change-Id: I5a074b3f21e72283a8ad6dcd82f9dc6fbcf67fa6 Signed-off-by: Thanh Ha --- .../src/main/resources/archetype-resources/api/pom.xml | 3 +++ .../src/main/resources/archetype-resources/artifacts/pom.xml | 3 +++ .../src/main/resources/archetype-resources/cli/pom.xml | 3 +++ .../src/main/resources/archetype-resources/features/pom.xml | 4 +++- .../src/main/resources/archetype-resources/impl/pom.xml | 3 +++ .../src/main/resources/archetype-resources/it/pom.xml | 3 +++ .../src/main/resources/archetype-resources/karaf/pom.xml | 4 +++- .../src/main/resources/archetype-resources/pom.xml | 2 +- 8 files changed, 22 insertions(+), 3 deletions(-) diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/pom.xml index 0b331b7bbb..64c2bdcf9a 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/pom.xml @@ -19,5 +19,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${groupId} ${artifactId}-api ${version} + + ODL :: ${groupId} :: ${project.artifactId} bundle diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml index 6067f642e7..bb32798d06 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml @@ -23,6 +23,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${groupId} ${artifactId}-artifacts ${version} + + ODL :: ${groupId} :: ${project.artifactId} pom diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/pom.xml index c05d75c1f8..be72019f61 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/pom.xml @@ -23,6 +23,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${groupId} ${artifactId}-cli ${version} + + ODL :: ${groupId} :: ${project.artifactId} bundle diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml index c42c759ac1..ccd1f57206 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml @@ -22,7 +22,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL ${groupId} ${artifactId}-features ${version} - ${project.artifactId} + + ODL :: ${groupId} :: ${project.artifactId} 0.10.0-SNAPSHOT diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml index a4ede263f7..99b6a10166 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml @@ -23,6 +23,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${groupId} ${artifactId}-impl ${version} + + ODL :: ${groupId} :: ${project.artifactId} bundle diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml index 8785ff39b6..fe3d02136e 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml @@ -19,6 +19,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${groupId} ${artifactId}-it ${version} + + ODL :: ${groupId} :: ${project.artifactId} bundle diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml index e0d18c96e6..4bcb2b5dc7 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml @@ -20,7 +20,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL ${groupId} ${artifactId}-karaf ${version} - ${project.artifactId} + + ODL :: ${groupId} :: ${project.artifactId} odl-${artifactId}-ui diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml index bccc1a02ea..2f0c96c278 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL ${groupId} ${artifactId}-aggregator ${version} - ${artifactId} + ${artifactId} pom -- 2.36.6