You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@netbeans.apache.org by GitBox <gi...@apache.org> on 2017/10/31 11:53:10 UTC
[GitHub] matthiasblaesing closed pull request #163: [NETBEANS-54] Module Review maven.indexer
matthiasblaesing closed pull request #163: [NETBEANS-54] Module Review maven.indexer
URL: https://github.com/apache/incubator-netbeans/pull/163
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/maven.indexer/external/binaries-list b/maven.indexer/external/binaries-list
index 16be5dd22..0527a4b99 100644
--- a/maven.indexer/external/binaries-list
+++ b/maven.indexer/external/binaries-list
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
627EC612B8D50EE42C2D0F13DF5476E26D696634 indexer-core-6.0-SNAPSHOT-patched.jar
-20540C6347259F35A0D264605B22CE2A13917066 lucene-core-5.5.3.jar
-D276E74D57C64ED5F9A09A48DA05B75555E8709A lucene-highlighter-5.5.3.jar
-E2452203D2C44CAC5AC42B34E5DCC0A44BF29A53 lucene-queryparser-5.5.3.jar
-CF734AB72813AF33DC1544CE61ABC5C17B9D35E9 lucene-analyzers-common-5.5.3.jar
-479C1E06DB31C432330183F5CAE684163F186146 javax.annotation-api-1.2.jar
+20540C6347259F35A0D264605B22CE2A13917066 org.apache.lucene:lucene-core:5.5.3
+D276E74D57C64ED5F9A09A48DA05B75555E8709A org.apache.lucene:lucene-highlighter:5.5.3
+E2452203D2C44CAC5AC42B34E5DCC0A44BF29A53 org.apache.lucene:lucene-queryparser:5.5.3
+CF734AB72813AF33DC1544CE61ABC5C17B9D35E9 org.apache.lucene:lucene-analyzers-common:5.5.3
+479C1E06DB31C432330183F5CAE684163F186146 javax.annotation:javax.annotation-api:1.2
diff --git a/maven.indexer/external/mvn-indexer.patch b/maven.indexer/external/mvn-indexer.patch
index 1e36ec2a4..7e0d35c7c 100644
--- a/maven.indexer/external/mvn-indexer.patch
+++ b/maven.indexer/external/mvn-indexer.patch
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
diff --git a/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java b/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
index 9f33f67..e57a2a7 100644
--- a/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index cf5dc9eda..fa966b6f1 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -2018,6 +2018,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="languages.yaml/src/org/netbeans/modules/languages/yaml/*.yml" /> <!--Files used in GUI as sample/starting point-->
<exclude name="lib.uihandler/test/unit/src/**" /> <!--test data-->
<exclude name="maven.htmlui/src/org/netbeans/modules/maven/htmlui/UIDefaults" /> <!-- config file with no place for license header-->
+ <exclude name="maven.indexer/external/NOTICE-patched-indexer-core-6.0.0" /> <!--no degree of creativity-->
<exclude name="mercurial/src/org/netbeans/modules/mercurial/util/log*" /> <!-- user templates for mercurial commits, etc. -->
<exclude name="nbbuild/netbeans/**" />
<exclude name="nbbuild/testuserdir/**" />
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services