You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/09/17 22:03:27 UTC
svn commit: r1625794 - in /tomcat/sandbox/trunk-maven-layout/tomcat-util:
pom.xml src/main/java/org/apache/tomcat/
Author: markt
Date: Wed Sep 17 20:03:26 2014
New Revision: 1625794
URL: http://svn.apache.org/r1625794
Log:
Simplify externals
Modified:
tomcat/sandbox/trunk-maven-layout/tomcat-util/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-util/src/main/java/org/apache/tomcat/ (props changed)
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-util/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-util/pom.xml?rev=1625794&r1=1625793&r2=1625794&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-util/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-util/pom.xml Wed Sep 17 20:03:26 2014
@@ -27,6 +27,27 @@
<artifactId>tomcat-util</artifactId>
<description>Common code shared by multiple Tomcat components</description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/apache/tomcat/util/bcel/**</exclude>
+ <exclude>org/apache/tomcat/util/collections/**</exclude>
+ <exclude>org/apache/tomcat/util/descriptor/**</exclude>
+ <exclude>org/apache/tomcat/util/digester/**</exclude>
+ <exclude>org/apache/tomcat/util/http/**</exclude>
+ <exclude>org/apache/tomcat/util/log/**</exclude>
+ <exclude>org/apache/tomcat/util/modeler/**</exclude>
+ <exclude>org/apache/tomcat/util/net/**</exclude>
+ <exclude>org/apache/tomcat/util/scan/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-util/src/main/java/org/apache/tomcat/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Wed Sep 17 20:03:26 2014
@@ -1,10 +1 @@
-^/tomcat/trunk/java/org/apache/tomcat/util/Diagnostics.java Diagnostics.java
-^/tomcat/trunk/java/org/apache/tomcat/util/ExceptionUtils.java ExceptionUtils.java
-^/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java IntrospectionUtils.java
-^/tomcat/trunk/java/org/apache/tomcat/util/LocalStrings.properties LocalStrings.properties
-^/tomcat/trunk/java/org/apache/tomcat/util/buf buf
-^/tomcat/trunk/java/org/apache/tomcat/util/codec codec
-^/tomcat/trunk/java/org/apache/tomcat/util/file file
-^/tomcat/trunk/java/org/apache/tomcat/util/res res
-^/tomcat/trunk/java/org/apache/tomcat/util/security security
-^/tomcat/trunk/java/org/apache/tomcat/util/threads threads
+^/tomcat/trunk/java/org/apache/tomcat/util util
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1625794 - in /tomcat/sandbox/trunk-maven-layout/tomcat-util:
pom.xml src/main/java/org/apache/tomcat/
Posted by Konstantin Kolinko <kn...@gmail.com>.
2014-09-18 0:03 GMT+04:00 <ma...@apache.org>:
> Author: markt
> Date: Wed Sep 17 20:03:26 2014
> New Revision: 1625794
>
> URL: http://svn.apache.org/r1625794
> Log:
> Simplify externals
>
> Modified:
> tomcat/sandbox/trunk-maven-layout/tomcat-util/pom.xml
> tomcat/sandbox/trunk-maven-layout/tomcat-util/src/main/java/org/apache/tomcat/ (props changed)
>
> Modified: tomcat/sandbox/trunk-maven-layout/tomcat-util/pom.xml
> URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-util/pom.xml?rev=1625794&r1=1625793&r2=1625794&view=diff
> ==============================================================================
> --- tomcat/sandbox/trunk-maven-layout/tomcat-util/pom.xml (original)
> +++ tomcat/sandbox/trunk-maven-layout/tomcat-util/pom.xml Wed Sep 17 20:03:26 2014
> @@ -27,6 +27,27 @@
> <artifactId>tomcat-util</artifactId>
> <description>Common code shared by multiple Tomcat components</description>
>
> + <build>
> + <plugins>
> + <plugin>
> + <artifactId>maven-compiler-plugin</artifactId>
> + <configuration>
> + <excludes>
> + <exclude>org/apache/tomcat/util/bcel/**</exclude>
> + <exclude>org/apache/tomcat/util/collections/**</exclude>
> + <exclude>org/apache/tomcat/util/descriptor/**</exclude>
> + <exclude>org/apache/tomcat/util/digester/**</exclude>
> + <exclude>org/apache/tomcat/util/http/**</exclude>
> + <exclude>org/apache/tomcat/util/log/**</exclude>
> + <exclude>org/apache/tomcat/util/modeler/**</exclude>
> + <exclude>org/apache/tomcat/util/net/**</exclude>
> + <exclude>org/apache/tomcat/util/scan/**</exclude>
> + </excludes>
> + </configuration>
> + </plugin>
> + </plugins>
> + </build>
Just using excludes seems fragile.
In build.xml we have both includes and excludes
<patternset id="files.tomcat-util">
<include name="org/apache/tomcat/util/buf/**" />
<include name="org/apache/tomcat/util/codec/**" />
<include name="org/apache/tomcat/util/file/**" />
<include name="org/apache/tomcat/util/res/**" />
<include name="org/apache/tomcat/util/security/**" />
<include name="org/apache/tomcat/util/threads/**" />
<include name="org/apache/tomcat/util/*" />
<exclude name="org/apache/tomcat/util/bcel" />
<exclude name="org/apache/tomcat/util/collections" />
<exclude name="org/apache/tomcat/util/descriptor" />
<exclude name="org/apache/tomcat/util/digester" />
<exclude name="org/apache/tomcat/util/http" />
<exclude name="org/apache/tomcat/util/log" />
<exclude name="org/apache/tomcat/util/modeler" />
<exclude name="org/apache/tomcat/util/net" />
<exclude name="org/apache/tomcat/util/scan" />
</patternset>
> <dependencies>
>
> <dependency>
>
> Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-util/src/main/java/org/apache/tomcat/
> ------------------------------------------------------------------------------
> --- svn:externals (original)
> +++ svn:externals Wed Sep 17 20:03:26 2014
> @@ -1,10 +1 @@
> -^/tomcat/trunk/java/org/apache/tomcat/util/Diagnostics.java Diagnostics.java
> -^/tomcat/trunk/java/org/apache/tomcat/util/ExceptionUtils.java ExceptionUtils.java
> -^/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java IntrospectionUtils.java
> -^/tomcat/trunk/java/org/apache/tomcat/util/LocalStrings.properties LocalStrings.properties
> -^/tomcat/trunk/java/org/apache/tomcat/util/buf buf
> -^/tomcat/trunk/java/org/apache/tomcat/util/codec codec
> -^/tomcat/trunk/java/org/apache/tomcat/util/file file
> -^/tomcat/trunk/java/org/apache/tomcat/util/res res
> -^/tomcat/trunk/java/org/apache/tomcat/util/security security
> -^/tomcat/trunk/java/org/apache/tomcat/util/threads threads
> +^/tomcat/trunk/java/org/apache/tomcat/util util
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org