streams-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sblack...@apache.org
Subject [2/3] incubator-streams git commit: fix release:prepare failure on test-jar artifacts
Date Sat, 04 Apr 2015 22:51:40 GMT
fix release:prepare failure on test-jar artifacts


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

Branch: refs/heads/0.2-incubating-rc1
Commit: 0685cc5e6727ba01013a0b551077dc2e3894156a
Parents: 867f15f
Author: Steve Blackmon <sblackmon@apache.org>
Authored: Fri Apr 3 21:02:48 2015 -0500
Committer: Steve Blackmon <sblackmon@apache.org>
Committed: Sat Apr 4 17:42:33 2015 -0500

----------------------------------------------------------------------
 pom.xml                                         | 124 +++++++++++--------
 .../streams-persist-elasticsearch/pom.xml       |   1 +
 streams-contrib/streams-persist-hdfs/pom.xml    |   1 +
 streams-contrib/streams-persist-mongo/pom.xml   |   1 +
 4 files changed, 77 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0685cc5e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 60ce3df..84f3bc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
         <artifactId>apache</artifactId>
         <version>16</version>
     </parent>
-    
+
     <groupId>org.apache.streams</groupId>
     <artifactId>streams-project</artifactId>
     <version>0.2-incubating-SNAPSHOT</version>
@@ -49,8 +49,7 @@
         <connection>scm:git:git@github.com:apache/incubator-streams.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-streams.git</developerConnection>
         <url>scm:git:git@github.com:apache/incubator-streams.git</url>
-      <tag>HEAD</tag>
-  </scm>
+    </scm>
 
     <developers>
         <developer>
@@ -177,6 +176,7 @@
         <compiler.plugin.version>3.0</compiler.plugin.version>
         <failsafe.plugin.version>2.17</failsafe.plugin.version>
         <surefire.plugin.version>2.17</surefire.plugin.version>
+        <jar.plugin.version>2.6</jar.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>
@@ -293,21 +293,21 @@
                 <artifactId>maven-remote-resources-plugin</artifactId>
                 <version>1.4</version>
                 <executions>
-                  <execution>
-                    <goals>
-                      <goal>process</goal>
-                    </goals>
-                    <configuration>
-                      <resourceBundles>
-                        <!-- Will generate META-INF/DEPENDENCIES META-INF/LICENSE META-INF/NOTICE
-->
-                        <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
-                        <!-- Will generate META-INF/DISCLAIMER  -->
-                        <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
-                      </resourceBundles>
-                    </configuration>
-                  </execution>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <!-- Will generate META-INF/DEPENDENCIES META-INF/LICENSE
META-INF/NOTICE -->
+                                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+                                <!-- Will generate META-INF/DISCLAIMER  -->
+                                <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
                 </executions>
-              </plugin>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -328,6 +328,11 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>${jar.plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
                     <version>${war.plugin.version}</version>
                 </plugin>
@@ -586,10 +591,10 @@
                 <scope>provided</scope>
             </dependency>
             <!--<dependency>-->
-                <!--<groupId>storm</groupId>-->
-                <!--<artifactId>storm-netty</artifactId>-->
-                <!--<version>${storm.version}</version>-->
-                <!--<scope>provided</scope>-->
+            <!--<groupId>storm</groupId>-->
+            <!--<artifactId>storm-netty</artifactId>-->
+            <!--<version>${storm.version}</version>-->
+            <!--<scope>provided</scope>-->
             <!--</dependency>-->
             <!-- JsonPath -->
             <dependency>
@@ -619,6 +624,10 @@
     <profiles>
         <profile>
             <id>apache-release</id>
+            <properties>
+                <skipTests>false</skipTests>
+                <maven.test.skip>false</maven.test.skip>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -656,7 +665,7 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-jar-plugin</artifactId>
                         <configuration>
-                            <skip>true</skip>
+                            <skip>false</skip>
                         </configuration>
                         <executions>
                             <execution>
@@ -668,32 +677,39 @@
                         </executions>
                     </plugin>
                     <plugin>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <dependencies>
-                      <dependency>
-                        <groupId>org.apache.apache.resources</groupId>
-                        <artifactId>apache-source-release-assembly-descriptor</artifactId>
-                        <version>1.0.5-SNAPSHOT</version>
-                      </dependency>
-                    </dependencies>
-                    <executions>
-                      <execution>
-                        <id>source-release-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                          <goal>single</goal>
-                        </goals>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.apache.resources</groupId>
+                                <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                                <version>1.0.5</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <id>source-release-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                                    <descriptorRefs>
+                                        <descriptorRef>source-release</descriptorRef>
+                                    </descriptorRefs>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-release-plugin</artifactId>
                         <configuration>
-                          <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                          <descriptorRefs>
-                            <descriptorRef>source-release</descriptorRef>
-                          </descriptorRefs>
-                          <tarLongFileMode>gnu</tarLongFileMode>
+                            <releaseProfiles>apache-release</releaseProfiles>
+                            <preparationGoals>clean install</preparationGoals>
                         </configuration>
-                      </execution>
-                    </executions>
-                  </plugin>
-                  <plugin>
+                    </plugin>
+                    <plugin>
                         <groupId>org.apache.rat</groupId>
                         <artifactId>apache-rat-plugin</artifactId>
                         <executions>
@@ -716,7 +732,7 @@
                                 <exclude>**/NOTICE</exclude>
                                 <exclude>**/README.*</exclude>
                                 <exclude>**/target/**</exclude>
-				<exclude>**/overlays/**</exclude>
+                                <exclude>**/overlays/**</exclude>
                                 <exclude>**/src/main/resources/**</exclude>
                                 <exclude>**/src/test/resources/**</exclude>
                                 <exclude>**/.gitignore</exclude>
@@ -728,8 +744,16 @@
                                 <exclude>rat.txt</exclude>
                             </excludes>
                         </configuration>
-                    </plugin>                
-			<plugin>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skipTests>false</skipTests>
+                            <skipExec>true</skipExec>
+                        </configuration>
+                    </plugin>
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
                         <executions>
@@ -742,7 +766,7 @@
                             </execution>
                         </executions>
                     </plugin>
-		</plugins>
+                </plugins>
             </build>
             <reporting>
                 <plugins>

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0685cc5e/streams-contrib/streams-persist-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/pom.xml b/streams-contrib/streams-persist-elasticsearch/pom.xml
index 595a119..4e80a59 100644
--- a/streams-contrib/streams-persist-elasticsearch/pom.xml
+++ b/streams-contrib/streams-persist-elasticsearch/pom.xml
@@ -53,6 +53,7 @@
             <artifactId>elasticsearch</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0685cc5e/streams-contrib/streams-persist-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-hdfs/pom.xml b/streams-contrib/streams-persist-hdfs/pom.xml
index 7597b36..ae32a6e 100644
--- a/streams-contrib/streams-persist-hdfs/pom.xml
+++ b/streams-contrib/streams-persist-hdfs/pom.xml
@@ -60,6 +60,7 @@
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0685cc5e/streams-contrib/streams-persist-mongo/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-mongo/pom.xml b/streams-contrib/streams-persist-mongo/pom.xml
index eadf53e..2019eb8 100644
--- a/streams-contrib/streams-persist-mongo/pom.xml
+++ b/streams-contrib/streams-persist-mongo/pom.xml
@@ -71,6 +71,7 @@
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>com.github.fakemongo</groupId>


Mime
View raw message