portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r774969 - in /portals/pluto/trunk: assembly/ pluto-ant-tasks/ pluto-container/ pluto-portal-driver-impl/ pluto-portal-driver/ pluto-portal/ pluto-site-skin/ pluto-taglib/ pluto-testsuite/
Date Fri, 15 May 2009 00:13:52 GMT
Author: djencks
Date: Fri May 15 00:13:51 2009
New Revision: 774969

URL: http://svn.apache.org/viewvc?rev=774969&view=rev
Log:
mostly hacks to repair build.  This all needs careful review. Will discuss on dev list

Modified:
    portals/pluto/trunk/assembly/pom.xml
    portals/pluto/trunk/pluto-ant-tasks/pom.xml
    portals/pluto/trunk/pluto-container/pom.xml
    portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
    portals/pluto/trunk/pluto-portal-driver/pom.xml
    portals/pluto/trunk/pluto-portal/pom.xml
    portals/pluto/trunk/pluto-site-skin/pom.xml
    portals/pluto/trunk/pluto-taglib/pom.xml
    portals/pluto/trunk/pluto-testsuite/pom.xml

Modified: portals/pluto/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/assembly/pom.xml?rev=774969&r1=774968&r2=774969&view=diff
==============================================================================
--- portals/pluto/trunk/assembly/pom.xml (original)
+++ portals/pluto/trunk/assembly/pom.xml Fri May 15 00:13:51 2009
@@ -85,7 +85,6 @@
           </plugin>
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.1</version>
             <executions>
               <execution>
                 <id>make-assemblies</id>

Modified: portals/pluto/trunk/pluto-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-ant-tasks/pom.xml?rev=774969&r1=774968&r2=774969&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-ant-tasks/pom.xml (original)
+++ portals/pluto/trunk/pluto-ant-tasks/pom.xml Fri May 15 00:13:51 2009
@@ -54,6 +54,23 @@
   <build> 
     <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory> 
     <plugins>
+        <!-- todo remove -->
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>ianal-maven-plugin</artifactId>
+          <executions>
+            <execution>
+              <goals>
+                <goal>verify-legal-files</goal>
+              </goals>
+              <configuration>
+                  <!--<searchPaths>WEB-INF/classes/META-INF</searchPaths>-->
+                  <!-- TODO fix skip -->
+                  <skip>true</skip>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
       <plugin>
         <artifactId>maven-site-plugin</artifactId>
         <configuration>

Modified: portals/pluto/trunk/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/pom.xml?rev=774969&r1=774968&r2=774969&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/pom.xml (original)
+++ portals/pluto/trunk/pluto-container/pom.xml Fri May 15 00:13:51 2009
@@ -128,13 +128,6 @@
        </testResources>
 
       <plugins>
-          <!-- Assembly Plugin: Create Distributions =========================== -->
-          <plugin>
-              <artifactId>maven-assembly-plugin</artifactId>
-              <configuration>
-                  <descriptor>src/assemble/bin.xml</descriptor>
-              </configuration>
-          </plugin>
           <!-- Surefire Plugin: Exec Tests ===================================== -->
           <plugin>
               <artifactId>maven-surefire-plugin</artifactId>

Modified: portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/pom.xml?rev=774969&r1=774968&r2=774969&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/pom.xml Fri May 15 00:13:51 2009
@@ -140,13 +140,6 @@
     <build>
         <plugins>
         	<plugin>
-        		<artifactId>maven-assembly-plugin</artifactId>
-        		<configuration>
-        			<descriptor>src/assemble/bin.xml</descriptor>
-        			<finalName>pluto-portal-${pom.version}</finalName>
-        		</configuration>
-        	</plugin>
-        	<plugin>
         		<groupId>org.apache.maven.plugins</groupId>
         		<artifactId>maven-compiler-plugin</artifactId>
         		<!-- best lock down version of the plugin too -->

Modified: portals/pluto/trunk/pluto-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/pom.xml?rev=774969&r1=774968&r2=774969&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver/pom.xml Fri May 15 00:13:51 2009
@@ -153,13 +153,6 @@
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptor>src/assemble/bin.xml</descriptor>
-                    <finalName>pluto-portal-${pom.version}</finalName>
-                </configuration>
-            </plugin>
-            <plugin>
             	<groupId>org.apache.maven.plugins</groupId>
             	<artifactId>maven-compiler-plugin</artifactId>
             	<!-- best lock down version of the plugin too -->

Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=774969&r1=774968&r2=774969&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Fri May 15 00:13:51 2009
@@ -163,13 +163,40 @@
         </configuration>
       </plugin>
 
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>ianal-maven-plugin</artifactId>
+          <executions>
+            <execution>
+              <goals>
+                <goal>verify-legal-files</goal>
+              </goals>
+              <configuration>
+                  <!--<searchPaths>WEB-INF/classes/META-INF</searchPaths>-->
+                  <!-- TODO fix skip -->
+                  <skip>true</skip>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.1</version>
+        <inherited>false</inherited>
         <configuration>
           <descriptor>src/assemble/bin.xml</descriptor>
           <finalName>pluto-portal-${pom.version}</finalName>
         </configuration>
+          <executions>
+            <execution>
+              <id>make-project-assembly-source-release</id>
+                <inherited>false</inherited>
+              <phase>package</phase>
+              <goals>
+                <goal>single</goal>
+              </goals>
+            </execution>
+          </executions>
       </plugin>
 
       <plugin>

Modified: portals/pluto/trunk/pluto-site-skin/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site-skin/pom.xml?rev=774969&r1=774968&r2=774969&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-site-skin/pom.xml (original)
+++ portals/pluto/trunk/pluto-site-skin/pom.xml Fri May 15 00:13:51 2009
@@ -33,15 +33,15 @@
 
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.1</version>
-                <configuration>
-                    <descriptors>
-                        <descriptor>${basedir}/src/assembly/bin.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
+            <!-- ???? -->
+            <!--<plugin>-->
+                <!--<artifactId>maven-assembly-plugin</artifactId>-->
+                <!--<configuration>-->
+                    <!--<descriptors>-->
+                        <!--<descriptor>src/assembly/bin.xml</descriptor>-->
+                    <!--</descriptors>-->
+                <!--</configuration>-->
+            <!--</plugin>-->
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-remote-resources-plugin</artifactId>

Modified: portals/pluto/trunk/pluto-taglib/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-taglib/pom.xml?rev=774969&r1=774968&r2=774969&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-taglib/pom.xml (original)
+++ portals/pluto/trunk/pluto-taglib/pom.xml Fri May 15 00:13:51 2009
@@ -59,18 +59,6 @@
 
     <build>
         <plugins>
-            <!-- Assembly Plugin - Create Distributions -->
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptor>src/assemble/bin.xml</descriptor>
-                    <finalName>pluto-taglib-${pom.currentVersion}</finalName>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-remote-resources-plugin</artifactId>
-            </plugin>
             <plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>

Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=774969&r1=774968&r2=774969&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Fri May 15 00:13:51 2009
@@ -91,6 +91,22 @@
       </resource>
     </resources>
     <plugins>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>ianal-maven-plugin</artifactId>
+          <executions>
+            <execution>
+              <goals>
+                <goal>verify-legal-files</goal>
+              </goals>
+              <configuration>
+                  <!--<searchPaths>WEB-INF/classes/META-INF</searchPaths>-->
+                  <!-- TODO fix skip -->
+                  <skip>true</skip>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
       <!-- configure maven-war-plugin to use updated web.xml -->
       <plugin>
         <artifactId>maven-war-plugin</artifactId>



Mime
View raw message