From 6d3d25898f858e8d0b1e32ca87d8c50acd8425a5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20de=20Talhou=C3=ABt?= Date: Fri, 7 Oct 2016 12:22:25 -0400 Subject: [PATCH] Clean-up archetype MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Remove all legacy archetypes to only provide one and complete archetype. This will avoid confusion on which archetype to use, and will also avoid using deprecated things, as some of those archetypes aren't up-to-date. - remove opendaylight-configfile-archetype - remove odl-model-project - remove opendaylight-karaf-distro - remove opendaylight-karaf-features Change-Id: I3aebfff60a0f27052a684583b4cd085e8105e58e Signed-off-by: Alexis de Talhouët --- .../archetypes/odl-model-project/pom.xml | 16 -- .../META-INF/maven/archetype-metadata.xml | 13 -- .../resources/archetype-resources/pom.xml | 170 ------------------ .../projects/basic/archetype.properties | 5 - .../test/resources/projects/basic/goal.txt | 0 .../opendaylight-configfile-archetype/pom.xml | 18 -- .../META-INF/maven/archetype-metadata.xml | 16 -- .../resources/archetype-resources/pom.xml | 76 -------- .../src/main/resources/80-__repoName__.xml | 78 -------- .../projects/basic/archetype.properties | 6 - .../test/resources/projects/basic/goal.txt | 0 .../pom.xml | 19 -- .../META-INF/maven/archetype-metadata.xml | 8 - .../resources/archetype-resources/pom.xml | 85 --------- .../projects/basic/archetype.properties | 6 - .../test/resources/projects/basic/goal.txt | 0 .../opendaylight-karaf-features/pom.xml | 17 -- .../META-INF/maven/archetype-metadata.xml | 14 -- .../resources/archetype-resources/pom.xml | 127 ------------- .../src/main/resources/features.xml | 99 ---------- .../projects/basic/archetype.properties | 6 - .../test/resources/projects/basic/goal.txt | 0 opendaylight/archetypes/pom.xml | 10 +- 23 files changed, 3 insertions(+), 786 deletions(-) delete mode 100644 opendaylight/archetypes/odl-model-project/pom.xml delete mode 100644 opendaylight/archetypes/odl-model-project/src/main/resources/META-INF/maven/archetype-metadata.xml delete mode 100644 opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml delete mode 100644 opendaylight/archetypes/odl-model-project/src/test/resources/projects/basic/archetype.properties delete mode 100644 opendaylight/archetypes/odl-model-project/src/test/resources/projects/basic/goal.txt delete mode 100644 opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml delete mode 100644 opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml delete mode 100644 opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/archetype-resources/pom.xml delete mode 100644 opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/archetype-resources/src/main/resources/80-__repoName__.xml delete mode 100644 opendaylight/archetypes/opendaylight-configfile-archetype/src/test/resources/projects/basic/archetype.properties delete mode 100644 opendaylight/archetypes/opendaylight-configfile-archetype/src/test/resources/projects/basic/goal.txt delete mode 100644 opendaylight/archetypes/opendaylight-karaf-distro-archetype/pom.xml delete mode 100644 opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml delete mode 100644 opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml delete mode 100644 opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/test/resources/projects/basic/archetype.properties delete mode 100644 opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/test/resources/projects/basic/goal.txt delete mode 100644 opendaylight/archetypes/opendaylight-karaf-features/pom.xml delete mode 100644 opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/META-INF/maven/archetype-metadata.xml delete mode 100644 opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/pom.xml delete mode 100644 opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/src/main/resources/features.xml delete mode 100644 opendaylight/archetypes/opendaylight-karaf-features/src/test/resources/projects/basic/archetype.properties delete mode 100644 opendaylight/archetypes/opendaylight-karaf-features/src/test/resources/projects/basic/goal.txt diff --git a/opendaylight/archetypes/odl-model-project/pom.xml b/opendaylight/archetypes/odl-model-project/pom.xml deleted file mode 100644 index f7413a08ae..0000000000 --- a/opendaylight/archetypes/odl-model-project/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - - org.opendaylight.controller.archetypes - archetypes-parent - 0.5.0-SNAPSHOT - - - odl-model-project - 1.5.0-SNAPSHOT - maven-archetype - odl-model-project - - diff --git a/opendaylight/archetypes/odl-model-project/src/main/resources/META-INF/maven/archetype-metadata.xml b/opendaylight/archetypes/odl-model-project/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index 391776bb74..0000000000 --- a/opendaylight/archetypes/odl-model-project/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - src/main/yang - - **/*.yang - - - - diff --git a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml deleted file mode 100644 index fb5042e215..0000000000 --- a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - 4.0.0 - ${artifactId} - ${groupId} - ${version} - bundle - - UTF-8 - http://nexus.opendaylight.org/content - opendaylight.release - opendaylight.release - 1.1.0-SNAPSHOT - 0.10.0-SNAPSHOT - 2.3.7 - - - scm:git:http://git.opendaylight.org/gerrit/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main - - - - - - org.apache.felix - maven-bundle-plugin - ${bundle.plugin.version} - true - - - ${project.groupId}.${project.artifactId} - - ${project.basedir}/META-INF - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - true - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8.1 - - maven - - - - - aggregate - - site - - - - - org.opendaylight.yangtools - yang-maven-plugin - ${yang.version} - - - - generate-sources - - - src/main/yang - - - org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl - target/generated-sources/sal - - - false - - - - - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - generate-sources - - add-source - - - - target/generated-sources/sal - - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.opendaylight.yangtools - yang-maven-plugin - [0.5,) - - generate-sources - - - - - - - - - - - - - - - - - - opendaylight-release - ${nexusproxy}/repositories/${nexus.repository.release}/ - - - - opendaylight-snapshot - ${nexusproxy}/repositories/${nexus.repository.snapshot}/ - - - - website - ${sitedeploy} - - - - - org.opendaylight.yangtools - yang-binding - ${yangtools.version} - - - diff --git a/opendaylight/archetypes/odl-model-project/src/test/resources/projects/basic/archetype.properties b/opendaylight/archetypes/odl-model-project/src/test/resources/projects/basic/archetype.properties deleted file mode 100644 index adc9003d0c..0000000000 --- a/opendaylight/archetypes/odl-model-project/src/test/resources/projects/basic/archetype.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Tue Aug 27 11:13:24 PDT 2013 -package=it.pkg -version=0.1-SNAPSHOT -groupId=archetype.it -artifactId=basic diff --git a/opendaylight/archetypes/odl-model-project/src/test/resources/projects/basic/goal.txt b/opendaylight/archetypes/odl-model-project/src/test/resources/projects/basic/goal.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml b/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml deleted file mode 100644 index f965658f98..0000000000 --- a/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - - - org.opendaylight.controller.archetypes - archetypes-parent - 0.5.0-SNAPSHOT - - - org.opendaylight.controller - opendaylight-configfile-archetype - 1.5.0-SNAPSHOT - maven-archetype - - Configuration files for md-sal - - diff --git a/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index d404f99c7a..0000000000 --- a/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - src/main/resources - - **/*.xml - - - - diff --git a/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/archetype-resources/pom.xml deleted file mode 100644 index 2b4ec33cd7..0000000000 --- a/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - 4.0.0 - - - ${artifactId} - ${groupId} - Configuration files for md-sal - - jar - - - 80-${repoName}.xml - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${configfile} - xml - config - - - - - - - - - - - scm:git:ssh://git.opendaylight.org:29418/${repoName}.git - scm:git:ssh://git.opendaylight.org:29418/${repoName}.git - HEAD - https://git.opendaylight.org/gerrit/gitweb?p=${repoName}.git;a=summary - - diff --git a/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/archetype-resources/src/main/resources/80-__repoName__.xml b/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/archetype-resources/src/main/resources/80-__repoName__.xml deleted file mode 100644 index 73913c8ea9..0000000000 --- a/opendaylight/archetypes/opendaylight-configfile-archetype/src/main/resources/archetype-resources/src/main/resources/80-__repoName__.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/archetypes/opendaylight-configfile-archetype/src/test/resources/projects/basic/archetype.properties b/opendaylight/archetypes/opendaylight-configfile-archetype/src/test/resources/projects/basic/archetype.properties deleted file mode 100644 index 7a940e7a6e..0000000000 --- a/opendaylight/archetypes/opendaylight-configfile-archetype/src/test/resources/projects/basic/archetype.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Mon Aug 25 05:45:18 CDT 2014 -package=it.pkg -version=0.1-SNAPSHOT -groupId=archetype.it -artifactId=basic -repoName=foo diff --git a/opendaylight/archetypes/opendaylight-configfile-archetype/src/test/resources/projects/basic/goal.txt b/opendaylight/archetypes/opendaylight-configfile-archetype/src/test/resources/projects/basic/goal.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/pom.xml b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/pom.xml deleted file mode 100644 index 0944f8f46c..0000000000 --- a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - 4.0.0 - - - org.opendaylight.controller.archetypes - archetypes-parent - 0.5.0-SNAPSHOT - - - org.opendaylight.controller - opendaylight-karaf-distro-archetype - 1.4.0-SNAPSHOT - maven-archetype - - distribution-karaf-archetype - https://wiki.opendaylight.org/view/CrossProject:Integration_Group/distribution-karaf - - diff --git a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index 4c4f5103ee..0000000000 --- a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml deleted file mode 100644 index 3762513553..0000000000 --- a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - 4.0.0 - - org.opendaylight.odlparent - karaf-parent - 1.8.0-SNAPSHOT - - - ${groupId} - ${artifactId} - ${version} - pom - ${project.artifactId} - - - - - - - - - org.apache.karaf.features - framework - kar - - - - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - - - scm:git:ssh://git.opendaylight.org:29418/${repoName}.git - scm:git:ssh://git.opendaylight.org:29418/${repoName}.git - HEAD - https://git.opendaylight.org/gerrit/gitweb?p=${repoName}.git;a=summary - - diff --git a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/test/resources/projects/basic/archetype.properties b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/test/resources/projects/basic/archetype.properties deleted file mode 100644 index dd29db648f..0000000000 --- a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/test/resources/projects/basic/archetype.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Thu Aug 21 14:44:29 CDT 2014 -package=it.pkg -version=0.1-SNAPSHOT -groupId=archetype.it -artifactId=basic -repoName=foo diff --git a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/test/resources/projects/basic/goal.txt b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/test/resources/projects/basic/goal.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/opendaylight/archetypes/opendaylight-karaf-features/pom.xml b/opendaylight/archetypes/opendaylight-karaf-features/pom.xml deleted file mode 100644 index 262769421c..0000000000 --- a/opendaylight/archetypes/opendaylight-karaf-features/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 4.0.0 - - - org.opendaylight.controller.archetypes - archetypes-parent - 0.5.0-SNAPSHOT - - - org.opendaylight.controller - opendaylight-karaf-features-archetype - 1.4.0-SNAPSHOT - maven-archetype - opendaylight-karaf-features-archetype - - diff --git a/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/META-INF/maven/archetype-metadata.xml b/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/META-INF/maven/archetype-metadata.xml deleted file mode 100644 index 158e448265..0000000000 --- a/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/META-INF/maven/archetype-metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - src/main/resources - **/*.xml - - - diff --git a/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/pom.xml deleted file mode 100644 index 13e5572059..0000000000 --- a/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - 4.0.0 - - org.opendaylight.odlparent - features-parent - 1.8.0-SNAPSHOT - - features-${repoName} - ${groupId} - ${version} - jar - - features.xml - 1.4.0-SNAPSHOT - 1.8.0-SNAPSHOT - 1.8.0-SNAPSHOT - 1.8.0-SNAPSHOT - - - - - - - - - - - - org.opendaylight.odlparent - features-test - ${feature.test.version} - test - - - - org.opendaylight.controller - opendaylight-karaf-empty - ${karaf.empty.version} - zip - - - - - - scm:git:ssh://git.opendaylight.org:29418/${repoName}.git - scm:git:ssh://git.opendaylight.org:29418/${repoName}.git - HEAD - https://git.opendaylight.org/gerrit/gitweb?p=${repoName}.git;a=summary - - diff --git a/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/src/main/resources/features.xml b/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/src/main/resources/features.xml deleted file mode 100644 index 5f4a9f2e9d..0000000000 --- a/opendaylight/archetypes/opendaylight-karaf-features/src/main/resources/archetype-resources/src/main/resources/features.xml +++ /dev/null @@ -1,99 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - - - - - - - - - - - - - diff --git a/opendaylight/archetypes/opendaylight-karaf-features/src/test/resources/projects/basic/archetype.properties b/opendaylight/archetypes/opendaylight-karaf-features/src/test/resources/projects/basic/archetype.properties deleted file mode 100644 index bab8cd295d..0000000000 --- a/opendaylight/archetypes/opendaylight-karaf-features/src/test/resources/projects/basic/archetype.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Thu Aug 21 23:46:25 CDT 2014 -package=it.pkg -version=0.1-SNAPSHOT -groupId=archetype.it -artifactId=basic -repoName=foo diff --git a/opendaylight/archetypes/opendaylight-karaf-features/src/test/resources/projects/basic/goal.txt b/opendaylight/archetypes/opendaylight-karaf-features/src/test/resources/projects/basic/goal.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml index 3f4ffd1532..afe1e4aa78 100644 --- a/opendaylight/archetypes/pom.xml +++ b/opendaylight/archetypes/pom.xml @@ -3,10 +3,10 @@ 4.0.0 - org.opendaylight.controller - commons.opendaylight + org.opendaylight.odlparent + odlparent-lite 1.8.0-SNAPSHOT - ../commons/opendaylight + org.opendaylight.controller.archetypes @@ -50,10 +50,6 @@ - odl-model-project - opendaylight-configfile-archetype - opendaylight-karaf-distro-archetype - opendaylight-karaf-features opendaylight-startup -- 2.36.6