portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r774191 - in /portals/jetspeed-2/portal/trunk/enterprise: ear-full/pom.xml ear-min/pom.xml
Date Wed, 13 May 2009 04:28:58 GMT
Author: rwatler
Date: Wed May 13 04:28:58 2009
New Revision: 774191

URL: http://svn.apache.org/viewvc?rev=774191&view=rev
Log:
JS2-1006: force ant version for plugin using explicit dependency

Modified:
    portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml
    portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml

Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml?rev=774191&r1=774190&r2=774191&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml Wed May 13 04:28:58 2009
@@ -152,14 +152,15 @@
             <phase>package</phase>
             <configuration>
               <tasks>
+                <echo>Building with Ant version: ${ant.version}</echo>
                 <!-- unpackage EAR -->
                 <delete dir="${project.build.directory}/package-skinny-wars"/>
                 <unjar src="${project.build.directory}/${project.build.finalName}.ear"
dest="${project.build.directory}/package-skinny-wars"/>
                 
                 <!-- 
-                  JS2-973: Websphere 6.1/IBM JDK5 workaround voor "java.lang.TypeNotPresentException:
Type javax.xml.bind.annotation.XmlRootElement not present" bug.
+                  JS2-973: Websphere 6.1/IBM JDK5 workaround for "java.lang.TypeNotPresentException:
Type javax.xml.bind.annotation.XmlRootElement not present" bug.
                   This is a recognized issue, see for instance: https://issues.apache.org/jira/browse/TUSCANY-2519
-                  Workaround is extracting the jaxb-api-2.1.jar from the Jetspeed Portal
war and move it to the shared jars within the ear.                  
+                  Workaround is extracting the jaxb-api-2.1.jar from the Jetspeed Portal
war and move it to the shared jars within the ear.
                 -->
                 <mkdir dir="${project.build.directory}/package-skinny-wars/tmp"/>
                 <unzip src="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war"
dest="${project.build.directory}/package-skinny-wars/lib">
@@ -261,6 +262,12 @@
             <artifactId>jetspeed-deploy-tools</artifactId>
             <version>${pom.version}</version>
           </dependency>        
+          <!-- force ant version for plugin -->
+          <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>${ant.version}</version>
+          </dependency>
         </dependencies>
       </plugin>
     </plugins>

Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml?rev=774191&r1=774190&r2=774191&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml Wed May 13 04:28:58 2009
@@ -112,14 +112,15 @@
             <phase>package</phase>
             <configuration>
               <tasks>
+                <echo>Building with Ant version: ${ant.version}</echo>
                 <!-- unpackage EAR -->
                 <delete dir="${project.build.directory}/package-skinny-wars"/>
                 <unjar src="${project.build.directory}/${project.build.finalName}.ear"
dest="${project.build.directory}/package-skinny-wars"/>
                 
                 <!-- 
-                  JS2-973: Websphere 6.1/IBM JDK5 workaround voor "java.lang.TypeNotPresentException:
Type javax.xml.bind.annotation.XmlRootElement not present" bug.
+                  JS2-973: Websphere 6.1/IBM JDK5 workaround for "java.lang.TypeNotPresentException:
Type javax.xml.bind.annotation.XmlRootElement not present" bug.
                   This is a recognized issue, see for instance: https://issues.apache.org/jira/browse/TUSCANY-2519
-                  Workaround is extracting the jaxb-api-2.1.jar from the Jetspeed Portal
war and move it to the shared jars within the ear.                  
+                  Workaround is extracting the jaxb-api-2.1.jar from the Jetspeed Portal
war and move it to the shared jars within the ear.
                 -->
                 <mkdir dir="${project.build.directory}/package-skinny-wars/tmp"/>
                 <unzip src="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war"
dest="${project.build.directory}/package-skinny-wars/lib">
@@ -167,6 +168,14 @@
             </goals>
           </execution>
         </executions>
+        <dependencies>
+          <!-- force ant version for plugin -->
+          <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>${ant.version}</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
   </build>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message