Merge branch 'STREAMS-245' into 0.1-rc1
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/64bb54c8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/64bb54c8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/64bb54c8
Branch: refs/heads/0.1-rc1
Commit: 64bb54c818c7ec9ef08ce78caca240e10494ebc6
Parents: 536f85d ba9b20b
Author: sblackmon <[email protected]>
Authored: Thu Dec 11 15:06:15 2014 -0600
Committer: sblackmon <[email protected]>
Committed: Thu Dec 11 15:06:15 2014 -0600
----------------------------------------------------------------------
pom.xml | 148 +++++++++++++++++++++++++++++++++++++++++----
poms/wrappers/pom.xml | 3 -
2 files changed, 135 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/64bb54c8/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 265a3e3,9c75df6..fdb1885
--- a/pom.xml
+++ b/pom.xml
@@@ -58,10 -140,47 +140,48 @@@
</repository>
</repositories>
+ <distributionManagement>
+ <repository>
+ <id>streams.releases</id>
+ <name>Streams Releases</name>
+ <url>${release.repository.url}</url>
+ </repository>
+ <!-- Snapshots (not-releases) are published to this repository -->
+ <snapshotRepository>
+ <id>streams.snapshots</id>
+ <name>Streams Snapshots</name>
+ <url>${snapshot.repository.url}</url>
+ </snapshotRepository>
+ <site>
+ <id>apache.website</id>
+
<url>scm:svn:https://svn.apache.org/repos/infra/websites/production/streams/content/site/</url>
+ </site>
+ </distributionManagement>
+
<properties>
+
+ <!-- Build Properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.7</java.version>
+
+ <!-- Release Properties -->
+ <snapshot.repository.url>
+ https://repository.apache.org/content/repositories/snapshots
+ </snapshot.repository.url>
+ <release.repository.url>
+ https://repository.apache.org/service/local/staging/deploy/maven2
+ </release.repository.url>
+
+ <!-- Plugin and Plugin Dependency Versions -->
+ <compiler.plugin.version>3.0</compiler.plugin.version>
+ <failsafe.plugin.version>2.17</failsafe.plugin.version>
+ <surefire.plugin.version>2.17</surefire.plugin.version>
+ <war.plugin.version>2.5</war.plugin.version>
+ <site.plugin.version>3.4</site.plugin.version>
+ <maven.enforcer.plugin.version>1.3.1</maven.enforcer.plugin.version>
+
+ <!-- Library Dependency Versions -->
<org.osgi.service.http.port>8080</org.osgi.service.http.port>
<org.osgi.service.http.port.secure>8443</org.osgi.service.http.port.secure>
<jackson.version>2.3.2</jackson.version>
@@@ -75,10 -194,6 +195,9 @@@
<jaxb2-basics.version>0.8.4</jaxb2-basics.version>
<jaxbutil.version>1.2.6</jaxbutil.version>
<junit.version>4.11</junit.version>
+ <surefire.plugin.version>2.17</surefire.plugin.version>
+ <failsafe.plugin.version>2.17</failsafe.plugin.version>
+ <war.plugin.version>2.5</war.plugin.version>
- <resources.plugin.version>2.7</resources.plugin.version>
<slf4j.version>1.7.6</slf4j.version>
<log4j.version>1.2.16</log4j.version>
<logback.version>1.1.1</logback.version>
