Browse Source

Clean up pom files, update plugins, skip liferay install

Change-Id: Ia0cabe96616d5357928810ae2473606d7e7cf00b
tags/7.7.0.alpha1
Teemu Suo-Anttila 8 years ago
parent
commit
4529f98b21
6 changed files with 21 additions and 18 deletions
  1. 6
    9
      all/pom.xml
  2. 0
    1
      client-compiled/pom.xml
  3. 6
    6
      liferay/pom.xml
  4. 9
    0
      pom.xml
  5. 0
    1
      themes/pom.xml
  6. 0
    1
      widgets/pom.xml

+ 6
- 9
all/pom.xml View File

@@ -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>

+ 0
- 1
client-compiled/pom.xml View File

@@ -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>

+ 6
- 6
liferay/pom.xml View File

@@ -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>

+ 9
- 0
pom.xml View File

@@ -105,6 +105,10 @@
<artifactId>maven-jar-plugin</artifactId>
<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>
@@ -123,6 +127,11 @@
<artifactId>maven-dependency-plugin</artifactId>
<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>

+ 0
- 1
themes/pom.xml View File

@@ -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>

+ 0
- 1
widgets/pom.xml View File

@@ -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>

Loading…
Cancel
Save