diff options
| -rw-r--r-- | all/pom.xml | 15 | ||||
| -rw-r--r-- | client-compiled/pom.xml | 1 | ||||
| -rw-r--r-- | liferay/pom.xml | 12 | ||||
| -rw-r--r-- | pom.xml | 9 | ||||
| -rw-r--r-- | themes/pom.xml | 1 | ||||
| -rw-r--r-- | widgets/pom.xml | 1 |
6 files changed, 21 insertions, 18 deletions
diff --git a/all/pom.xml b/all/pom.xml index e28323627e..436e92ab93 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -80,7 +80,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.5</version> + <version>1.10</version> <executions> <execution> <phase>initialize</phase> @@ -142,9 +142,7 @@ <!-- vaadin-all zip --> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> <executions> <execution> <phase>package</phase> @@ -167,7 +165,6 @@ <!-- Skip install and deploy --> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> <configuration> <skip>true</skip> @@ -175,13 +172,12 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> <configuration> <skip>true</skip> </configuration> </plugin> - + <!-- Release notes helpers and resources --> <plugin> @@ -222,7 +218,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.4.0</version> <executions> <execution> <id>fetch-release-notes-tickets</id> @@ -238,7 +233,8 @@ <argument>-classpath</argument> <classpath /> - <argument>com.vaadin.buildhelpers.FetchReleaseNotesTickets</argument> + <argument>com.vaadin.buildhelpers.FetchReleaseNotesTickets + </argument> </arguments> <outputFile>${relnotes.tickets.file}</outputFile> </configuration> @@ -257,7 +253,8 @@ <argument>-classpath</argument> <classpath /> - <argument>com.vaadin.buildhelpers.FetchReleaseNotesAuthors</argument> + <argument>com.vaadin.buildhelpers.FetchReleaseNotesAuthors + </argument> </arguments> <outputFile>${relnotes.authors.file}</outputFile> </configuration> diff --git a/client-compiled/pom.xml b/client-compiled/pom.xml index 4fd21492b6..10815470fc 100644 --- a/client-compiled/pom.xml +++ b/client-compiled/pom.xml @@ -59,7 +59,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.4.0</version> <executions> <execution> <phase>generate-resources</phase> diff --git a/liferay/pom.xml b/liferay/pom.xml index d6101eeb58..70164a96ba 100644 --- a/liferay/pom.xml +++ b/liferay/pom.xml @@ -51,9 +51,7 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> <executions> <execution> <id>unpack</id> @@ -97,9 +95,7 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> <executions> <execution> <phase>package</phase> @@ -119,9 +115,13 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.7</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <artifactId>maven-install-plugin</artifactId> <configuration> <skip>true</skip> </configuration> @@ -106,6 +106,10 @@ <version>2.6</version> </plugin> <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.6</version> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>2.19.1</version> </plugin> @@ -124,6 +128,11 @@ <version>2.10</version> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.4.0</version> + </plugin> + <plugin> <groupId>org.eclipse.m2e</groupId> <artifactId>lifecycle-mapping</artifactId> <version>1.0.0</version> diff --git a/themes/pom.xml b/themes/pom.xml index ce28a5fac2..672f425456 100644 --- a/themes/pom.xml +++ b/themes/pom.xml @@ -98,7 +98,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.4.0</version> <executions> <execution> <id>smart-sprite-reindeer</id> diff --git a/widgets/pom.xml b/widgets/pom.xml index e3735a4452..fda3459365 100644 --- a/widgets/pom.xml +++ b/widgets/pom.xml @@ -208,7 +208,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.4.0</version> <executions> <execution> <id>generate-export-package</id> |