You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/01/23 12:55:31 UTC
[maven-antrun-plugin] branch MANTRUN-208 updated (1f43241 ->
9553c0c)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MANTRUN-208
in repository https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git.
discard 1f43241 [MANTRUN-208] Added integration test
add 01787a7 MANTRUN-221 Fails to pass maven properties set in user properties only
new 9553c0c [MANTRUN-208] Added integration test
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1f43241)
\
N -- N -- N refs/heads/MANTRUN-208 (9553c0c)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 1 +
.../build.xml | 12 ++++++--
.../invoker.properties | 0
src/it/MANTRUN-221/package.json | 4 +++
src/it/{MANTRUN-178 => MANTRUN-221}/pom.xml | 32 ++++++++++++++++------
.../apache/maven/plugins/antrun/AntRunMojo.java | 4 ++-
6 files changed, 40 insertions(+), 13 deletions(-)
copy src/it/{attach-artifact-from-ant-task => MANTRUN-221}/build.xml (74%)
copy src/it/{export-ant-properties => MANTRUN-221}/invoker.properties (100%)
create mode 100644 src/it/MANTRUN-221/package.json
copy src/it/{MANTRUN-178 => MANTRUN-221}/pom.xml (69%)
[maven-antrun-plugin] 01/01: [MANTRUN-208] Added integration test
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MANTRUN-208
in repository https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git
commit 9553c0c69232903c3a43876c36df49274eb6f896
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Apr 17 17:31:07 2019 +0200
[MANTRUN-208] Added integration test
---
src/it/mantrun-208/pom.xml | 71 +++++++++++++++++++++++++++++++++++++++++++
src/it/mantrun-208/verify.bsh | 44 +++++++++++++++++++++++++++
2 files changed, 115 insertions(+)
diff --git a/src/it/mantrun-208/pom.xml b/src/it/mantrun-208/pom.xml
new file mode 100644
index 0000000..94d549f
--- /dev/null
+++ b/src/it/mantrun-208/pom.xml
@@ -0,0 +1,71 @@
+<?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.
+-->
+
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>antrun-plugin.test</groupId>
+ <artifactId>antrun-plugin-test</artifactId>
+ <packaging>jar</packaging>
+ <version>mantrun-208</version>
+ <inceptionYear>2006</inceptionYear>
+ <name>Maven Antrun Plugin Test</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>@pom.version@</version>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <configuration>
+ <target>
+ <property name="compile_classpath" refid="maven.compile.classpath"/>
+ <property name="runtime_classpath" refid="maven.runtime.classpath"/>
+ <property name="test_classpath" refid="maven.test.classpath"/>
+ <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+ <echo message="compile classpath: |${compile_classpath}|"/>
+ <echo message="runtime classpath: |${runtime_classpath}|"/>
+ <echo message="test classpath: |${test_classpath}|"/>
+ <echo message="plugin classpath: |${plugin_classpath}|"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/it/mantrun-208/verify.bsh b/src/it/mantrun-208/verify.bsh
new file mode 100644
index 0000000..91cbbe0
--- /dev/null
+++ b/src/it/mantrun-208/verify.bsh
@@ -0,0 +1,44 @@
+
+/*
+ * 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.
+ */
+
+import java.io.*;
+import java.util.*;
+import java.util.regex.*;
+
+import org.codehaus.plexus.util.*;
+
+try
+{
+ File buildLog = new File( basedir, "build.log" );
+ String log = FileUtils.fileRead( buildLog );
+
+ if ( log.indexOf( "compile classpath: |" ) < 0 || log.indexOf( "compile classpath: ||" ) >= 0 )
+ {
+ System.err.println( "Generated console output does not contain compile classpath: " + buildLog );
+ return false;
+ }
+}
+catch( Throwable t )
+{
+ t.printStackTrace();
+ return false;
+}
+
+return true;