You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2018/03/20 15:15:57 UTC
[1/3] ant git commit: whitespace
Repository: ant
Updated Branches:
refs/heads/master 3c1037ae7 -> 1dcbdaebb
whitespace
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/a5a1f93e
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/a5a1f93e
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/a5a1f93e
Branch: refs/heads/master
Commit: a5a1f93e9d2c975e7a18354fe54979e7eaecd406
Parents: 3c1037a
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Mar 20 16:03:31 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Mar 20 16:03:31 2018 +0100
----------------------------------------------------------------------
build.xml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/a5a1f93e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 108c0a2..3d8dcde 100644
--- a/build.xml
+++ b/build.xml
@@ -212,15 +212,15 @@
<filename name="${optional.package}/junitlauncher/"/>
</selector>
- <selector id="needs.junit.engine.vintage">
- <!-- we need JUnit vintage engine only in tests where we test the junitlauncher task -->
- <filename name="${src.junit}/org/apache/tools/ant/taskdefs/optional/junitlauncher/**/*"/>
- </selector>
-
- <selector id="needs.junit.engine.jupiter">
- <!-- we need JUnit jupiter engine only in tests where we test the junitlauncher task -->
- <filename name="${src.junit}/org/apache/tools/ant/taskdefs/optional/junitlauncher/**/*"/>
- </selector>
+ <selector id="needs.junit.engine.vintage">
+ <!-- we need JUnit vintage engine only in tests where we test the junitlauncher task -->
+ <filename name="${src.junit}/org/apache/tools/ant/taskdefs/optional/junitlauncher/**/*"/>
+ </selector>
+
+ <selector id="needs.junit.engine.jupiter">
+ <!-- we need JUnit jupiter engine only in tests where we test the junitlauncher task -->
+ <filename name="${src.junit}/org/apache/tools/ant/taskdefs/optional/junitlauncher/**/*"/>
+ </selector>
<selector id="needs.apache-regexp">
<filename name="${regexp.package}/JakartaRegexp*"/>
[3/3] ant git commit: add a POM for ant-junitlauncher
Posted by bo...@apache.org.
add a POM for ant-junitlauncher
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/1dcbdaeb
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/1dcbdaeb
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/1dcbdaeb
Branch: refs/heads/master
Commit: 1dcbdaebb0df08a451288c4f695fa15b78bf7f21
Parents: 3f61bd6
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Mar 20 16:15:21 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Mar 20 16:15:21 2018 +0100
----------------------------------------------------------------------
src/etc/poms/ant-junitlauncher/pom.xml | 82 +++++++++++++++++++++++++++++
src/etc/poms/pom.xml | 1 +
2 files changed, 83 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/1dcbdaeb/src/etc/poms/ant-junitlauncher/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-junitlauncher/pom.xml b/src/etc/poms/ant-junitlauncher/pom.xml
new file mode 100644
index 0000000..930ce64
--- /dev/null
+++ b/src/etc/poms/ant-junitlauncher/pom.xml
@@ -0,0 +1,82 @@
+<?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.10.3-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <url>http://ant.apache.org/</url>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-junitlauncher</artifactId>
+ <version>1.10.3-SNAPSHOT</version>
+ <name>Apache Ant + JUnit 5</name>
+ <description>contains JUnit 5.x support</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.10.3-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-launcher</artifactId>
+ <version>1.1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>5.1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>5.1.0</version>
+ <scope>test</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/junitlauncher/*</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>
http://git-wip-us.apache.org/repos/asf/ant/blob/1dcbdaeb/src/etc/poms/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/pom.xml b/src/etc/poms/pom.xml
index e2b4c35..94b19f1 100644
--- a/src/etc/poms/pom.xml
+++ b/src/etc/poms/pom.xml
@@ -99,6 +99,7 @@
<module>ant-jsch</module>
<module>ant-junit</module>
<module>ant-junit4</module>
+ <module>ant-junitlauncher</module>
<module>ant-launcher</module>
<module>ant-netrexx</module>
<module>ant-swing</module>
[2/3] ant git commit: exclude junitlauncher package from core build
Posted by bo...@apache.org.
exclude junitlauncher package from core build
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/3f61bd6a
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/3f61bd6a
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/3f61bd6a
Branch: refs/heads/master
Commit: 3f61bd6a4cd7e2269a31b15693ba05055c7dfdcc
Parents: a5a1f93
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Mar 20 16:09:31 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Mar 20 16:09:31 2018 +0100
----------------------------------------------------------------------
src/etc/poms/ant/pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/3f61bd6a/src/etc/poms/ant/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml
index 6d3bed0..3fe400f 100644
--- a/src/etc/poms/ant/pom.xml
+++ b/src/etc/poms/ant/pom.xml
@@ -125,6 +125,7 @@
<exclude>org/apache/tools/ant/taskdefs/optional/image/*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/jdepend/*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/junit/*</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/junitlauncher/*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/net/RExec*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/net/TelnetTask*</exclude>
@@ -149,6 +150,7 @@
<exclude>org/apache/tools/ant/taskdefs/StyleTest*</exclude>
<exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/junit/</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/junitlauncher/</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/ssh/*</exclude>
<exclude>org/apache/tools/ant/types/resolver/**</exclude>