Author: olamy
Date: Sat Oct 22 07:28:39 2011
New Revision: 1187667
URL: http://svn.apache.org/viewvc?rev=1187667&view=rev
Log:
import external sources only if not exits: build speed improve when not using
clean
Modified:
tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml
Modified: tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/pom.xml?rev=1187667&r1=1187666&r2=1187667&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/pom.xml Sat Oct 22 07:28:39 2011
@@ -55,82 +55,91 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <id>unpack-commons-deps</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
- <classifier>sources</classifier>
- <type>jar</type>
- <overWrite>false</overWrite>
- <includes>**/*.java</includes>
- <excludes>**/test/**</excludes>
- </artifactItem>
- <artifactItem>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.5.6</version>
- <classifier>sources</classifier>
- <type>jar</type>
- <overWrite>false</overWrite>
- <includes>**/*.java</includes>
- <excludes>**/test/**,**/managed/**</excludes>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${tomcat-dbcp.home}/src/java</outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>transform_to_tomcat_packages</id>
- <phase>process-sources</phase>
- <configuration>
- <tasks>
- <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
- encoding="ISO-8859-1">
- <replacefilter token="org.apache.commons"
- value="org.apache.tomcat.dbcp" />
- </replace>
- <replace
dir="${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl"
- encoding="ISO-8859-1">
- <replacefilter token="enum"
- value="enumeration" />
- </replace>
-
- <mkdir dir="${basedir}/src/main/java/org/apache/tomcat/dbcp" />
- <move todir="${basedir}/src/main/java/org/apache/tomcat/dbcp">
- <fileset
dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
- </move>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>import-commons-sources</id>
+ <activation>
+ <file>
+ <missing>${basedir}/src/main/java/org/apache/tomcat/dbcp</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <id>unpack-commons-deps</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.4</version>
+ <classifier>sources</classifier>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <includes>**/*.java</includes>
+ <excludes>**/test/**</excludes>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.5.6</version>
+ <classifier>sources</classifier>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <includes>**/*.java</includes>
+ <excludes>**/test/**,**/managed/**</excludes>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${tomcat-dbcp.home}/src/java</outputDirectory>
+ <overWriteReleases>true</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>transform_to_tomcat_packages</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <tasks>
+ <replace
dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
+ encoding="ISO-8859-1">
+ <replacefilter token="org.apache.commons"
+ value="org.apache.tomcat.dbcp" />
+ </replace>
+ <replace
dir="${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl"
+ encoding="ISO-8859-1">
+ <replacefilter token="enum"
+ value="enumeration" />
+ </replace>
+ <mkdir
dir="${basedir}/src/main/java/org/apache/tomcat/dbcp" />
+ <move
todir="${basedir}/src/main/java/org/apache/tomcat/dbcp">
+ <fileset
dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
+ </move>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml?rev=1187667&r1=1187666&r2=1187667&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml Sat Oct 22
07:28:39 2011
@@ -67,67 +67,84 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <id>unpack-commons-deps</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <classifier>sources</classifier>
- <type>jar</type>
- <overWrite>false</overWrite>
- <includes>**/*.java</includes>
- <excludes>**/test/**</excludes>
- </artifactItem>
-
- </artifactItems>
-
<outputDirectory>${commons-logging-sources}/src/java</outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>transform_to_tomcat_packages</id>
- <phase>process-sources</phase>
- <configuration>
- <tasks>
- <replace
dir="${commons-logging-sources}/src/java/org/apache/commons"
- encoding="ISO-8859-1">
- <replacefilter token="org.apache.commons"
- value="org.apache.juli" />
- </replace>
- <mkdir dir="${basedir}/src/main/java/org/apache/juli" />
- <move todir="${basedir}/src/main/java/org/apache/juli">
- <fileset
dir="${commons-logging-sources}/src/java/org/apache/commons" />
- </move>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+
+ <profile>
+ <id>import-commons-sources</id>
+ <activation>
+ <file>
+ <missing>${basedir}/src/main/java/org/apache/juli</missing>
+ </file>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <id>unpack-commons-deps</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <classifier>sources</classifier>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <includes>**/*.java</includes>
+ <excludes>**/test/**</excludes>
+ </artifactItem>
+
+ </artifactItems>
+
<outputDirectory>${commons-logging-sources}/src/java</outputDirectory>
+ <overWriteReleases>true</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>transform_to_tomcat_packages</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <tasks>
+ <replace
dir="${commons-logging-sources}/src/java/org/apache/commons"
+ encoding="ISO-8859-1">
+ <replacefilter token="org.apache.commons"
+ value="org.apache.juli" />
+ </replace>
+ <mkdir dir="${basedir}/src/main/java/org/apache/juli" />
+ <move todir="${basedir}/src/main/java/org/apache/juli">
+ <fileset
dir="${commons-logging-sources}/src/java/org/apache/commons" />
+ </move>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+
+
+
+ </profiles>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
