commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chtom...@apache.org
Subject [3/4] commons-rng git commit: Update archives creation
Date Mon, 16 Jul 2018 12:18:53 GMT
Update archives creation


Project: http://git-wip-us.apache.org/repos/asf/commons-rng/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-rng/commit/ffe585f5
Tree: http://git-wip-us.apache.org/repos/asf/commons-rng/tree/ffe585f5
Diff: http://git-wip-us.apache.org/repos/asf/commons-rng/diff/ffe585f5

Branch: refs/heads/1.1
Commit: ffe585f5b6d461bf4f4cc4a59b8b9344e7a5bd7e
Parents: aa8f196
Author: Rob Tompkins <chtompki@gmail.com>
Authored: Fri Jul 13 15:29:22 2018 -0400
Committer: Rob Tompkins <chtompki@gmail.com>
Committed: Fri Jul 13 15:29:22 2018 -0400

----------------------------------------------------------------------
 commons-rng-client-api/pom.xml    |   1 +
 dist-archive/pom.xml              | 161 +++++++++++++++++++++++++++------
 dist-archive/src/assembly/bin.xml |  13 +++
 pom.xml                           |  22 ++---
 src/assembly/bin.xml              |  45 +++++----
 src/assembly/src.xml              |  42 ++++-----
 6 files changed, 200 insertions(+), 84 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-rng/blob/ffe585f5/commons-rng-client-api/pom.xml
----------------------------------------------------------------------
diff --git a/commons-rng-client-api/pom.xml b/commons-rng-client-api/pom.xml
index a323bf3..d6c4d4d 100644
--- a/commons-rng-client-api/pom.xml
+++ b/commons-rng-client-api/pom.xml
@@ -41,6 +41,7 @@
     <commons.automatic.module.name>org.apache.commons.rng.api</commons.automatic.module.name>
     <!-- Workaround to avoid duplicating config files. -->
     <rng.parent.dir>${basedir}/..</rng.parent.dir>
+    <commons.release.isDistModule>false</commons.release.isDistModule>
   </properties>
 
 </project>

http://git-wip-us.apache.org/repos/asf/commons-rng/blob/ffe585f5/dist-archive/pom.xml
----------------------------------------------------------------------
diff --git a/dist-archive/pom.xml b/dist-archive/pom.xml
index f559524..f1c6cfd 100644
--- a/dist-archive/pom.xml
+++ b/dist-archive/pom.xml
@@ -25,34 +25,47 @@ under the License.
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-rng-parent</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.1</version>
   </parent>
 
   <groupId>org.apache.commons</groupId>
   <artifactId>commons-rng</artifactId>
-  <version>1.1-SNAPSHOT</version>
+  <version>1.1</version>
   <packaging>pom</packaging>
   <name>Apache Commons RNG (full distribution)</name>
   <description>This module creates the Apache Commons RNG distribution.</description>
 
+  <properties>
+    <checkstyle.skip>true</checkstyle.skip>
+    <animal.sniffer.skip>true</animal.sniffer.skip>
+    <!-- Commons Release Plugin -->
+    <commons.bc.version>1.0</commons.bc.version>
+    <commons.release.isDistModule>true</commons.release.isDistModule>
+    <commons.siteOutputDirectory>${basedir}/../target/site</commons.siteOutputDirectory>
+    <commons.releaseNotesLocation>${basedir}/../RELEASE-NOTES.txt</commons.releaseNotesLocation>
+    <commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl>
+    <commons.releaseManagerName>Rob Tompkins</commons.releaseManagerName>
+    <commons.releaseManagerKey>B6E73D84EA4FCC47166087253FAAD2CD5ECBB314</commons.releaseManagerKey>
+  </properties>
+
   <dependencies>
 
     <!-- Module: Client API -->
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-rng-client-api</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-rng-client-api</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.1</version>
       <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-rng-client-api</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.1</version>
       <classifier>javadoc</classifier>
     </dependency>
 
@@ -60,18 +73,18 @@ under the License.
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-rng-core</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-rng-core</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.1</version>
       <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-rng-core</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.1</version>
       <classifier>javadoc</classifier>
     </dependency>
 
@@ -79,18 +92,18 @@ under the License.
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-rng-simple</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-rng-simple</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.1</version>
       <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-rng-simple</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.1</version>
       <classifier>javadoc</classifier>
     </dependency>
 
@@ -98,56 +111,130 @@ under the License.
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-rng-sampling</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-rng-sampling</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.1</version>
       <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-rng-sampling</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <version>1.1</version>
+      <classifier>javadoc</classifier>
+    </dependency>
+
+    <!-- Module: Examples - JMH -->
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-rng-examples-jmh</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-rng-examples-jmh</artifactId>
+      <version>1.1</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-rng-examples-jmh</artifactId>
+      <version>1.1</version>
+      <classifier>javadoc</classifier>
+    </dependency>
+
+    <!-- Module: Examples - JPMS -->
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-rng-examples-jpms-app</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-rng-examples-jpms-app</artifactId>
+      <version>1.1</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-rng-examples-jpms-app</artifactId>
+      <version>1.1</version>
+      <classifier>javadoc</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-rng-examples-jpms-lib</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-rng-examples-jpms-lib</artifactId>
+      <version>1.1</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-rng-examples-jpms-lib</artifactId>
+      <version>1.1</version>
       <classifier>javadoc</classifier>
     </dependency>
 
-    <!-- Module: JMH -->
+    <!-- Module: Examples - Quadrature -->
     <dependency>
       <groupId>org.apache.commons</groupId>
-      <artifactId>commons-rng-jmh</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <artifactId>commons-rng-examples-quadrature</artifactId>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
-      <artifactId>commons-rng-jmh</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <artifactId>commons-rng-examples-quadrature</artifactId>
+      <version>1.1</version>
       <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
-      <artifactId>commons-rng-jmh</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <artifactId>commons-rng-examples-quadrature</artifactId>
+      <version>1.1</version>
       <classifier>javadoc</classifier>
     </dependency>
 
-    <!-- Module: Examples -->
+    <!-- Module: Examples - Sampling -->
     <dependency>
       <groupId>org.apache.commons</groupId>
-      <artifactId>commons-rng-examples</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <artifactId>commons-rng-examples-sampling</artifactId>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
-      <artifactId>commons-rng-examples</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <artifactId>commons-rng-examples-sampling</artifactId>
+      <version>1.1</version>
       <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
-      <artifactId>commons-rng-examples</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <artifactId>commons-rng-examples-sampling</artifactId>
+      <version>1.1</version>
+      <classifier>javadoc</classifier>
+    </dependency>
+
+    <!-- Module: Examples - Stress -->
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-rng-examples-stress</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-rng-examples-stress</artifactId>
+      <version>1.1</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-rng-examples-stress</artifactId>
+      <version>1.1</version>
       <classifier>javadoc</classifier>
     </dependency>
 
@@ -171,16 +258,32 @@ under the License.
       <build>
         <plugins>
           <plugin>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>get-dependencies</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>copy-dependencies</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
             <version>2.4</version>
+            <configuration>
+              <skipAssembly>false</skipAssembly>
+            </configuration>
             <executions>
               <execution>
                 <id>create-distribution</id>
-                <phase>package</phase>
+                <phase>install</phase>
                 <goals>
                   <goal>single</goal>
                 </goals>
                 <configuration>
+                  <skipAssembly>false</skipAssembly>
                   <descriptors>
                     <descriptor>src/assembly/bin.xml</descriptor>
                     <descriptor>src/assembly/src.xml</descriptor>

http://git-wip-us.apache.org/repos/asf/commons-rng/blob/ffe585f5/dist-archive/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/dist-archive/src/assembly/bin.xml b/dist-archive/src/assembly/bin.xml
index 7927455..f4a9e7d 100644
--- a/dist-archive/src/assembly/bin.xml
+++ b/dist-archive/src/assembly/bin.xml
@@ -38,5 +38,18 @@ limitations under the License.
         <include>RELEASE-NOTES.txt</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../target/site</directory>
+      <outputDirectory>docs</outputDirectory>
+      <excludes>
+      </excludes>
+    </fileSet>
   </fileSets>
 </assembly>

http://git-wip-us.apache.org/repos/asf/commons-rng/blob/ffe585f5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 53ce20c..19b3c4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,8 @@
     <!-- Java 9+ -->
     <commons.automatic.module.name>org.apache.commons.rng.parent</commons.automatic.module.name>
     <!-- do not use snapshot suffix here -->
-    <commons.release.version>1.0</commons.release.version>
+    <commons.release.version>1.1</commons.release.version>
+    <commons.rc.version>RC1</commons.rc.version>
     <commons.release.desc>(requires Java 6+)</commons.release.desc>
     <!-- <commons.rc.version>RC1</commons.rc.version> -->
     <commons.binary.suffix>-bin</commons.binary.suffix>
@@ -180,17 +181,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>
@@ -249,6 +239,13 @@
           <!-- <aggregate>true</aggregate> -->
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
     </plugins>
 
     <pluginManagement>
@@ -587,6 +584,7 @@
     <module>commons-rng-core</module>
     <module>commons-rng-simple</module>
     <module>commons-rng-sampling</module>
+    <module>dist-archive</module>
     <!--
         Built only upon explicit request (requires Java 1.7+).
         See profile "commons-rng-examples".

http://git-wip-us.apache.org/repos/asf/commons-rng/blob/ffe585f5/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index a5ff153..2152395 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -1,45 +1,52 @@
-<?xml version="1.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
+    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
+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.
+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*</include>
-        <include>NOTICE*</include>
+        <include>LICENSE.txt</include>
+        <include>NOTICE.txt</include>
         <include>RELEASE-NOTES.txt</include>
       </includes>
     </fileSet>
     <fileSet>
-      <directory>target</directory>
+      <directory>${project.basedir}/target/dependency</directory>
       <outputDirectory></outputDirectory>
       <includes>
-        <include>*.jar</include>
+        <include>commons-rng*.jar</include>
       </includes>
     </fileSet>
     <fileSet>
-      <directory>target/site</directory>
+      <directory>${project.basedir}../target/site</directory>
       <outputDirectory>docs</outputDirectory>
       <excludes>
       </excludes>

http://git-wip-us.apache.org/repos/asf/commons-rng/blob/ffe585f5/src/assembly/src.xml
----------------------------------------------------------------------
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
index a78f24f..cf75fed 100644
--- a/src/assembly/src.xml
+++ b/src/assembly/src.xml
@@ -1,19 +1,18 @@
-<?xml version="1.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
+    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
+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.
+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>
@@ -21,21 +20,16 @@
     <format>tar.gz</format>
     <format>zip</format>
   </formats>
-  <baseDirectory>
-     ${project.artifactId}-${commons.release.version}-src
-  </baseDirectory>
+  <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
   <fileSets>
     <fileSet>
-      <includes>
-        <include>*.txt</include>
-        <include>*.xml</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src</directory>
+      <directory>${project.basedir}/..</directory>
       <excludes>
+        <exclude>${project.build.directory}/**</exclude>
+        <exclude>.*/**</exclude>
+        <exclude>**/${project.build.directory}/**</exclude>
+        <exclude>**/.*/**</exclude>
       </excludes>
     </fileSet>
   </fileSets>
 </assembly>
-


Mime
View raw message