You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2017/01/08 04:48:47 UTC

[5/5] portals-pluto git commit: Changed the name of the Pluto installer plugin from maven-pluto-plugin to pluto-maven-plugin in the affected POMs and in the dist-build.xml ant build file. Note that the artifact is still kept in a directory named 'maven-p

Changed the name of the Pluto installer plugin from maven-pluto-plugin to
pluto-maven-plugin in the affected POMs and in the dist-build.xml ant build
file. Note that the artifact is still kept in a directory named
'maven-pluto-plugin' in order to avoid work changing tooling, etc.


Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/cafdefd4
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/cafdefd4
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/cafdefd4

Branch: refs/heads/master
Commit: cafdefd47b62c2a92facd563b84ab657b93cf6a9
Parents: 993cbdc
Author: Scott Nicklous <ms...@apache.org>
Authored: Sun Jan 8 05:25:05 2017 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Sun Jan 8 05:25:05 2017 +0100

----------------------------------------------------------------------
 dist-build.xml                                 | 6 +++---
 maven-pluto-plugin/pom.xml                     | 2 +-
 pluto-testsuite/pom.xml                        | 2 +-
 pom.xml                                        | 4 ++--
 portlet-tck_3.0/V2AddlEnvironmentTests/pom.xml | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cafdefd4/dist-build.xml
----------------------------------------------------------------------
diff --git a/dist-build.xml b/dist-build.xml
index dce9ca9..d17d09e 100644
--- a/dist-build.xml
+++ b/dist-build.xml
@@ -75,7 +75,7 @@
    <property name="tar.file" value="${dist.basedir}/${base.name}.tar"/>
 
    <target name="bundle-dist"
-         depends="prepare-bundle-dist,run-maven-exclude-demos,run-maven-include-demos,run-maven-pluto-plugin"
+         depends="prepare-bundle-dist,run-maven-exclude-demos,run-maven-include-demos,run-pluto-maven-plugin"
          description="Creates zip, gzip, and bzip2 distributions">
       <!-- Copy over jars needed to deploy custom portlets -->
       <copy file="pluto-util/target/pluto-util-${pluto.version}.jar" todir="${dist.dir}/PlutoDomain"/>         
@@ -239,9 +239,9 @@
       </exec>
    </target>
 
-   <target name="run-maven-pluto-plugin" description="Runs the install goal for the maven-pluto-plugin">
+   <target name="run-pluto-maven-plugin" description="Runs the install goal for the pluto-maven-plugin">
       <exec executable="mvn" vmlauncher="false" dir="${basedir}" failonerror="true">
-         <arg line="org.apache.portals.pluto:maven-pluto-plugin:${pluto.version}:install -DinstallDir=${basedir}/${dist.dir}"/>
+         <arg line="org.apache.portals.pluto:pluto-maven-plugin:${pluto.version}:install -DinstallDir=${basedir}/${dist.dir}"/>
       </exec>
    </target>
       

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cafdefd4/maven-pluto-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-pluto-plugin/pom.xml b/maven-pluto-plugin/pom.xml
index 1b2721a..1e2ff8c 100644
--- a/maven-pluto-plugin/pom.xml
+++ b/maven-pluto-plugin/pom.xml
@@ -26,7 +26,7 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>maven-pluto-plugin</artifactId>
+  <artifactId>pluto-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Pluto Installer Plugin</name>
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cafdefd4/pluto-testsuite/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-testsuite/pom.xml b/pluto-testsuite/pom.xml
index 95b48e1..7b0a6d4 100644
--- a/pluto-testsuite/pom.xml
+++ b/pluto-testsuite/pom.xml
@@ -110,7 +110,7 @@
             <!-- bind 'pluto:assemble' goal to 'process-resources' lifecycle -->
             <plugin>
                 <groupId>org.apache.portals.pluto</groupId>
-                <artifactId>maven-pluto-plugin</artifactId>
+                <artifactId>pluto-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cafdefd4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e0f51cf..95d0e9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,7 +259,7 @@ generate mailto links. -->
   NOTE:
 
   Modification of these properties affects:
-  1)  maven-pluto-plugin/src/main/resources/versions.properties as well!
+  1)  pluto-maven-plugin/src/main/resources/versions.properties as well!
   -->
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -558,7 +558,7 @@ TODO: Check if we need all of them. -->
       <plugins>
         <plugin>
           <groupId>org.apache.portals.pluto</groupId>
-          <artifactId>maven-pluto-plugin</artifactId>
+          <artifactId>pluto-maven-plugin</artifactId>
           <version>${project.version}</version>
         </plugin>
         <plugin>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cafdefd4/portlet-tck_3.0/V2AddlEnvironmentTests/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlEnvironmentTests/pom.xml b/portlet-tck_3.0/V2AddlEnvironmentTests/pom.xml
index 3b12750..eb3e33e 100644
--- a/portlet-tck_3.0/V2AddlEnvironmentTests/pom.xml
+++ b/portlet-tck_3.0/V2AddlEnvironmentTests/pom.xml
@@ -140,7 +140,7 @@
                <!-- bind 'pluto:assemble' goal to 'generate-resources' lifecycle -->
                <plugin>
                   <groupId>org.apache.portals.pluto</groupId>
-                  <artifactId>maven-pluto-plugin</artifactId>
+                  <artifactId>pluto-maven-plugin</artifactId>
                   <executions>
                      <execution>
                         <phase>generate-resources</phase>