You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2015/01/11 17:45:49 UTC
[05/19] incubator-slider git commit: SLIDER-671 apache-release
profile working, as does normal one. A full public release has not been tested
SLIDER-671 apache-release profile working, as does normal one. A full public release has not been tested
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f722d34e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f722d34e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f722d34e
Branch: refs/heads/branches/branch-0.6
Commit: f722d34e278c200c01bda7a6f1a348d6dd14d1b4
Parents: e69a8d8
Author: Steve Loughran <st...@apache.org>
Authored: Wed Nov 26 15:35:00 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:25:19 2015 +0000
----------------------------------------------------------------------
pom.xml | 78 +++++++++++++++++++++++-------------------------------------
1 file changed, 30 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f722d34e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f51c104..576e4fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,6 +186,7 @@
<!-- artifacts used in plugins -->
<apache-resources.version>1.0.4</apache-resources.version>
+ <apache-source-release-assembly-descriptor.version>1.0.4</apache-source-release-assembly-descriptor.version>
<gmavenVersion>1.5</gmavenVersion>
<gmavenProviderSelection>2.0</gmavenProviderSelection>
<groovy-eclipse-compiler.version>2.8.0-01</groovy-eclipse-compiler.version>
@@ -209,7 +210,7 @@
<maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
<maven-groovydoc-plugin.version>1.3</maven-groovydoc-plugin.version>
<maven-jar-plugin.version>2.5</maven-jar-plugin.version>
- <maven.javadoc.version>2.9.1</maven.javadoc.version>
+ <maven.javadoc.version>2.10.1</maven.javadoc.version>
<maven.project.version>2.4</maven.project.version>
<maven.properties.version>1.0-alpha-2</maven.properties.version>
<maven-project-info-reports-plugin.version>2.7</maven-project-info-reports-plugin.version>
@@ -319,38 +320,8 @@
</goals>
</execution>
</executions>
-
</plugin>
- <!-- Create a source-release artifact that contains the fully buildable
- project directory source structure. This is the artifact which is
- the official subject of any release vote. -->
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.apache.resources</groupId>
- <artifactId>apache-source-release-assembly-descriptor</artifactId>
- <version>${apache-resources.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>source-release-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <descriptorRefs>
- <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@ -393,6 +364,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
+ <version>${maven-remote-resources-plugin.version}</version>
<executions>
<execution>
<goals>
@@ -1119,18 +1091,6 @@
</dependency>
<dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-x-discovery</artifactId>
- <version>${curator.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-x-discovery-server</artifactId>
- <version>${curator.version}</version>
- </dependency>
-
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
@@ -1426,6 +1386,9 @@
<id>apache-release</id>
<build>
<plugins>
+ <!-- Create a source-release artifact that contains the fully buildable
+ project directory source structure. This is the artifact which is
+ the official subject of any release vote. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -1434,7 +1397,7 @@
<dependency>
<groupId>org.apache.apache.resources</groupId>
<artifactId>apache-source-release-assembly-descriptor</artifactId>
- <version>1.0.4</version>
+ <version>${apache-source-release-assembly-descriptor.version}</version>
</dependency>
</dependencies>
<executions>
@@ -1470,10 +1433,10 @@
</executions>
</plugin>
- <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven.javadoc.version}</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -1483,7 +1446,6 @@
</execution>
</executions>
</plugin>
- -->
<!--
<plugin>
<groupId>com.bluetrainsoftware.maven</groupId>
@@ -1682,8 +1644,28 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>javadoc</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven.javadoc.version}</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
-
</project>