You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by rw...@apache.org on 2006/06/16 07:40:47 UTC
svn commit: r414744 - in /portals/jetspeed-2/trunk: ./
applications/rss/rss-jar/ components/ components/portal/
layout-portlets/layout-portlets-jar/
maven-archetypes/application/src/archetype/archetype-resources/
maven-archetypes/component/src/archetyp...
Author: rwatler
Date: Thu Jun 15 22:40:47 2006
New Revision: 414744
URL: http://svn.apache.org/viewvc?rev=414744&view=rev
Log:
Latest M2 build update:
- explicitly exclude *.java files from resources and
testResources
- remove forced version of compiler plugin that is no
longer required if java sources are no longer included
in the jar and war build product archives
Modified:
portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml
portals/jetspeed-2/trunk/components/pom.xml
portals/jetspeed-2/trunk/components/portal/pom.xml
portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml
portals/jetspeed-2/trunk/pom.xml
Modified: portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml?rev=414744&r1=414743&r2=414744&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml Thu Jun 15 22:40:47 2006
@@ -50,6 +50,9 @@
<resources>
<resource>
<directory>../src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</resource>
</resources>
@@ -57,9 +60,15 @@
<testResources>
<testResource>
<directory>../src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</testResource>
<testResource>
<directory>../src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</testResource>
</testResources>
Modified: portals/jetspeed-2/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/pom.xml?rev=414744&r1=414743&r2=414744&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/pom.xml Thu Jun 15 22:40:47 2006
@@ -134,6 +134,9 @@
</testResource>
<testResource>
<directory>src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</testResource>
<testResource>
<directory>../../etc/log4j</directory>
Modified: portals/jetspeed-2/trunk/components/portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/pom.xml?rev=414744&r1=414743&r2=414744&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/pom.xml Thu Jun 15 22:40:47 2006
@@ -207,6 +207,9 @@
</testResource>
<testResource>
<directory>src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</testResource>
<testResource>
<directory>../../etc/log4j</directory>
Modified: portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml?rev=414744&r1=414743&r2=414744&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml (original)
+++ portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml Thu Jun 15 22:40:47 2006
@@ -50,6 +50,9 @@
<resources>
<resource>
<directory>../src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</resource>
</resources>
@@ -57,9 +60,15 @@
<testResources>
<testResource>
<directory>../src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</testResource>
<testResource>
<directory>../src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</testResource>
</testResources>
Modified: portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml?rev=414744&r1=414743&r2=414744&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml Thu Jun 15 22:40:47 2006
@@ -111,6 +111,9 @@
<resources>
<resource>
<directory>src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</resource>
</resources>
@@ -118,9 +121,15 @@
<testResources>
<testResource>
<directory>src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</testResource>
<testResource>
<directory>src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</testResource>
</testResources>
Modified: portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml?rev=414744&r1=414743&r2=414744&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml Thu Jun 15 22:40:47 2006
@@ -68,6 +68,9 @@
<resources>
<resource>
<directory>src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</resource>
</resources>
@@ -75,9 +78,15 @@
<testResources>
<testResource>
<directory>src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</testResource>
<testResource>
<directory>src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</testResource>
</testResources>
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml?rev=414744&r1=414743&r2=414744&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml Thu Jun 15 22:40:47 2006
@@ -69,6 +69,9 @@
<resources>
<resource>
<directory>src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</resource>
</resources>
@@ -76,9 +79,15 @@
<testResources>
<testResource>
<directory>src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</testResource>
<testResource>
<directory>src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</testResource>
</testResources>
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml?rev=414744&r1=414743&r2=414744&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml Thu Jun 15 22:40:47 2006
@@ -95,12 +95,6 @@
<junit.version>3.8.1</junit.version>
<org.apache.maven.artifact.ant.version>2.0.4</org.apache.maven.artifact.ant.version>
<!--
- Bug: [MCOMPILER-36] using specific version of compiler
- plugin to avoid compilation issues with j2sdk 1.4.2
- involving compilation of sources on classpath.
- -->
- <org.apache.maven.plugins.maven-compiler-plugin.version>2.0</org.apache.maven.plugins.maven-compiler-plugin.version>
- <!--
Bug: using specific version of surefire plugin
to ensure test isolation for spring test cases;
specifically connection datasource management.
@@ -525,6 +519,9 @@
<resources>
<resource>
<directory>src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</resource>
</resources>
@@ -539,6 +536,9 @@
</testResource>
<testResource>
<directory>src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</testResource>
</testResources>
@@ -550,7 +550,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${org.apache.maven.plugins.maven-compiler-plugin.version}</version>
<configuration>
<source>1.4</source>
<target>1.4</target>
Modified: portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml?rev=414744&r1=414743&r2=414744&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml Thu Jun 15 22:40:47 2006
@@ -67,6 +67,9 @@
<resources>
<resource>
<directory>src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</resource>
</resources>
@@ -74,9 +77,15 @@
<testResources>
<testResource>
<directory>src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</testResource>
<testResource>
<directory>src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</testResource>
</testResources>
Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/pom.xml?rev=414744&r1=414743&r2=414744&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Thu Jun 15 22:40:47 2006
@@ -136,12 +136,6 @@
<mockrunner.version>0.2.7</mockrunner.version>
<org.apache.maven.artifact.ant.version>2.0.4</org.apache.maven.artifact.ant.version>
<!--
- Bug: [MCOMPILER-36] using specific version of compiler
- plugin to avoid compilation issues with j2sdk 1.4.2
- involving compilation of sources on classpath.
- -->
- <org.apache.maven.plugins.maven-compiler-plugin.version>2.0</org.apache.maven.plugins.maven-compiler-plugin.version>
- <!--
Bug: using specific version of surefire plugin
to ensure test isolation for spring test cases;
specifically connection datasource management.
@@ -907,6 +901,9 @@
<resources>
<resource>
<directory>src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</resource>
</resources>
@@ -921,6 +918,9 @@
</testResource>
<testResource>
<directory>src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
</testResource>
</testResources>
@@ -932,7 +932,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${org.apache.maven.plugins.maven-compiler-plugin.version}</version>
<configuration>
<source>1.4</source>
<target>1.4</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org