You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2015/12/04 16:52:54 UTC
incubator-streams-master git commit: resolves STREAMS-390 additional
PR to incubator-streams
Repository: incubator-streams-master
Updated Branches:
refs/heads/master b5a4dba4f -> a9f0ca346
resolves STREAMS-390
additional PR to incubator-streams
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/commit/a9f0ca34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/tree/a9f0ca34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/diff/a9f0ca34
Branch: refs/heads/master
Commit: a9f0ca346139c2f1083d41eac733792eedd60bf2
Parents: b5a4dba
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Wed Dec 2 16:30:53 2015 -0600
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Wed Dec 2 16:30:53 2015 -0600
----------------------------------------------------------------------
pom.xml | 104 +++++++++++++++++++++++++++++++++++------------------------
1 file changed, 62 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams-master/blob/a9f0ca34/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index abf1e9a..838befa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>16</version>
+ <version>17</version>
</parent>
<groupId>org.apache.streams</groupId>
@@ -118,6 +118,7 @@
<!-- Build Properties -->
<java.version>1.7</java.version>
+ <scala.version>2.10</scala.version>
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -133,6 +134,7 @@
<!-- Plugin and Plugin Dependency Versions -->
<build-helper.plugin.version>1.8</build-helper.plugin.version>
+ <bundle.plugin.version>1.4.3</bundle.plugin.version>
<compiler.plugin.version>3.0</compiler.plugin.version>
<clean.plugin.version>2.6</clean.plugin.version>
<depgraph.plugin.version>1.0.2</depgraph.plugin.version>
@@ -141,6 +143,8 @@
<failsafe.plugin.version>2.17</failsafe.plugin.version>
<jar.plugin.version>2.6</jar.plugin.version>
<javadoc.plugin.version>2.10.2</javadoc.plugin.version>
+ <pax.plugin.version>1.5</pax.plugin.version>
+ <reflections.plugin.version>0.9.8</reflections.plugin.version>
<remote-resources.plugin.version>1.4</remote-resources.plugin.version>
<resources.plugin.version>2.7</resources.plugin.version>
<scm.plugin.version>1.9.4</scm.plugin.version>
@@ -175,7 +179,6 @@
<reflections.version>0.9.9</reflections.version>
<orgjson.version>20140107</orgjson.version>
<guava.version>17.0</guava.version>
- <scala.version>2.8.0</scala.version>
<clojure.version>1.4.0</clojure.version>
<zookeeper.version>3.4.5</zookeeper.version>
<netty.version>3.8.0.Final</netty.version>
@@ -394,6 +397,21 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections-maven</artifactId>
+ <version>${reflections.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.ops4j</groupId>
+ <artifactId>maven-pax-plugin</artifactId>
+ <version>${pax.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${bundle.plugin.version}</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${site.plugin.version}</version>
@@ -425,7 +443,6 @@
</dependency>
</dependencies>
</plugin>
-
<!-- Apache POM doesn't define default war-plugin version, so do it here -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -525,8 +542,49 @@
</plugins>
+
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <configuration>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <reports>
+ <report>javadoc-no-fork</report>
+ <report>test-javadoc-no-fork</report>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>html</id>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>${site.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>com.github.ferstl</groupId>
+ <artifactId>depgraph-maven-plugin</artifactId>
+ <version>${depgraph.plugin.version}</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
<profiles>
<profile>
<id>apache-release</id>
@@ -664,45 +722,7 @@
</plugin>
</plugins>
</build>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <configuration>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <reportSets>
- <reportSet>
- <id>aggregate</id>
- <reports>
- <report>javadoc-no-fork</report>
- <report>test-javadoc-no-fork</report>
- <report>aggregate</report>
- </reports>
- </reportSet>
- <reportSet>
- <id>html</id>
- <reports>
- <report>javadoc</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>${site.plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>com.github.ferstl</groupId>
- <artifactId>depgraph-maven-plugin</artifactId>
- <version>${depgraph.plugin.version}</version>
- </plugin>
- </plugins>
- </reporting>
+
</profile>
</profiles>
</project>