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/05/08 23:21:21 UTC
[45/50] [abbrv] incubator-streams git commit: [maven-release-plugin]
prepare for next development iteration
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/4339d690
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/4339d690
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/4339d690
Branch: refs/heads/pp-master
Commit: 4339d690049a4dac066a1c23af7b2d30b61999b6
Parents: 434848f
Author: Steve Blackmon <sb...@apache.org>
Authored: Sun Apr 5 17:39:55 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Fri May 8 15:51:56 2015 -0500
----------------------------------------------------------------------
pom.xml | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4339d690/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 92c5869..644c80b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,11 +12,8 @@
<groupId>org.apache.streams</groupId>
<artifactId>streams-project</artifactId>
<version>0.3-incubating-SNAPSHOT</version>
-<<<<<<< HEAD
<name>Apache Streams Project Parent POM</name>
-=======
->>>>>>> master
<name>Apache Streams Project</name>
<description>Apache Streams Project</description>
@@ -118,9 +115,8 @@
</repository>
</repositories>
-<<<<<<< HEAD
- <distributionManagement>
- <repository>
+ <distributionManagement>
+ <repository>
<id>s3.release</id>
<name>AWS S3 Release Repository</name>
<url>s3://releases.peoplepattern.com</url>
@@ -130,26 +126,11 @@
<name>AWS S3 Snapshot Repository</name>
<url>s3://snapshots.peoplepattern.com</url>
</snapshotRepository>
-</distributionManagement>
-=======
- <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>site.streams.project</id>
<url>scm:svn:https://svn.apache.org/repos/infra/websites/production/streams/content/site/${project.version}/streams-project</url>
</site>
</distributionManagement>
->>>>>>> master
<properties>