You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by kh...@apache.org on 2019/06/10 13:40:33 UTC
[commons-geometry] branch GEOMETRY-56 updated (31c7de1 -> 585a75e)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch GEOMETRY-56
in repository https://gitbox.apache.org/repos/asf/commons-geometry.git.
discard 31c7de1 [GEOMETRY-56] - Create distribution archive
new 585a75e [GEOMETRY-56] - Create distribution archive
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (31c7de1)
\
N -- N -- N refs/heads/GEOMETRY-56 (585a75e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
{commons-geometry-dist => dist-archive}/pom.xml | 0
{commons-geometry-dist => dist-archive}/src/assembly/bin.xml | 0
{commons-geometry-dist => dist-archive}/src/assembly/src.xml | 0
pom.xml | 2 +-
4 files changed, 1 insertion(+), 1 deletion(-)
rename {commons-geometry-dist => dist-archive}/pom.xml (100%)
rename {commons-geometry-dist => dist-archive}/src/assembly/bin.xml (100%)
rename {commons-geometry-dist => dist-archive}/src/assembly/src.xml (100%)
[commons-geometry] 01/01: [GEOMETRY-56] - Create distribution
archive
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch GEOMETRY-56
in repository https://gitbox.apache.org/repos/asf/commons-geometry.git
commit 585a75e666cf63af1b077cd3a80719977e159eea
Author: Karl Heinz Marbaise <ka...@soebes.de>
AuthorDate: Mon Jun 10 13:52:11 2019 +0200
[GEOMETRY-56] - Create distribution archive
---
dist-archive/pom.xml | 127 +++++++++++++++++++++++++++++
dist-archive/src/assembly/bin.xml | 77 +++++++++++++++++
{src => dist-archive/src}/assembly/src.xml | 0
pom.xml | 30 ++++---
src/assembly/bin.xml | 55 -------------
5 files changed, 223 insertions(+), 66 deletions(-)
diff --git a/dist-archive/pom.xml b/dist-archive/pom.xml
new file mode 100644
index 0000000..c7b0dcd
--- /dev/null
+++ b/dist-archive/pom.xml
@@ -0,0 +1,127 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-geometry-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-geometry-dist</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Commons Geometry (full distribution)</name>
+ <description>This module creates the Apache Commons Geometry distribution.</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-geometry-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-geometry-enclosing</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-geometry-euclidean</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-geometry-hull</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-geometry-spherical</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-distribution</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>source-release-checksum</id>
+ <phase>package</phase>
+ <goals>
+ <goal>files</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <algorithms>
+ <algorithm>SHA-512</algorithm>
+ </algorithms>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${project.artifactId}-${project.version}-src.zip</include>
+ <include>${project.artifactId}-${project.version}-src.tar.gz</include>
+ <include>${project.artifactId}-${project.version}-bin.zip</include>
+ <include>${project.artifactId}-${project.version}-bin.tar.gz</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <failIfNoFiles>true</failIfNoFiles>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+</project>
diff --git a/dist-archive/src/assembly/bin.xml b/dist-archive/src/assembly/bin.xml
new file mode 100644
index 0000000..0ab49ea
--- /dev/null
+++ b/dist-archive/src/assembly/bin.xml
@@ -0,0 +1,77 @@
+<!--
+ 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
+ xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>${project.artifactId}-${project.version}</baseDirectory>
+ <includeSiteDirectory>false</includeSiteDirectory>
+
+ <moduleSets>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>jars</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>javadocs</outputDirectory>
+ <unpack>false</unpack>
+ <attachmentClassifier>javadoc</attachmentClassifier>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>sources</outputDirectory>
+ <unpack>false</unpack>
+ <attachmentClassifier>sources</attachmentClassifier>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>sources</outputDirectory>
+ <unpack>false</unpack>
+ <attachmentClassifier>test-sources</attachmentClassifier>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/..</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>RELEASE-NOTES.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
diff --git a/src/assembly/src.xml b/dist-archive/src/assembly/src.xml
similarity index 100%
rename from src/assembly/src.xml
rename to dist-archive/src/assembly/src.xml
diff --git a/pom.xml b/pom.xml
index 958c88b..e058db2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,6 +193,19 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${commons.assembly-plugin.version}</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <phase>REMOVE_FROM_LIFECYCLE_INHERITED_VIA_PARENT</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
@@ -232,17 +245,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/src.xml</descriptor>
- <descriptor>src/assembly/bin.xml</descriptor>
- </descriptors>
- <!-- There are a lot of long file names. Suppress the warnings. -->
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
@@ -303,6 +305,11 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ <version>1.8</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${geometry.checkstyle.version}</version>
@@ -611,6 +618,7 @@
</profiles>
<modules>
+ <module>dist-archive</module>
<module>commons-geometry-core</module>
<module>commons-geometry-euclidean</module>
<module>commons-geometry-spherical</module>
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
deleted file mode 100644
index 87531bf..0000000
--- a/src/assembly/bin.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
- 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>bin</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <baseDirectory>${project.artifactId}-${project.version}</baseDirectory>
- <includeSiteDirectory>false</includeSiteDirectory>
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-
- <fileSets>
- <fileSet>
- <directory>${project.basedir}/..</directory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>RELEASE-NOTES.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/target/dependency</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>commons-geometry*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}../target/site</directory>
- <outputDirectory>docs</outputDirectory>
- <excludes>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>