You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mb...@apache.org on 2015/12/11 21:33:19 UTC
svn commit: r1719537 - in /commons/proper/weaver/trunk/modules/normalizer:
./ src/it/ src/it/sample/
src/it/sample/src/main/java/org/apache/commons/weaver/normalizer/example/
src/main/ src/test/ weaver/ weaver/src/it/ weaver/src/main/ weaver/src/test/
Author: mbenson
Date: Fri Dec 11 20:33:19 2015
New Revision: 1719537
URL: http://svn.apache.org/viewvc?rev=1719537&view=rev
Log:
ensure normalizer IT can run on a clean system (normalizer not installed to local repo); swallow normalizer-parent
Added:
commons/proper/weaver/trunk/modules/normalizer/clirr-differences.xml
- copied unchanged from r1719260, commons/proper/weaver/trunk/modules/normalizer/weaver/clirr-differences.xml
commons/proper/weaver/trunk/modules/normalizer/pom.xml
- copied, changed from r1719260, commons/proper/weaver/trunk/modules/normalizer/weaver/pom.xml
commons/proper/weaver/trunk/modules/normalizer/src/it/
- copied from r1719260, commons/proper/weaver/trunk/modules/normalizer/weaver/src/it/
commons/proper/weaver/trunk/modules/normalizer/src/main/
- copied from r1719260, commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/
commons/proper/weaver/trunk/modules/normalizer/src/test/
- copied from r1719260, commons/proper/weaver/trunk/modules/normalizer/weaver/src/test/
Removed:
commons/proper/weaver/trunk/modules/normalizer/weaver/clirr-differences.xml
commons/proper/weaver/trunk/modules/normalizer/weaver/pom.xml
commons/proper/weaver/trunk/modules/normalizer/weaver/src/it/
commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/
commons/proper/weaver/trunk/modules/normalizer/weaver/src/test/
Modified:
commons/proper/weaver/trunk/modules/normalizer/ (props changed)
commons/proper/weaver/trunk/modules/normalizer/src/it/sample/build.xml
commons/proper/weaver/trunk/modules/normalizer/src/it/sample/src/main/java/org/apache/commons/weaver/normalizer/example/Assertions.java
Propchange: commons/proper/weaver/trunk/modules/normalizer/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Dec 11 20:33:19 2015
@@ -10,3 +10,4 @@ target
*.log
.git
.gitignore
+dependency-reduced-pom.xml
Copied: commons/proper/weaver/trunk/modules/normalizer/pom.xml (from r1719260, commons/proper/weaver/trunk/modules/normalizer/weaver/pom.xml)
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/normalizer/pom.xml?p2=commons/proper/weaver/trunk/modules/normalizer/pom.xml&p1=commons/proper/weaver/trunk/modules/normalizer/weaver/pom.xml&r1=1719260&r2=1719537&rev=1719537&view=diff
==============================================================================
--- commons/proper/weaver/trunk/modules/normalizer/weaver/pom.xml (original)
+++ commons/proper/weaver/trunk/modules/normalizer/pom.xml Fri Dec 11 20:33:19 2015
@@ -21,7 +21,7 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-weaver-normalizer-parent</artifactId>
+ <artifactId>commons-weaver-modules-parent</artifactId>
<version>1.2-SNAPSHOT</version>
</parent>
<artifactId>commons-weaver-normalizer</artifactId>
@@ -30,10 +30,16 @@ under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+ <description>
+ The Normalizer module merges identical anonymous class definitions into
+ a single type, thereby "normalizing" them and reducing their
+ collective footprint on your archive and more importantly on your JVM.
+ </description>
+
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/weaver/trunk/modules/normalizer/weaver</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/weaver/trunk/modules/normalizer/weaver</developerConnection>
- <url>http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/normalizer/weaver</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/weaver/trunk/modules/normalizer</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/weaver/trunk/modules/normalizer</developerConnection>
+ <url>http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/normalizer</url>
</scm>
<dependencies>
@@ -55,6 +61,13 @@ under the License.
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <!-- IT dependency: -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>commons-weaver-antlib</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
<profile>
@@ -181,10 +194,14 @@ under the License.
</goals>
</execution>
<execution>
- <id>antunit</id>
+ <id>it</id>
<phase>integration-test</phase>
<configuration>
<target>
+ <typedef resource="org/apache/commons/weaver/ant/antlib.xml"
+ classpathref="maven.test.classpath"
+ uri="antlib:org.apache.commons.weaver.ant" />
+
<ant antfile="${project.build.directory}/it/sample/build.xml"
usenativebasedir="true">
<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
@@ -210,31 +227,6 @@ under the License.
<version>${ant.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>${ant.version}</version>
- </dependency>
- <!--dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- </dependency-->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>commons-weaver-antlib</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-antunit</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
<version>4.4.2</version>
@@ -253,21 +245,9 @@ under the License.
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <includeArtifactIds>commons-lang3,junit,hamcrest-core</includeArtifactIds>
+ <includeArtifactIds>commons-lang3</includeArtifactIds>
<outputDirectory>${project.build.directory}/it/sample/lib</outputDirectory>
- <!--artifactItems>
- <artifactItem>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.4</version>
- </artifactItem>
- <artifactItem>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- </artifactItem>
- </artifactItems-->
</configuration>
</execution>
</executions>
Modified: commons/proper/weaver/trunk/modules/normalizer/src/it/sample/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/normalizer/src/it/sample/build.xml?rev=1719537&r1=1719260&r2=1719537&view=diff
==============================================================================
--- commons/proper/weaver/trunk/modules/normalizer/src/it/sample/build.xml (original)
+++ commons/proper/weaver/trunk/modules/normalizer/src/it/sample/build.xml Fri Dec 11 20:33:19 2015
@@ -1,6 +1,5 @@
<project name="commons-weaver-normalizer-sample-it-with-cw-antlib"
- default="it" xmlns:au="antlib:org.apache.ant.antunit"
- xmlns:cw="antlib:org.apache.commons.weaver.ant">
+ default="it" xmlns:cw="antlib:org.apache.commons.weaver.ant">
<property name="src.dir" location="${basedir}/src/main/java" />
<property name="target.dir" location="${basedir}/target" />
Modified: commons/proper/weaver/trunk/modules/normalizer/src/it/sample/src/main/java/org/apache/commons/weaver/normalizer/example/Assertions.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/normalizer/src/it/sample/src/main/java/org/apache/commons/weaver/normalizer/example/Assertions.java?rev=1719537&r1=1719260&r2=1719537&view=diff
==============================================================================
--- commons/proper/weaver/trunk/modules/normalizer/src/it/sample/src/main/java/org/apache/commons/weaver/normalizer/example/Assertions.java (original)
+++ commons/proper/weaver/trunk/modules/normalizer/src/it/sample/src/main/java/org/apache/commons/weaver/normalizer/example/Assertions.java Fri Dec 11 20:33:19 2015
@@ -65,5 +65,6 @@ public class Assertions {
final Assertions assertions = new Assertions();
assertions.testGenericType();
assertions.testAlternateConstructors();
+ System.out.println("all clear");
}
}