avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r1097929 - in /avro/branches/branch-1.5: ./ CHANGES.txt lang/java/pom.xml lang/java/tools/pom.xml
Date Fri, 29 Apr 2011 19:37:04 GMT
Author: cutting
Date: Fri Apr 29 19:37:04 2011
New Revision: 1097929

URL: http://svn.apache.org/viewvc?rev=1097929&view=rev
Log:
Merge -c 1097927 from trunk to 1.5 branch.  Fixes: AVRO-791.

Modified:
    avro/branches/branch-1.5/   (props changed)
    avro/branches/branch-1.5/CHANGES.txt
    avro/branches/branch-1.5/lang/java/pom.xml
    avro/branches/branch-1.5/lang/java/tools/pom.xml

Propchange: avro/branches/branch-1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 29 19:37:04 2011
@@ -1 +1 @@
-/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792,1089128,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096798,1097916
+/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792,1089128,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096798,1097916,1097927

Modified: avro/branches/branch-1.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/CHANGES.txt?rev=1097929&r1=1097928&r2=1097929&view=diff
==============================================================================
--- avro/branches/branch-1.5/CHANGES.txt (original)
+++ avro/branches/branch-1.5/CHANGES.txt Fri Apr 29 19:37:04 2011
@@ -52,6 +52,9 @@ Avro 1.5.1 (unreleased)
     extensible and changing ISpecificRecord to an interface.
     (Dona Alvarez via cutting)
 
+    AVRO-791. Java: Add avro-tools-nodeps jar.  Also change 'mvn
+    install' to not GPG sign things by default.  (scottcarey via cutting)
+
   BUG FIXES
 
     AVRO-786. Java: Fix equals() to work on objects containing maps. (cutting)

Modified: avro/branches/branch-1.5/lang/java/pom.xml
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/pom.xml?rev=1097929&r1=1097928&r2=1097929&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/pom.xml (original)
+++ avro/branches/branch-1.5/lang/java/pom.xml Fri Apr 29 19:37:04 2011
@@ -187,19 +187,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-gpg-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>sign-artifacts</id>
-            <phase>verify</phase>
-            <goals>
-	      <goal>sign</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
@@ -290,6 +277,26 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>sign</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+	          <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
   
   <!-- dependencyManagement can be used to define dependency versions, scopes, and 

Modified: avro/branches/branch-1.5/lang/java/tools/pom.xml
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/tools/pom.xml?rev=1097929&r1=1097928&r2=1097929&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/tools/pom.xml (original)
+++ avro/branches/branch-1.5/lang/java/tools/pom.xml Fri Apr 29 19:37:04 2011
@@ -50,6 +50,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
         <version>1.4</version>
+        <!-- primary artifact is shaded -->
         <executions>
           <execution>
             <goals>
@@ -66,6 +67,22 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <!-- 'nodeps' artifact is standalone -->
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <classifier>nodeps</classifier>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 



Mime
View raw message