From 4364c517710ed4d196166afc9a3515d95cab7a7e Mon Sep 17 00:00:00 2001 From: Steinar Bang Date: Thu, 5 Jun 2014 16:17:15 +0200 Subject: [PATCH 1/3] Sort .gitignore alphabetically. --- .gitignore | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ec344031..02c2b835 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ -target -.idea *.iml *.ipr *.iws -*.swp +*.log *.swo +*.swp *~ -*.log +.idea +target From d67681641a43d682cb1e5aa70f1eeccbb9452037 Mon Sep 17 00:00:00 2001 From: Steinar Bang Date: Thu, 5 Jun 2014 16:19:26 +0200 Subject: [PATCH 2/3] Ignore m2e generated eclipse project files and directories. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 02c2b835..9a42d953 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,8 @@ *.swo *.swp *~ +.classpath .idea +.project +.settings target From aae936416ba4450cbb74c9d1b8974388d4b9483a Mon Sep 17 00:00:00 2001 From: Steinar Bang Date: Thu, 5 Jun 2014 16:27:29 +0200 Subject: [PATCH 3/3] Filter out unsupported excutions from m2e. The formatting of the filtering isn't nice (single TAB indents), and doesn't match the rest of the pom files. But it is the default formatting created by eclipse "quick fix", so I've left it as-is. --- firefox/pom.xml | 35 +++++++++++++++ plugin/pom.xml | 112 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+) diff --git a/firefox/pom.xml b/firefox/pom.xml index 5b12290c..e98dc590 100644 --- a/firefox/pom.xml +++ b/firefox/pom.xml @@ -113,5 +113,40 @@ + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-antrun-plugin + + + [1.6,) + + + run + + + + + + + + + + + + diff --git a/plugin/pom.xml b/plugin/pom.xml index a26a7c51..b1f6e978 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -517,6 +517,118 @@ + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-antrun-plugin + + + [1.6,) + + + run + + + + + + + + + + org.apache.maven.plugins + + + maven-dependency-plugin + + + [2.3,) + + + copy + + + + + + + + + + org.apache.maven.plugins + + + maven-enforcer-plugin + + + [1.1,) + + + enforce + + + + + + + + + + com.atlassian.maven.plugins + + + maven-amps-plugin + + + [4.1.6,) + + + + compress-resources + + + copy-bundled-dependencies + + + copy-test-bundled-dependencies + + + filter-plugin-descriptor + + + filter-test-plugin-descriptor + + + generate-manifest + + + generate-rest-docs + + + + + + + + + + + + +