You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2018/08/13 22:20:56 UTC
[maven-scm] branch SCM-894 created (now c595cbb)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch SCM-894
in repository https://gitbox.apache.org/repos/asf/maven-scm.git.
at c595cbb [SCM-894] Upgrade parent to 32
This branch includes the following new commits:
new c595cbb [SCM-894] Upgrade parent to 32
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.
[maven-scm] 01/01: [SCM-894] Upgrade parent to 32
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SCM-894
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit c595cbbf58ec3a1113072e7c02122f3a74784c5b
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Aug 14 00:20:16 2018 +0200
[SCM-894] Upgrade parent to 32
---
maven-scm-client/pom.xml | 4 +-
.../maven-scm-provider-clearcase/pom.xml | 5 +-
.../maven-scm-provider-local/pom.xml | 5 +-
.../maven-scm-provider-starteam/pom.xml | 5 +-
maven-scm-providers/maven-scm-provider-vss/pom.xml | 1 -
.../maven-scm-provider-cvs-commons/pom.xml | 1 -
.../maven-scm-provider-git-commons/pom.xml | 1 -
.../maven-scm-provider-svn-commons/pom.xml | 1 -
pom.xml | 155 ++++++++++-----------
9 files changed, 86 insertions(+), 92 deletions(-)
diff --git a/maven-scm-client/pom.xml b/maven-scm-client/pom.xml
index a46d42f..9e59069 100644
--- a/maven-scm-client/pom.xml
+++ b/maven-scm-client/pom.xml
@@ -127,7 +127,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <descriptorId>jar-with-dependencies</descriptorId>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
<finalName>maven-scm-client-${project.version}</finalName>
<archive>
<manifestEntries>
diff --git a/maven-scm-providers/maven-scm-provider-clearcase/pom.xml b/maven-scm-providers/maven-scm-provider-clearcase/pom.xml
index 2fac8f8..730b7ae 100644
--- a/maven-scm-providers/maven-scm-provider-clearcase/pom.xml
+++ b/maven-scm-providers/maven-scm-provider-clearcase/pom.xml
@@ -45,8 +45,8 @@
<goals>
<goal>generate-metadata</goal>
</goals>
- </execution>
- </executions>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.codehaus.modello</groupId>
@@ -63,7 +63,6 @@
</executions>
<configuration>
<version>1.1.0</version>
- <useJava5>true</useJava5>
<models>
<model>src/main/mdo/clearcase-settings.mdo</model>
</models>
diff --git a/maven-scm-providers/maven-scm-provider-local/pom.xml b/maven-scm-providers/maven-scm-provider-local/pom.xml
index f1b73f2..dc17b2a 100644
--- a/maven-scm-providers/maven-scm-provider-local/pom.xml
+++ b/maven-scm-providers/maven-scm-provider-local/pom.xml
@@ -45,8 +45,8 @@
<goals>
<goal>generate-metadata</goal>
</goals>
- </execution>
- </executions>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.codehaus.modello</groupId>
@@ -63,7 +63,6 @@
</executions>
<configuration>
<version>1.0.0</version>
- <useJava5>true</useJava5>
<models>
<model>src/main/mdo/maven-scm-local-metadata.mdo</model>
</models>
diff --git a/maven-scm-providers/maven-scm-provider-starteam/pom.xml b/maven-scm-providers/maven-scm-provider-starteam/pom.xml
index 0d7af1d..4697738 100644
--- a/maven-scm-providers/maven-scm-provider-starteam/pom.xml
+++ b/maven-scm-providers/maven-scm-provider-starteam/pom.xml
@@ -45,8 +45,8 @@
<goals>
<goal>generate-metadata</goal>
</goals>
- </execution>
- </executions>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.codehaus.modello</groupId>
@@ -63,7 +63,6 @@
</executions>
<configuration>
<version>1.0.0</version>
- <useJava5>true</useJava5>
<models>
<model>src/main/mdo/starteam-settings.mdo</model>
</models>
diff --git a/maven-scm-providers/maven-scm-provider-vss/pom.xml b/maven-scm-providers/maven-scm-provider-vss/pom.xml
index 4cebeda..ff92847 100644
--- a/maven-scm-providers/maven-scm-provider-vss/pom.xml
+++ b/maven-scm-providers/maven-scm-provider-vss/pom.xml
@@ -80,7 +80,6 @@
</executions>
<configuration>
<version>1.0.0</version>
- <useJava5>true</useJava5>
<models>
<model>src/main/mdo/vss-settings.mdo</model>
</models>
diff --git a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml
index fc1708c..621bd86 100644
--- a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml
@@ -58,7 +58,6 @@
</executions>
<configuration>
<version>1.0.0</version>
- <useJava5>true</useJava5>
<models>
<model>src/main/mdo/cvs-settings.mdo</model>
</models>
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml
index 90b2533..4ca64f2 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml
@@ -67,7 +67,6 @@
</executions>
<configuration>
<version>1.1.0</version>
- <useJava5>true</useJava5>
<models>
<model>src/main/mdo/git-settings.mdo</model>
</models>
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml
index 6e9b1f9..655731a 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml
@@ -67,7 +67,6 @@
</executions>
<configuration>
<version>1.1.0</version>
- <useJava5>true</useJava5>
<models>
<model>src/main/mdo/svn-settings.mdo</model>
</models>
diff --git a/pom.xml b/pom.xml
index 33c6622..703e1fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>30</version>
+ <version>32</version>
</parent>
<groupId>org.apache.maven.scm</groupId>
@@ -325,18 +325,6 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <version>1.9.1</version>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -356,73 +344,10 @@
<exclude>src/test/linear-changelog/**</exclude>
<exclude>src/test/tck-repository/**</exclude>
<exclude>src/main/resources/tck/**</exclude>
- <exclude>.java-version</exclude>
- <exclude>.repository/**</exclude><!-- for CI -->
<exclude>.travis.yml </exclude>
</excludes>
</configuration>
</plugin>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.rat</groupId>
- <artifactId>
- apache-rat-plugin
- </artifactId>
- <versionRange>[0.11,)</versionRange>
- <goals>
- <goal>check</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-enforcer-plugin
- </artifactId>
- <versionRange>[1.3.1,)</versionRange>
- <goals>
- <goal>enforce</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-remote-resources-plugin
- </artifactId>
- <versionRange>[1.5,)</versionRange>
- <goals>
- <goal>process</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -459,7 +384,6 @@
</dependencies>
</plugin>
</plugins>
-
</build>
<contributors>
@@ -502,7 +426,6 @@
</contributors>
<profiles>
-
<profile>
<id>reporting</id>
<reporting>
@@ -686,6 +609,82 @@
</build>
</profile>
+ <profile>
+ <id>only-eclipse</id>
+ <activation>
+ <property>
+ <name>m2e.version</name>
+ </property>
+ </activation>
+ <build>
+ <pluginManagement>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on
+ the Maven build itself. -->
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>
+ apache-rat-plugin
+ </artifactId>
+ <versionRange>[0.11,)</versionRange>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-enforcer-plugin
+ </artifactId>
+ <versionRange>[1.3.1,)</versionRange>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-remote-resources-plugin
+ </artifactId>
+ <versionRange>[1.5,)</versionRange>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
</profiles>
<repositories>