You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2017/10/15 17:07:31 UTC

[1/2] incubator-netbeans git commit: [NETBEANS-54] Module Review libs.jvyamlb

Repository: incubator-netbeans
Updated Branches:
  refs/heads/master 4a55576d1 -> 9bad3560a


[NETBEANS-54] Module Review libs.jvyamlb

  - Version 0.2.7 is not available in maven.central
  - Downgraded to 0.2.6 to see how it behaves in travis build
  - See issue #82 https://issues.apache.org/jira/browse/NETBEANS-82


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/79d0b48a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/79d0b48a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/79d0b48a

Branch: refs/heads/master
Commit: 79d0b48ad1ce0d9bfa7086612bf85b5ed9c6fa21
Parents: a7f3fe7
Author: Antonio Vieiro <an...@vieiro.net>
Authored: Tue Oct 10 22:23:35 2017 +0200
Committer: Antonio Vieiro <an...@vieiro.net>
Committed: Tue Oct 10 22:23:35 2017 +0200

----------------------------------------------------------------------
 libs.jvyamlb/external/binaries-list             |  2 +-
 libs.jvyamlb/external/jvyamlb-0.2.6-license.txt | 19 +++++++++++++++++++
 libs.jvyamlb/nbproject/project.properties       |  2 +-
 libs.jvyamlb/nbproject/project.xml              |  4 ++--
 4 files changed, 23 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/79d0b48a/libs.jvyamlb/external/binaries-list
----------------------------------------------------------------------
diff --git a/libs.jvyamlb/external/binaries-list b/libs.jvyamlb/external/binaries-list
index 6675050..24ddaa9 100644
--- a/libs.jvyamlb/external/binaries-list
+++ b/libs.jvyamlb/external/binaries-list
@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-ED45F5C56EC70CC77936E92B43B6F32F46E6F4B3 jvyamlb-0.2.7.jar
+C8E994189BA694D5A07706C401D6FE8D8375A38A org.jruby.extras:jvyamlb:0.2.6

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/79d0b48a/libs.jvyamlb/external/jvyamlb-0.2.6-license.txt
----------------------------------------------------------------------
diff --git a/libs.jvyamlb/external/jvyamlb-0.2.6-license.txt b/libs.jvyamlb/external/jvyamlb-0.2.6-license.txt
new file mode 100644
index 0000000..20264b5
--- /dev/null
+++ b/libs.jvyamlb/external/jvyamlb-0.2.6-license.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2008 Ola Bini <ol...@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of 
+this software and associated documentation files (the "Software"), to deal in 
+the Software without restriction, including without limitation the rights to 
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+SOFTWARE.

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/79d0b48a/libs.jvyamlb/nbproject/project.properties
----------------------------------------------------------------------
diff --git a/libs.jvyamlb/nbproject/project.properties b/libs.jvyamlb/nbproject/project.properties
index 5814a0b..f6e57f8 100644
--- a/libs.jvyamlb/nbproject/project.properties
+++ b/libs.jvyamlb/nbproject/project.properties
@@ -16,6 +16,6 @@
 # under the License.
 
 is.autoload=true
-release.external/jvyamlb-0.2.7.jar=modules/ext/jvyamlb-0.2.7.jar
+release.external/jvyamlb-0.2.6.jar=modules/ext/jvyamlb-0.2.6.jar
 
 sigtest.gen.fail.on.error=false

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/79d0b48a/libs.jvyamlb/nbproject/project.xml
----------------------------------------------------------------------
diff --git a/libs.jvyamlb/nbproject/project.xml b/libs.jvyamlb/nbproject/project.xml
index 0283348..7caaf1f 100644
--- a/libs.jvyamlb/nbproject/project.xml
+++ b/libs.jvyamlb/nbproject/project.xml
@@ -58,8 +58,8 @@
                 <subpackages>org.jvyamlb</subpackages>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/jvyamlb-0.2.7.jar</runtime-relative-path>
-                <binary-origin>external/jvyamlb-0.2.7.jar</binary-origin>
+                <runtime-relative-path>ext/jvyamlb-0.2.6.jar</runtime-relative-path>
+                <binary-origin>external/jvyamlb-0.2.6.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>


[2/2] incubator-netbeans git commit: Merge branch 'pr/115'

Posted by ma...@apache.org.
Merge branch 'pr/115'


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/9bad3560
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/9bad3560
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/9bad3560

Branch: refs/heads/master
Commit: 9bad3560a59688ba50d6b9c8fa4fc26431eaf681
Parents: 4a55576 79d0b48
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sun Oct 15 19:07:20 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 15 19:07:20 2017 +0200

----------------------------------------------------------------------
 libs.jvyamlb/external/binaries-list             |  2 +-
 libs.jvyamlb/external/jvyamlb-0.2.6-license.txt | 19 +++++++++++++++++++
 libs.jvyamlb/nbproject/project.properties       |  2 +-
 libs.jvyamlb/nbproject/project.xml              |  4 ++--
 4 files changed, 23 insertions(+), 4 deletions(-)
----------------------------------------------------------------------