You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commonsrdf.apache.org by wi...@apache.org on 2015/05/06 12:23:41 UTC
[3/3] incubator-commonsrdf git commit: more work around the assembly
dependant on commons-parent
more work around the assembly dependant on commons-parent
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/6e1cadc5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/6e1cadc5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/6e1cadc5
Branch: refs/heads/master
Commit: 6e1cadc5af1b9ebbee3fa00f4eca374099985039
Parents: 83f0b6a
Author: Sergio Fernández <wi...@apache.org>
Authored: Wed May 6 12:10:34 2015 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Wed May 6 12:10:34 2015 +0200
----------------------------------------------------------------------
assembly.xml | 39 ---------------------------------------
pom.xml | 31 ++-----------------------------
src/main/assembly/src.xml | 39 +++++++++++++++++++++++++++++++++++++++
3 files changed, 41 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/6e1cadc5/assembly.xml
----------------------------------------------------------------------
diff --git a/assembly.xml b/assembly.xml
deleted file mode 100644
index c04a35d..0000000
--- a/assembly.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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.
--->
-<assembly>
- <id>src</id>
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}</directory>
- <outputDirectory></outputDirectory>
- <excludes>
- <exclude>examples/**</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/.*/**</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.ipr</exclude>
- <exclude>**/*.iws</exclude>
- <exclude>atlassian-ide-plugin.xml</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/6e1cadc5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 64ecdc9..b919fca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -263,15 +263,9 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
<configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- <finalName>commons-rdf-${project.version}</finalName>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ <finalName>apache-commons-rdf-${pom.version}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
@@ -303,26 +297,6 @@
</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>
- <configuration>
- <excludes>
- <exclude>**/*.asc</exclude>
- <exclude>**/*.md5</exclude>
- <exclude>**/*.sha1</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.4</version>
<configuration>
@@ -331,7 +305,6 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
<localCheckout>true</localCheckout>
<tagNameFormat>@{version}</tagNameFormat>
- <arguments>-Papache-release,sign ${arguments}</arguments>
<preparationGoals>clean install</preparationGoals>
<pushChanges>false</pushChanges>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/6e1cadc5/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
new file mode 100644
index 0000000..c04a35d
--- /dev/null
+++ b/src/main/assembly/src.xml
@@ -0,0 +1,39 @@
+<?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.
+-->
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <outputDirectory></outputDirectory>
+ <excludes>
+ <exclude>examples/**</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/.*/**</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>atlassian-ide-plugin.xml</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>