You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2014/08/25 20:42:30 UTC
[5/8] git commit: [OPTIQ-381] Remove plugin versions from the
tag in root pom
[OPTIQ-381] Remove plugin versions from the <plugins> tag in root pom
Also, remove Pentaho from repositories list.
Project: http://git-wip-us.apache.org/repos/asf/incubator-optiq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-optiq/commit/58366980
Tree: http://git-wip-us.apache.org/repos/asf/incubator-optiq/tree/58366980
Diff: http://git-wip-us.apache.org/repos/asf/incubator-optiq/diff/58366980
Branch: refs/heads/master
Commit: 58366980450ccd3579b2cf85659ad99312351641
Parents: 3580ed4
Author: Julian Hyde <jh...@apache.org>
Authored: Thu Aug 21 17:50:05 2014 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Fri Aug 22 00:41:10 2014 -0700
----------------------------------------------------------------------
pom.xml | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/58366980/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 82f76bf..cd2f019 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,6 +248,7 @@ limitations under the License.
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
@@ -257,7 +258,6 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.12.1</version>
<executions>
<execution>
<id>validate</id>
@@ -277,6 +277,10 @@ limitations under the License.
</executions>
</plugin>
<plugin>
+ <!-- Override apache parent POM's definition of release
+ plugin. If we don't specify gitexe version, git doesn't
+ commit during release process. -->
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<dependencies>
<dependency>
@@ -324,7 +328,6 @@ limitations under the License.
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
- <version>2.1.9</version>
<inherited>false</inherited>
<executions>
<execution>
@@ -366,6 +369,11 @@ limitations under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.12.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.1</version>
</plugin>
@@ -379,6 +387,11 @@ limitations under the License.
<artifactId>javacc-maven-plugin</artifactId>
<version>2.4</version>
</plugin>
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ <version>2.1.9</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -423,17 +436,6 @@ limitations under the License.
<updatePolicy>always</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</releases>
- <id>pentaho</id>
- <name>Pentaho</name>
- <url>http://repo.pentaho.org/artifactory/repo</url>
- <layout>default</layout>
- </repository>
- <repository>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
<id>conjars</id>
<name>Conjars</name>
<url>http://conjars.org/repo</url>