You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/04/14 13:50:36 UTC
[maven-compiler-plugin] branch ORDER_ISSUE created (now d12fe39)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch ORDER_ISSUE
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git.
at d12fe39 Moved two dependendent modules into a single aggregator build to make sure the order is being kept.
This branch includes the following new commits:
new d12fe39 Moved two dependendent modules into a single aggregator build to make sure the order is being kept.
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.
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.
[maven-compiler-plugin] 01/01: Moved two dependendent modules into
a single aggregator build to make sure the order is being kept.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch ORDER_ISSUE
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git
commit d12fe39f8a467aa7c867ed5289960d39a04f1925
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Apr 14 15:49:58 2018 +0200
Moved two dependendent modules into a single
aggregator build to make sure the order is being
kept.
---
pom.xml | 10 ++++++----
src/it/setup_jar_classic/invoker.properties | 19 -------------------
.../invoker.properties | 0
src/it/{setup_jar_classic => setup_x}/pom.xml | 22 +++++++---------------
src/it/{ => setup_x}/setup_jar_classic/pom.xml | 0
.../src/main/java/com/ta2/MyClass.java | 0
.../{ => setup_x}/setup_module-transitive/pom.xml | 0
.../src/main/java/com/ta2/plus/MyClass.java | 0
.../src/main/java/module-info.java | 0
9 files changed, 13 insertions(+), 38 deletions(-)
diff --git a/pom.xml b/pom.xml
index 75c1b56..8bb3c4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -274,15 +274,17 @@ under the License.
<pomInclude>extras/*/pom.xml</pomInclude>
</pomIncludes>
<!--
- ! Define explicit the order
+ ! Unfortunately we can't define an execution order.
! https://issues.apache.org/jira/browse/MINVOKER-174
-->
<setupIncludes>
- <setupInclude>setup_jar_automodule/pom.xml</setupInclude>
- <setupInclude>setup_jar_classic/pom.xml</setupInclude>
<setupInclude>setup_jar_module/pom.xml</setupInclude>
- <setupInclude>setup_module-transitive/pom.xml</setupInclude>
+ <setupInclude>setup_jar_automodule/pom.xml</setupInclude>
+ <setupInclude>setup_x/pom.xml</setupInclude>
</setupIncludes>
+ <setupExcludes>
+ <setupExclude>setup_x/**</setupExclude>
+ </setupExcludes>
<postBuildHookScript>verify</postBuildHookScript>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<settingsFile>src/it/settings.xml</settingsFile>
diff --git a/src/it/setup_jar_classic/invoker.properties b/src/it/setup_jar_classic/invoker.properties
deleted file mode 100644
index 4b40d10..0000000
--- a/src/it/setup_jar_classic/invoker.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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.
-
-invoker.java.version = 1.9+
-invoker.goals = install
diff --git a/src/it/setup_module-transitive/invoker.properties b/src/it/setup_x/invoker.properties
similarity index 100%
rename from src/it/setup_module-transitive/invoker.properties
rename to src/it/setup_x/invoker.properties
diff --git a/src/it/setup_jar_classic/pom.xml b/src/it/setup_x/pom.xml
similarity index 73%
copy from src/it/setup_jar_classic/pom.xml
copy to src/it/setup_x/pom.xml
index 6c9c7c9..85c40d9 100644
--- a/src/it/setup_jar_classic/pom.xml
+++ b/src/it/setup_x/pom.xml
@@ -23,25 +23,17 @@
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>org.apache.maven.plugins.compiler.it</groupId>
- <artifactId>ta2</artifactId>
+ <groupId>org.apache.maven.plugins.compiler.it.setup</groupId>
+ <artifactId>setup</artifactId>
<version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <release>9</release>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <modules>
+ <module>setup_jar_classic</module>
+ <module>setup_module-transitive</module>
+ </modules>
</project>
diff --git a/src/it/setup_jar_classic/pom.xml b/src/it/setup_x/setup_jar_classic/pom.xml
similarity index 100%
rename from src/it/setup_jar_classic/pom.xml
rename to src/it/setup_x/setup_jar_classic/pom.xml
diff --git a/src/it/setup_jar_classic/src/main/java/com/ta2/MyClass.java b/src/it/setup_x/setup_jar_classic/src/main/java/com/ta2/MyClass.java
similarity index 100%
rename from src/it/setup_jar_classic/src/main/java/com/ta2/MyClass.java
rename to src/it/setup_x/setup_jar_classic/src/main/java/com/ta2/MyClass.java
diff --git a/src/it/setup_module-transitive/pom.xml b/src/it/setup_x/setup_module-transitive/pom.xml
similarity index 100%
rename from src/it/setup_module-transitive/pom.xml
rename to src/it/setup_x/setup_module-transitive/pom.xml
diff --git a/src/it/setup_module-transitive/src/main/java/com/ta2/plus/MyClass.java b/src/it/setup_x/setup_module-transitive/src/main/java/com/ta2/plus/MyClass.java
similarity index 100%
rename from src/it/setup_module-transitive/src/main/java/com/ta2/plus/MyClass.java
rename to src/it/setup_x/setup_module-transitive/src/main/java/com/ta2/plus/MyClass.java
diff --git a/src/it/setup_module-transitive/src/main/java/module-info.java b/src/it/setup_x/setup_module-transitive/src/main/java/module-info.java
similarity index 100%
rename from src/it/setup_module-transitive/src/main/java/module-info.java
rename to src/it/setup_x/setup_module-transitive/src/main/java/module-info.java
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.