You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2016/11/12 19:36:29 UTC
[1/3] maven git commit: [MNG-2478] add "resources-filtered" filtered
resource directories to super POM
Repository: maven
Updated Branches:
refs/heads/master 0eb1e937b -> 33791993a
[MNG-2478] add "resources-filtered" filtered resource directories to super POM
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/33791993
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/33791993
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/33791993
Branch: refs/heads/master
Commit: 33791993ae407eaabd075c407f93680f38b3b501
Parents: 8dab444
Author: Christian Schulte <sc...@apache.org>
Authored: Sat Nov 12 20:28:22 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Sat Nov 12 20:35:52 2016 +0100
----------------------------------------------------------------------
.../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/33791993/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index c060e31..b120962 100644
--- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -65,11 +65,19 @@ under the License.
<resource>
<directory>${project.basedir}/src/main/resources</directory>
</resource>
+ <resource>
+ <directory>${project.basedir}/src/main/resources-filtered</directory>
+ <filtering>true</filtering>
+ </resource>
</resources>
<testResources>
<testResource>
<directory>${project.basedir}/src/test/resources</directory>
</testResource>
+ <testResource>
+ <directory>${project.basedir}/src/test/resources-filtered</directory>
+ <filtering>true</filtering>
+ </testResource>
</testResources>
</build>
[2/3] maven git commit: [MNG-5940] Change the maven-source-plugin jar
goal into jar-no-fork in Maven Super POM
Posted by sc...@apache.org.
[MNG-5940] Change the maven-source-plugin jar goal into jar-no-fork in Maven Super POM
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8dab4440
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8dab4440
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8dab4440
Branch: refs/heads/master
Commit: 8dab4440f0925ea4e4e0f7afe5fd28469b29257e
Parents: 6cca564
Author: Christian Schulte <sc...@apache.org>
Authored: Sat Nov 12 20:23:46 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Sat Nov 12 20:35:52 2016 +0100
----------------------------------------------------------------------
.../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/8dab4440/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index 5ca4ce3..c060e31 100644
--- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -98,7 +98,7 @@ under the License.
<execution>
<id>attach-sources</id>
<goals>
- <goal>jar</goal>
+ <goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
[3/3] maven git commit: [MNG-6054] Removal of super pom plugin
management.
Posted by sc...@apache.org.
[MNG-6054] Removal of super pom plugin management.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6cca5643
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6cca5643
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6cca5643
Branch: refs/heads/master
Commit: 6cca5643a82bdbe6545895a83bc3f16a0d3b4658
Parents: 0eb1e93
Author: Christian Schulte <sc...@apache.org>
Authored: Sat Nov 12 20:20:11 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Sat Nov 12 20:35:52 2016 +0100
----------------------------------------------------------------------
.../org/apache/maven/model/pom-4.0.0.xml | 22 --------------------
1 file changed, 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/6cca5643/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index c9770b0..5ca4ce3 100644
--- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -71,28 +71,6 @@ under the License.
<directory>${project.basedir}/src/test/resources</directory>
</testResource>
</testResources>
- <pluginManagement>
- <!-- NOTE: These plugins will be removed from future versions of the super POM -->
- <!-- They are kept for the moment as they are very unlikely to conflict with lifecycle mappings (MNG-4453) -->
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<reporting>