tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ple...@apache.org
Subject [2/2] incubator-tamaya git commit: TAMAYA-80 Renamed assembly descriptor for the distribution. Decided to have two distributions, a binary and a source one.
Date Tue, 30 Jun 2015 22:19:21 GMT
TAMAYA-80 Renamed assembly descriptor for the distribution. Decided to have two distributions,
a binary and a source one.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/4af719f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/4af719f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/4af719f7

Branch: refs/heads/master
Commit: 4af719f731c05b81e8385f853c6d9a0e16c82617
Parents: 3a42566
Author: Oliver B. Fischer <plexus@apache.org>
Authored: Wed Jul 1 00:13:38 2015 +0200
Committer: Oliver B. Fischer <plexus@apache.org>
Committed: Wed Jul 1 00:19:17 2015 +0200

----------------------------------------------------------------------
 distribution/pom.xml                            |   4 +-
 .../src/main/assembly/distribution-bin.xml      | 131 +++++++++++++++++++
 distribution/src/main/assembly/distribution.xml | 131 -------------------
 3 files changed, 133 insertions(+), 133 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4af719f7/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 579d7ed..4eb4961 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -198,7 +198,7 @@ under the License.
                         </goals>
                         <configuration>
                             <finalName>apache-tamaya-${project.version}</finalName>
-                            <descriptor>src/main/assembly/distribution.xml</descriptor>
+                            <descriptor>src/main/assembly/distribution-bin.xml</descriptor>
                         </configuration>
                     </execution>
                 </executions>
@@ -206,4 +206,4 @@ under the License.
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4af719f7/distribution/src/main/assembly/distribution-bin.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/distribution-bin.xml b/distribution/src/main/assembly/distribution-bin.xml
new file mode 100644
index 0000000..060b01d
--- /dev/null
+++ b/distribution/src/main/assembly/distribution-bin.xml
@@ -0,0 +1,131 @@
+<!--
+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/plugins/maven-assembly-plugin/assembly/1.1.3"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
+                              http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+
+    <id>distribution</id>
+    <formats>
+        <format>dir</format>
+        <format>zip</format>
+        <format>tar.gz</format>
+    </formats>
+
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>java7/lib</outputDirectory>
+            <includes>
+                <include>org.apache.tamaya:tamaya-java7-api</include>
+                <include>org.apache.tamaya:tamaya-java7-core</include>
+            </includes>
+            <excludes>
+                <exclude>*:*:*:sources</exclude>
+                <exclude>*:*:*:javadoc</exclude>
+            </excludes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>java7/sources</outputDirectory>
+            <includes>
+                <include>org.apache.tamaya:tamaya-java7-api:*:sources</include>
+                <include>org.apache.tamaya:tamaya-java7-core:*:sources</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>java7/javadoc</outputDirectory>
+            <includes>
+                <include>org.apache.tamaya:tamaya-java7-api:*:javadoc</include>
+                <include>org.apache.tamaya:tamaya-java7-core:*:javadoc</include>
+            </includes>
+        </dependencySet>
+
+        <dependencySet>
+            <outputDirectory>java8/lib</outputDirectory>
+            <includes>
+                <include>org.apache.tamaya:tamaya-api</include>
+                <include>org.apache.tamaya:tamaya-core</include>
+            </includes>
+            <excludes>
+                <exclude>*:*:sources</exclude>
+                <exclude>*:*:javadoc</exclude>
+            </excludes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>java8/sources</outputDirectory>
+            <includes>
+                <include>org.apache.tamaya:tamaya-api:*:sources</include>
+                <include>org.apache.tamaya:tamaya-core:*:sources</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>java8/javadoc</outputDirectory>
+            <includes>
+                <include>org.apache.tamaya:tamaya-api:*:javadoc</include>
+                <include>org.apache.tamaya:tamaya-core:*:javadoc</include>
+            </includes>
+        </dependencySet>
+
+        <!-- Tamaya modules -->
+
+        <!-->>> Builder module -->
+        <dependencySet>
+            <outputDirectory>modules/builder/lib</outputDirectory>
+            <includes>
+                <include>org.apache.tamaya.ext:tamaya-builder</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>modules/builder/api</outputDirectory>
+            <includes>
+                <include>org.apache.tamaya.ext:tamaya-builder:*:javadoc</include>
+            </includes>
+            <unpack>true</unpack>
+        </dependencySet>
+
+        <!--<<< Builder module -->
+
+        <!-->>> JSON module -->
+        <dependencySet>
+            <outputDirectory>modules/json/lib</outputDirectory>
+            <includes>
+                <include>org.apache.tamaya.ext:tamaya-json</include>
+                <include>com.fasterxml.jackson.core:*</include>
+            </includes>
+        </dependencySet>
+
+        <dependencySet>
+            <outputDirectory>modules/json/api</outputDirectory>
+            <includes>
+                <include>org.apache.tamaya.ext:tamaya-json:*:javadoc</include>
+            </includes>
+            <unpack>true</unpack>
+        </dependencySet>
+        <!--<<< JSON module -->
+
+    </dependencySets>
+
+    <fileSets>
+        <fileSet>
+            <outputDirectory>/</outputDirectory>
+            <directory>${project.build.directory}/generated-documentation/apache-tamaya-docs-${project.version}</directory>
+        </fileSet>
+    </fileSets>
+
+
+</assembly>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4af719f7/distribution/src/main/assembly/distribution.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/distribution.xml b/distribution/src/main/assembly/distribution.xml
deleted file mode 100644
index 060b01d..0000000
--- a/distribution/src/main/assembly/distribution.xml
+++ /dev/null
@@ -1,131 +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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
-                              http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-
-    <id>distribution</id>
-    <formats>
-        <format>dir</format>
-        <format>zip</format>
-        <format>tar.gz</format>
-    </formats>
-
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>java7/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya:tamaya-java7-api</include>
-                <include>org.apache.tamaya:tamaya-java7-core</include>
-            </includes>
-            <excludes>
-                <exclude>*:*:*:sources</exclude>
-                <exclude>*:*:*:javadoc</exclude>
-            </excludes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>java7/sources</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya:tamaya-java7-api:*:sources</include>
-                <include>org.apache.tamaya:tamaya-java7-core:*:sources</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>java7/javadoc</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya:tamaya-java7-api:*:javadoc</include>
-                <include>org.apache.tamaya:tamaya-java7-core:*:javadoc</include>
-            </includes>
-        </dependencySet>
-
-        <dependencySet>
-            <outputDirectory>java8/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya:tamaya-api</include>
-                <include>org.apache.tamaya:tamaya-core</include>
-            </includes>
-            <excludes>
-                <exclude>*:*:sources</exclude>
-                <exclude>*:*:javadoc</exclude>
-            </excludes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>java8/sources</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya:tamaya-api:*:sources</include>
-                <include>org.apache.tamaya:tamaya-core:*:sources</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>java8/javadoc</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya:tamaya-api:*:javadoc</include>
-                <include>org.apache.tamaya:tamaya-core:*:javadoc</include>
-            </includes>
-        </dependencySet>
-
-        <!-- Tamaya modules -->
-
-        <!-->>> Builder module -->
-        <dependencySet>
-            <outputDirectory>modules/builder/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-builder</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/builder/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-builder:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-
-        <!--<<< Builder module -->
-
-        <!-->>> JSON module -->
-        <dependencySet>
-            <outputDirectory>modules/json/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-json</include>
-                <include>com.fasterxml.jackson.core:*</include>
-            </includes>
-        </dependencySet>
-
-        <dependencySet>
-            <outputDirectory>modules/json/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-json:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!--<<< JSON module -->
-
-    </dependencySets>
-
-    <fileSets>
-        <fileSet>
-            <outputDirectory>/</outputDirectory>
-            <directory>${project.build.directory}/generated-documentation/apache-tamaya-docs-${project.version}</directory>
-        </fileSet>
-    </fileSets>
-
-
-</assembly>
\ No newline at end of file


Mime
View raw message