brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [4/7] brooklyn-client git commit: move license and assembly files to "release" folder, removing src/
Date Thu, 10 Mar 2016 12:53:12 GMT
move license and assembly files to "release" folder, removing src/

having a dir called `src` when the source code mostly lives in a different dir felt wrong


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/284627ae
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/284627ae
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/284627ae

Branch: refs/heads/master
Commit: 284627aee5ef55a9ebcb0dd0f31b26081330f6d3
Parents: e9259bf
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Thu Mar 10 10:45:35 2016 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Thu Mar 10 10:46:44 2016 +0000

----------------------------------------------------------------------
 pom.xml                                    |  2 +-
 release/assembly.xml                       | 47 +++++++++++++++++++++++++
 release/license/files/NOTICE-codegangsta   |  5 +++
 release/license/files/NOTICE-x-crypto-ssh  |  5 +++
 release/license/source-inclusions.yaml     | 24 +++++++++++++
 src/main/assembly/bin.xml                  | 47 -------------------------
 src/main/license/files/NOTICE-codegangsta  |  5 ---
 src/main/license/files/NOTICE-x-crypto-ssh |  5 ---
 src/main/license/source-inclusions.yaml    | 24 -------------
 9 files changed, 82 insertions(+), 82 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/284627ae/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8bcb9c2..f7391c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
                 <version>${maven.assembly.plugin.version}</version>
                 <configuration>
                     <descriptors>
-                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                        <descriptor>release/assembly.xml</descriptor>
                     </descriptors>
                 </configuration>
                 <executions>

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/284627ae/release/assembly.xml
----------------------------------------------------------------------
diff --git a/release/assembly.xml b/release/assembly.xml
new file mode 100644
index 0000000..84cc771
--- /dev/null
+++ b/release/assembly.xml
@@ -0,0 +1,47 @@
+<!--
+    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>bin</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <directory>release/license/files</directory>
+            <outputDirectory><!-- leave blank, meaning 'root of archive' --></outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}</directory>
+            <includes>
+                <include>README</include>
+                <include>LICENSE*</include>
+                <include>NOTICE*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/bin</directory>
+            <outputDirectory><!-- leave blank, meaning 'root of archive' --></outputDirectory>
+            <includes>
+                <include>**/br</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/284627ae/release/license/files/NOTICE-codegangsta
----------------------------------------------------------------------
diff --git a/release/license/files/NOTICE-codegangsta b/release/license/files/NOTICE-codegangsta
new file mode 100644
index 0000000..4a54456
--- /dev/null
+++ b/release/license/files/NOTICE-codegangsta
@@ -0,0 +1,5 @@
+
+This project includes the software: github.com/codegangsta/cli
+  Available at: https://github.com/codegangsta/cli
+  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+  Copyright (C) 2013 Jeremy Saenz
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/284627ae/release/license/files/NOTICE-x-crypto-ssh
----------------------------------------------------------------------
diff --git a/release/license/files/NOTICE-x-crypto-ssh b/release/license/files/NOTICE-x-crypto-ssh
new file mode 100644
index 0000000..447198b
--- /dev/null
+++ b/release/license/files/NOTICE-x-crypto-ssh
@@ -0,0 +1,5 @@
+
+This project includes the software: golang.org/x/crypto/ssh
+  Available at: https://godoc.org/golang.org/x/crypto/ssh
+  Used under the following license: The BSD 3-Clause (New BSD) License (http://opensource.org/licenses/BSD-3-Clause)
+  Copyright (c) 2009 The Go Authors. All rights reserved.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/284627ae/release/license/source-inclusions.yaml
----------------------------------------------------------------------
diff --git a/release/license/source-inclusions.yaml b/release/license/source-inclusions.yaml
new file mode 100644
index 0000000..c985c5b
--- /dev/null
+++ b/release/license/source-inclusions.yaml
@@ -0,0 +1,24 @@
+#
+# 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.
+#
+
+# extras file for org.heneveld.license-audit-maven-plugin
+# listing projects from which *source* files are included
+
+- id: github.com/codegangsta/cli
+- id: golang.org/x/crypto/ssh

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/284627ae/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
deleted file mode 100644
index 1a624bf..0000000
--- a/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,47 +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>bin</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <directory>src/main/license/files</directory>
-            <outputDirectory><!-- leave blank, meaning 'root of archive' --></outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}</directory>
-            <includes>
-                <include>README</include>
-                <include>LICENSE*</include>
-                <include>NOTICE*</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}/bin</directory>
-            <outputDirectory><!-- leave blank, meaning 'root of archive' --></outputDirectory>
-            <includes>
-                <include>**/br</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</assembly>

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/284627ae/src/main/license/files/NOTICE-codegangsta
----------------------------------------------------------------------
diff --git a/src/main/license/files/NOTICE-codegangsta b/src/main/license/files/NOTICE-codegangsta
deleted file mode 100644
index 4a54456..0000000
--- a/src/main/license/files/NOTICE-codegangsta
+++ /dev/null
@@ -1,5 +0,0 @@
-
-This project includes the software: github.com/codegangsta/cli
-  Available at: https://github.com/codegangsta/cli
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-  Copyright (C) 2013 Jeremy Saenz
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/284627ae/src/main/license/files/NOTICE-x-crypto-ssh
----------------------------------------------------------------------
diff --git a/src/main/license/files/NOTICE-x-crypto-ssh b/src/main/license/files/NOTICE-x-crypto-ssh
deleted file mode 100644
index 447198b..0000000
--- a/src/main/license/files/NOTICE-x-crypto-ssh
+++ /dev/null
@@ -1,5 +0,0 @@
-
-This project includes the software: golang.org/x/crypto/ssh
-  Available at: https://godoc.org/golang.org/x/crypto/ssh
-  Used under the following license: The BSD 3-Clause (New BSD) License (http://opensource.org/licenses/BSD-3-Clause)
-  Copyright (c) 2009 The Go Authors. All rights reserved.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/284627ae/src/main/license/source-inclusions.yaml
----------------------------------------------------------------------
diff --git a/src/main/license/source-inclusions.yaml b/src/main/license/source-inclusions.yaml
deleted file mode 100644
index c985c5b..0000000
--- a/src/main/license/source-inclusions.yaml
+++ /dev/null
@@ -1,24 +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.
-#
-
-# extras file for org.heneveld.license-audit-maven-plugin
-# listing projects from which *source* files are included
-
-- id: github.com/codegangsta/cli
-- id: golang.org/x/crypto/ssh


Mime
View raw message