youys
/
ant
Not watched
1
0
Fork 1
Code
Releases 0 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

No reason to have ant-junit4.jar anymore. 

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1460264 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 12 years ago
parent
15b31983d4
commit
06a819d3ad
5 changed files with 7 additions and 94 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -0
      WHATSNEW
  2. +2
    -18
      build.xml
  3. +1
    -4
      src/etc/poms/ant-junit/pom.xml
  4. +0
    -70
      src/etc/poms/ant-junit4/pom.xml
  5. +1
    -2
      src/etc/poms/pom.xml

+ 3
- 0
WHATSNEW View File

@@ -4,6 +4,9 @@ Changes from Ant 1.9.0 TO current
Changes that could break older environments: Changes that could break older environments:
------------------------------------------- -------------------------------------------


* the optional ant-junit4.jar has been merged into ant-junit.jar
as Ant now requires JUnit4.

Fixed bugs: Fixed bugs:
----------- -----------




+ 2
- 18
build.xml View File

@@ -186,16 +186,7 @@
</selector> </selector>


<selector id="needs.junit"> <selector id="needs.junit">
<and>
<filename name="${optional.package}/junit/"/>
<not>
<filename name="${optional.package}/junit/JUnit4TestMethodAdapter*"/>
</not>
</and>
</selector>

<selector id="needs.junit4">
<filename name="${optional.package}/junit/JUnit4TestMethodAdapter*"/>
<filename name="${optional.package}/junit/"/>
</selector> </selector>


<selector id="needs.apache-regexp"> <selector id="needs.apache-regexp">
@@ -304,7 +295,6 @@
<selector refid="needs.jmf"/> <selector refid="needs.jmf"/>
<selector refid="needs.jsch"/> <selector refid="needs.jsch"/>
<selector refid="needs.junit"/> <selector refid="needs.junit"/>
<selector refid="needs.junit4"/>
<selector refid="needs.netrexx"/> <selector refid="needs.netrexx"/>
<selector refid="needs.swing"/> <selector refid="needs.swing"/>
<selector refid="ant.launcher"/> <selector refid="ant.launcher"/>
@@ -378,9 +368,6 @@
classname="org.apache.xalan.trace.TraceListenerEx3" classname="org.apache.xalan.trace.TraceListenerEx3"
classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/> classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
<available property="junit.present" <available property="junit.present"
classname="junit.framework.TestCase"
classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
<available property="junit4.present"
classname="org.junit.Test" classname="org.junit.Test"
classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/> classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
<available property="antunit.present" <available property="antunit.present"
@@ -561,8 +548,7 @@
<selector refid="not.in.kaffe" if="kaffe"/> <selector refid="not.in.kaffe" if="kaffe"/>


<selector refid="needs.apache-resolver" unless="apache.resolver.present"/> <selector refid="needs.apache-resolver" unless="apache.resolver.present"/>
<selector refid="needs.junit" unless="junit.present"/> <!-- XXX should perhaps use -source 1.4? -->
<selector refid="needs.junit4" unless="junit4.present"/>
<selector refid="needs.junit" unless="junit.present"/>
<selector refid="needs.apache-regexp" <selector refid="needs.apache-regexp"
unless="apache.regexp.present"/> unless="apache.regexp.present"/>
<selector refid="needs.apache-oro" unless="apache.oro.present"/> <selector refid="needs.apache-oro" unless="apache.oro.present"/>
@@ -735,7 +721,6 @@


<optional-jar dep="apache-resolver"/> <optional-jar dep="apache-resolver"/>
<optional-jar dep="junit"/> <optional-jar dep="junit"/>
<optional-jar dep="junit4"/>
<optional-jar dep="apache-regexp"/> <optional-jar dep="apache-regexp"/>
<optional-jar dep="apache-oro"/> <optional-jar dep="apache-oro"/>
<optional-jar dep="apache-bcel"/> <optional-jar dep="apache-bcel"/>
@@ -828,7 +813,6 @@


<optional-src-jar dep="apache-resolver"/> <optional-src-jar dep="apache-resolver"/>
<optional-src-jar dep="junit"/> <optional-src-jar dep="junit"/>
<optional-src-jar dep="junit4"/>
<optional-src-jar dep="apache-regexp"/> <optional-src-jar dep="apache-regexp"/>
<optional-src-jar dep="apache-oro"/> <optional-src-jar dep="apache-oro"/>
<optional-src-jar dep="apache-bcel"/> <optional-src-jar dep="apache-bcel"/>


+ 1
- 4
src/etc/poms/ant-junit/pom.xml View File

@@ -45,7 +45,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>3.8.2</version>
<version>4.11</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@@ -82,9 +82,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<includes> <includes>
<include>org/apache/tools/ant/taskdefs/optional/junit/*</include> <include>org/apache/tools/ant/taskdefs/optional/junit/*</include>
</includes> </includes>
<excludes>
<exclude>org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter*</exclude>
</excludes>
<testIncludes> <testIncludes>
<include>org/apache/tools/ant/taskdefs/optional/junit/</include> <include>org/apache/tools/ant/taskdefs/optional/junit/</include>
</testIncludes> </testIncludes>


+ 0
- 70
src/etc/poms/ant-junit4/pom.xml View File

@@ -1,70 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!--
This POM has been created manually by the Ant Development Team.
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junit4</artifactId>
<version>1.9.1-SNAPSHOT</version>
<name>Apache Ant + JUnit 4</name>
<description>contains JUnit 4.x support</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<includes>
<include>org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter*</include>
</includes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
<outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
<testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
<directory>../../../../target/${project.artifactId}</directory>
</build>
</project>

+ 1
- 2
src/etc/poms/pom.xml View File

@@ -97,7 +97,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<module>ant-jmf</module> <module>ant-jmf</module>
<module>ant-jsch</module> <module>ant-jsch</module>
<module>ant-junit</module> <module>ant-junit</module>
<module>ant-junit4</module>
<module>ant-launcher</module> <module>ant-launcher</module>
<module>ant-netrexx</module> <module>ant-netrexx</module>
<module>ant-swing</module> <module>ant-swing</module>
@@ -107,7 +106,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>3.8.2</version>
<version>4.11</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>


Write Preview
Loading…
Cancel
Save
Please read the following content carefully:

Dear OpenI User

Thank you for your continuous support to the Openl Qizhi Community AI Collaboration Platform. In order to protect your usage rights and ensure network security, we updated the Openl Qizhi Community AI Collaboration Platform Usage Agreement in January 2024. The updated agreement specifies that users are prohibited from using intranet penetration tools. After you click "Agree and continue", you can continue to use our services. Thank you for your cooperation and understanding.

For more agreement content, please refer to the《Openl Qizhi Community AI Collaboration Platform Usage Agreement》

Agree and continue
Disagree, exit