You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by vi...@apache.org on 2014/04/01 22:00:22 UTC
[1/2] git commit: Added KEY for vinayakb@apache.org. Got the assembly
plugin to exclude KEYS from the source release zip
Repository: incubator-vxquery
Updated Branches:
refs/heads/vxquery_0_3_staging 601520720 -> ad002b58d
Added KEY for vinayakb@apache.org. Got the assembly plugin to exclude KEYS from the source release zip
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/c1871e5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/c1871e5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/c1871e5e
Branch: refs/heads/vxquery_0_3_staging
Commit: c1871e5e47195816c3623e7ddd335754367ae693
Parents: 6015207
Author: Vinayak Borkar <vi...@gmail.com>
Authored: Tue Apr 1 12:44:04 2014 -0700
Committer: Vinayak Borkar <vi...@gmail.com>
Committed: Tue Apr 1 12:44:04 2014 -0700
----------------------------------------------------------------------
KEYS | 70 +++++++++++++++++++++++++++++++++++
build/build-release-artifacts.sh | 25 -------------
pom.xml | 20 +++++++---
src/main/assembly/source.xml | 3 +-
4 files changed, 86 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/c1871e5e/KEYS
----------------------------------------------------------------------
diff --git a/KEYS b/KEYS
index cc19962..3286a2e 100644
--- a/KEYS
+++ b/KEYS
@@ -70,3 +70,73 @@ cLb4T3tbAXY+fQK5mYUVL8XLBIfEU1nQl8AkJv07WNtbdf2qhe2OOKgDDP4XsAjk
Tyw9s2ujCh0N7I2qX+MOAjgNpkGkgVhXCxiH3Q0RQCqGxYM=
=vxKu
-----END PGP PUBLIC KEY BLOCK-----
+pub 4096R/869307E0 2013-11-27
+uid Vinayak Borkar (ASF CODE SIGNING KEY) <vi...@apache.org>
+sig 3 869307E0 2013-11-27 Vinayak Borkar (ASF CODE SIGNING KEY) <vi...@apache.org>
+sig BAED10BC 2013-12-03 Till Westmann (CODE SIGNING KEY) <ti...@apache.org>
+sub 4096R/1C307CBF 2013-11-27
+sig 869307E0 2013-11-27 Vinayak Borkar (ASF CODE SIGNING KEY) <vi...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.22 (Darwin)
+
+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
+=tb2w
+-----END PGP PUBLIC KEY BLOCK-----
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/c1871e5e/build/build-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/build/build-release-artifacts.sh b/build/build-release-artifacts.sh
deleted file mode 100755
index 8c0bb83..0000000
--- a/build/build-release-artifacts.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# 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.
-
-mvn assembly:assembly
-
-export ARCHIVE=apache-vxquery-0.2-incubating-src.zip
-gpg2 --armor --output ${ARCHIVE}.asc --detach-sig target/${ARCHIVE}
-cat target/${ARCHIVE} | openssl dgst -sha1 | sed -e's/(stdin)= //' > ${ARCHIVE}.sha1
-cat target/${ARCHIVE} | openssl dgst -md5 | sed -e's/(stdin)= //' > ${ARCHIVE}.md5
-
-#mvn site site:deploy
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/c1871e5e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 00e815e..35109e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -475,11 +475,21 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/source.xml</descriptor>
- </descriptors>
- </configuration>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration combine.self="override">
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptors>
+ <descriptor>src/main/assembly/source.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<!--
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/c1871e5e/src/main/assembly/source.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/source.xml b/src/main/assembly/source.xml
index 8af5332..350d064 100644
--- a/src/main/assembly/source.xml
+++ b/src/main/assembly/source.xml
@@ -17,7 +17,7 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>src</id>
+ <id>source-release</id>
<formats>
<format>zip</format>
</formats>
@@ -28,7 +28,6 @@
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>**/DISCLAIMER</include>
- <include>**/KEYS</include>
<include>**/LICENSE</include>
<include>**/NOTICE</include>
<include>**/README</include>
[2/2] git commit: Added comments to the POM
Posted by vi...@apache.org.
Added comments to the POM
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/ad002b58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/ad002b58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/ad002b58
Branch: refs/heads/vxquery_0_3_staging
Commit: ad002b58d293e2dfb7712b9f26d22e3794d56946
Parents: c1871e5
Author: Vinayak Borkar <vi...@gmail.com>
Authored: Tue Apr 1 12:48:39 2014 -0700
Committer: Vinayak Borkar <vi...@gmail.com>
Committed: Tue Apr 1 12:48:39 2014 -0700
----------------------------------------------------------------------
pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/ad002b58/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 35109e0..0597245 100644
--- a/pom.xml
+++ b/pom.xml
@@ -475,13 +475,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <!-- We override the configuration plugin to override the descriptor to use for building
+ the source release zip. Specifically, we would like to control the inclusions/exclusions.
+ For example, we exclude the KEYS file from the zip -->
<executions>
<execution>
+ <!-- Use this id to match the id mentioned in the assembly plugin configuration in
+ the apache parent POM under the apache-release profile -->
<id>source-release-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <!-- combine.self should be override to replace the configuration in the parent POM -->
<configuration combine.self="override">
<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
<descriptors>