streams-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sblack...@apache.org
Subject [2/2] incubator-streams git commit: resolves STREAMS-359 keep a copy of streams-master pom in streams-project
Date Fri, 28 Aug 2015 21:16:15 GMT
resolves STREAMS-359
keep a copy of streams-master pom in streams-project


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/a8e1cc76
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/a8e1cc76
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/a8e1cc76

Branch: refs/heads/STREAMS-359
Commit: a8e1cc76531f024a72e8f8f660f25286769d782e
Parents: 70aec09
Author: Steve Blackmon (@steveblackmon) <sblackmon@apache.org>
Authored: Fri Aug 28 16:16:06 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sblackmon@apache.org>
Committed: Fri Aug 28 16:16:06 2015 -0500

----------------------------------------------------------------------
 incubator-streams-master-pom.xml | 106 ++++++++++++++++++++--------------
 1 file changed, 62 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/a8e1cc76/incubator-streams-master-pom.xml
----------------------------------------------------------------------
diff --git a/incubator-streams-master-pom.xml b/incubator-streams-master-pom.xml
index d22209a..abf1e9a 100644
--- a/incubator-streams-master-pom.xml
+++ b/incubator-streams-master-pom.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -14,18 +32,26 @@
     <name>Apache Streams :: streams-master</name>
     <description>Apache Streams Master Pom</description>
     <packaging>pom</packaging>
-    <version>0.3.4-PP-SNAPSHOT</version>
+    <version>0.3-incubating-SNAPSHOT</version>
 
     <inceptionYear>2012</inceptionYear>
 
-    <url>http://streams.peoplepattern.com/${project.version}/${project.artifactId}</url>
+    <url>http://streams.incubator.apache.org/${project.version}/${project.artifactId}</url>
+
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+            <comments>A business-friendly OSS license</comments>
+        </license>
+    </licenses>
 
     <scm>
-        <connection>scm:git:git@github.com:peoplepattern/incubator-streams-master.git</connection>
-        <developerConnection>scm:git:git@github.com:peoplepattern/incubator-streams-master.git</developerConnection>
-        <url>scm:git:git@github.com:peoplepattern/incubator-streams-master.git</url>
-      <tag>HEAD</tag>
-  </scm>
+        <connection>scm:git:git@github.com:apache/incubator-streams-master.git</connection>
+        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-streams-master.git</developerConnection>
+        <url>scm:git:git@github.com:apache/incubator-streams-master.git</url>
+    </scm>
 
     <issueManagement>
         <system>JIRA</system>
@@ -41,11 +67,26 @@
         <maven>3.0.5</maven>
     </prerequisites>
 
+    <mailingLists>
+        <mailingList>
+            <name>Dev Mailing List</name>
+            <post>dev@streams.incubator.apache.org</post>
+            <subscribe>dev-subscribe@streams.incubator.apache.org</subscribe>
+            <unsubscribe>dev-unsubscribe@streams.incubator.apache.org</unsubscribe>
+        </mailingList>
+        <mailingList>
+            <name>User Mailing List</name>
+            <post>user@streams.incubator.apache.org</post>
+            <subscribe>user-subscribe@streams.incubator.apache.org</subscribe>
+            <unsubscribe>user-unsubscribe@streams.incubator.apache.org</unsubscribe>
+        </mailingList>
+    </mailingLists>
+
     <repositories>
         <repository>
-            <id>s3.release</id>
-            <name>PP S3 Release Repository</name>
-            <url>s3://releases.peoplepattern.com</url>
+            <id>apache-repo</id>
+            <name>Apache Repository</name>
+            <url>https://repository.apache.org/content/repositories/releases</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -53,33 +94,23 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-        <repository>
-            <id>s3.snapshot</id>
-            <name>PP S3 Snapshot Repository</name>
-            <url>s3://snapshots.peoplepattern.com</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
     </repositories>
 
     <distributionManagement>
         <repository>
-            <id>s3.release</id>
-            <name>AWS S3 Release Repository</name>
-            <url>s3://releases.peoplepattern.com</url>
+            <id>streams.releases</id>
+            <name>Streams Releases</name>
+            <url>${release.repository.url}</url>
         </repository>
+        <!-- Snapshots (not-releases) are published to this repository -->
         <snapshotRepository>
-            <id>s3.snapshot</id>
-            <name>AWS S3 Snapshot Repository</name>
-            <url>s3://snapshots.peoplepattern.com</url>
+            <id>streams.snapshots</id>
+            <name>Streams Snapshots</name>
+            <url>${snapshot.repository.url}</url>
         </snapshotRepository>
         <site>
-            <id>s3.site</id>
-            <url>s3://streams.peoplepattern.com/incubator-streams-master/0.3.4-PP-SNAPSHOT</url>
+            <id>site.streams.project</id>
+            <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/streams/content/site/${project.version}/streams-master</url>
         </site>
     </distributionManagement>
 
@@ -90,7 +121,7 @@
         <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <streams.version>0.3.4-PP-SNAPSHOT</streams.version>
+        <streams.version>0.3-incubating-SNAPSHOT</streams.version>
 
         <!-- Release Properties -->
         <snapshot.repository.url>
@@ -101,7 +132,6 @@
         </release.repository.url>
 
         <!-- Plugin and Plugin Dependency Versions -->
-        <apache-rat.plugin.version>0.11</apache-rat.plugin.version>
         <build-helper.plugin.version>1.8</build-helper.plugin.version>
         <compiler.plugin.version>3.0</compiler.plugin.version>
         <clean.plugin.version>2.6</clean.plugin.version>
@@ -164,13 +194,7 @@
     </properties>
 
     <build>
-        <extensions>
-            <extension>
-                <groupId>org.kuali.maven.wagons</groupId>
-                <artifactId>maven-s3-wagon</artifactId>
-                <version>1.2.1</version>
-            </extension>
-        </extensions>
+
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -579,7 +603,6 @@
                     <plugin>
                         <groupId>org.apache.rat</groupId>
                         <artifactId>apache-rat-plugin</artifactId>
-                        <version>${apache-rat.plugin.version}</version>
                         <executions>
                             <execution>
                                 <phase>verify</phase>
@@ -678,11 +701,6 @@
                         <artifactId>depgraph-maven-plugin</artifactId>
                         <version>${depgraph.plugin.version}</version>
                     </plugin>
-                    <plugin>
-                        <groupId>org.apache.rat</groupId>
-                        <artifactId>apache-rat-plugin</artifactId>
-                        <version>${apache-rat.plugin.version}</version>
-                    </plugin>
                 </plugins>
             </reporting>
         </profile>


Mime
View raw message