You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/10/11 03:35:34 UTC
lucene-solr:jira/http2: Revert base-deps changes
Repository: lucene-solr
Updated Branches:
refs/heads/jira/http2 a224098a1 -> d5421120e
Revert base-deps changes
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d5421120
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d5421120
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d5421120
Branch: refs/heads/jira/http2
Commit: d5421120ed2d1f656cb1cd36b8dcc51cadbbf432
Parents: a224098
Author: Cao Manh Dat <da...@apache.org>
Authored: Thu Oct 11 10:35:26 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Thu Oct 11 10:35:26 2018 +0700
----------------------------------------------------------------------
solr/base-deps/build.xml | 48 -------------------------------------------
solr/base-deps/ivy.xml | 41 ------------------------------------
solr/build.xml | 5 +----
solr/common-build.xml | 11 +---------
solr/server/ivy.xml | 6 ++++++
solr/solrj/build.xml | 4 ----
solr/solrj/ivy.xml | 6 ++++++
solr/webapp/build.xml | 3 ---
8 files changed, 14 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5421120/solr/base-deps/build.xml
----------------------------------------------------------------------
diff --git a/solr/base-deps/build.xml b/solr/base-deps/build.xml
deleted file mode 100644
index f48bffc..0000000
--- a/solr/base-deps/build.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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
-
- 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.
- -->
-<project name="solr-base-deps" default="resolve" xmlns:ivy="antlib:org.apache.ivy.ant">
- <description>Solr dependencies that need by both solrj and startup process</description>
-
- <import file="../common-build.xml"/>
-
- <!-- example tests are currently elsewhere -->
- <target name="test"/>
- <target name="test-nocompile"/>
-
- <!-- this module has no javadocs -->
- <target name="javadocs"/>
-
- <!-- this module has no jar either -->
- <target name="jar-core"/>
-
- <!-- nothing to compile -->
- <target name="compile-core"/>
- <target name="compile-test"/>
-
- <!-- nothing to cover -->
- <target name="pitest"/>
-
- <target name="resolve" depends="ivy-availability-check,ivy-fail,ivy-configure">
- <sequential>
- <ivy:retrieve conf="compile" type="jar,bundle" sync="${ivy.sync}" log="download-only" symlink="${ivy.symlink}"/>
- <ivy:retrieve conf="test" type="jar,bundle,test" sync="${ivy.sync}" log="download-only" symlink="${ivy.symlink}"
- pattern="${test.lib.dir}/[artifact]-[revision](-[classifier]).[ext]"/>
- </sequential>
- </target>
-
-</project>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5421120/solr/base-deps/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/base-deps/ivy.xml b/solr/base-deps/ivy.xml
deleted file mode 100644
index 657b9a8..0000000
--- a/solr/base-deps/ivy.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 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.
--->
-<ivy-module version="2.0">
- <info organisation="org.apache.solr" module="base-deps"/>
-
- <configurations defaultconfmapping="compile->master;test->master">
- <!-- artifacts in the "compile" configuration will go into solr/base-deps/lib/ -->
- <conf name="compile" transitive="false"/>
- <!-- artifacts in the "test" configuration will go into solr/base-deps/test-lib/ -->
- <conf name="test" transitive="false"/>
- </configurations>
-
- <dependencies>
- <dependency org="org.eclipse.jetty.http2" name="http2-common" rev="${/org.eclipse.jetty.http2/http2-common}" conf="compile"/>
- <dependency org="org.eclipse.jetty.http2" name="http2-hpack" rev="${/org.eclipse.jetty.http2/http2-hpack}" conf="compile"/>
- <dependency org="org.eclipse.jetty" name="jetty-util" rev="${/org.eclipse.jetty/jetty-util}" conf="compile"/>
- <dependency org="org.eclipse.jetty" name="jetty-http" rev="${/org.eclipse.jetty/jetty-http}" conf="compile"/>
- <dependency org="org.eclipse.jetty" name="jetty-io" rev="${/org.eclipse.jetty/jetty-io}" conf="compile"/>
-
- <dependency org="org.conscrypt" name="conscrypt-openjdk-uber" rev="${/org.conscrypt/conscrypt-openjdk-uber}" conf="compile"/>
-
- <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
- </dependencies>
-</ivy-module>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5421120/solr/build.xml
----------------------------------------------------------------------
diff --git a/solr/build.xml b/solr/build.xml
index e174efa..7ed40bb 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -635,12 +635,9 @@
<target name="resolve" depends="resolve-example,resolve-server">
<sequential>
- <ant dir="base-deps" target="resolve" inheritall="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
<ant dir="core" target="resolve" inheritall="false">
<propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
+ </ant>
<ant dir="solrj" target="resolve" inheritall="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5421120/solr/common-build.xml
----------------------------------------------------------------------
diff --git a/solr/common-build.xml b/solr/common-build.xml
index e3dc22c..2a0ad51 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -77,7 +77,6 @@
<path id="additional.dependencies">
<fileset dir="${common-solr.dir}/core/lib" excludes="${common.classpath.excludes}"/>
- <fileset dir="${common-solr.dir}/base-deps/lib" excludes="${common.classpath.excludes}"/>
<fileset dir="${common-solr.dir}/solrj/lib" excludes="${common.classpath.excludes}"/>
<fileset dir="${common-solr.dir}/server/lib" excludes="${common.classpath.excludes}"/>
<fileset dir="${common-solr.dir}/example/example-DIH/solr/db/lib" excludes="${common.classpath.excludes}"/>
@@ -240,7 +239,7 @@
<solr-jarify/>
</target>
- <target name="compile-core" depends="prep-lucene-jars,resolve-base-deps,resolve-example,resolve-server,common.compile-core"/>
+ <target name="compile-core" depends="prep-lucene-jars,resolve-example,resolve-server,common.compile-core"/>
<target name="compile-test" depends="compile-solr-test-framework,common.compile-test"/>
<target name="dist" depends="jar-core">
@@ -473,14 +472,6 @@
<property name="server.libs.uptodate" value="true"/>
</target>
- <!-- resolve dependencies in the server directory (relied upon by compile/tests) -->
- <target name="resolve-base-deps" unless="base.deps.libs.uptodate">
- <ant dir="${common-solr.dir}/base-deps" target="resolve" inheritAll="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
- <property name="base.deps.libs.uptodate" value="true"/>
- </target>
-
<macrodef name="contrib-crawl">
<attribute name="target" default=""/>
<attribute name="failonerror" default="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5421120/solr/server/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/server/ivy.xml b/solr/server/ivy.xml
index 5ad36b3..51654a7 100644
--- a/solr/server/ivy.xml
+++ b/solr/server/ivy.xml
@@ -45,18 +45,24 @@
<dependency org="org.eclipse.jetty" name="jetty-continuation" rev="${/org.eclipse.jetty/jetty-continuation}" conf="jetty"/>
<dependency org="org.eclipse.jetty" name="jetty-deploy" rev="${/org.eclipse.jetty/jetty-deploy}" conf="jetty"/>
+ <dependency org="org.eclipse.jetty" name="jetty-http" rev="${/org.eclipse.jetty/jetty-http}" conf="jetty"/>
+ <dependency org="org.eclipse.jetty" name="jetty-io" rev="${/org.eclipse.jetty/jetty-io}" conf="jetty"/>
<dependency org="org.eclipse.jetty" name="jetty-jmx" rev="${/org.eclipse.jetty/jetty-jmx}" conf="jetty"/>
<dependency org="org.eclipse.jetty" name="jetty-rewrite" rev="${/org.eclipse.jetty/jetty-rewrite}" conf="jetty"/>
<dependency org="org.eclipse.jetty" name="jetty-security" rev="${/org.eclipse.jetty/jetty-security}" conf="jetty"/>
<dependency org="org.eclipse.jetty" name="jetty-server" rev="${/org.eclipse.jetty/jetty-server}" conf="jetty"/>
<dependency org="org.eclipse.jetty" name="jetty-servlet" rev="${/org.eclipse.jetty/jetty-servlet}" conf="jetty"/>
<dependency org="org.eclipse.jetty" name="jetty-servlets" rev="${/org.eclipse.jetty/jetty-servlets}" conf="jetty"/>
+ <dependency org="org.eclipse.jetty" name="jetty-util" rev="${/org.eclipse.jetty/jetty-util}" conf="jetty"/>
<dependency org="org.eclipse.jetty" name="jetty-webapp" rev="${/org.eclipse.jetty/jetty-webapp}" conf="jetty"/>
<dependency org="org.eclipse.jetty" name="jetty-xml" rev="${/org.eclipse.jetty/jetty-xml}" conf="jetty"/>
<dependency org="org.eclipse.jetty" name="jetty-alpn-conscrypt-server" rev="${/org.eclipse.jetty/jetty-alpn-conscrypt-server}" conf="jetty"/>
<dependency org="org.eclipse.jetty" name="jetty-alpn-server" rev="${/org.eclipse.jetty/jetty-alpn-server}" conf="jetty"/>
<dependency org="org.eclipse.jetty.http2" name="http2-server" rev="${/org.eclipse.jetty.http2/http2-server}" conf="jetty"/>
+ <dependency org="org.eclipse.jetty.http2" name="http2-common" rev="${/org.eclipse.jetty.http2/http2-common}" conf="jetty"/>
+ <dependency org="org.eclipse.jetty.http2" name="http2-hpack" rev="${/org.eclipse.jetty.http2/http2-hpack}" conf="jetty"/>
+ <dependency org="org.conscrypt" name="conscrypt-openjdk-uber" rev="${/org.conscrypt/conscrypt-openjdk-uber}" conf="jetty"/>
<dependency org="javax.servlet" name="javax.servlet-api" rev="${/javax.servlet/javax.servlet-api}" conf="jetty"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5421120/solr/solrj/build.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/build.xml b/solr/solrj/build.xml
index 975a1ea..3393438 100644
--- a/solr/solrj/build.xml
+++ b/solr/solrj/build.xml
@@ -24,7 +24,6 @@
<!-- Specialized compile classpath: to only depend on what solrj should depend on (e.g. not lucene) -->
<path id="classpath">
- <fileset dir="${common-solr.dir}/base-deps/lib" excludes="${common.classpath.excludes}"/>
<fileset dir="${common-solr.dir}/solrj/lib" excludes="${common.classpath.excludes}"/>
</path>
@@ -80,9 +79,6 @@
<fileset dir="${common-solr.dir}/solrj/lib">
<include name="*.jar"/>
</fileset>
- <fileset dir="${common-solr.dir}/base-deps/lib">
- <include name="*.jar"/>
- </fileset>
</copy>
</target>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5421120/solr/solrj/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/ivy.xml b/solr/solrj/ivy.xml
index df0ece2..5153f24 100644
--- a/solr/solrj/ivy.xml
+++ b/solr/solrj/ivy.xml
@@ -42,10 +42,16 @@
<dependency org="org.eclipse.jetty.http2" name="http2-client" rev="${/org.eclipse.jetty.http2/http2-client}" conf="compile"/>
<dependency org="org.eclipse.jetty.http2" name="http2-http-client-transport" rev="${/org.eclipse.jetty.http2/http2-http-client-transport}" conf="compile"/>
+ <dependency org="org.eclipse.jetty.http2" name="http2-common" rev="${/org.eclipse.jetty.http2/http2-common}" conf="compile"/>
+ <dependency org="org.eclipse.jetty.http2" name="http2-hpack" rev="${/org.eclipse.jetty.http2/http2-hpack}" conf="compile"/>
<dependency org="org.eclipse.jetty" name="jetty-client" rev="${/org.eclipse.jetty/jetty-client}" conf="compile"/>
+ <dependency org="org.eclipse.jetty" name="jetty-util" rev="${/org.eclipse.jetty/jetty-util}" conf="compile"/>
+ <dependency org="org.eclipse.jetty" name="jetty-http" rev="${/org.eclipse.jetty/jetty-http}" conf="compile"/>
+ <dependency org="org.eclipse.jetty" name="jetty-io" rev="${/org.eclipse.jetty/jetty-io}" conf="compile"/>
<dependency org="org.eclipse.jetty" name="jetty-alpn-conscrypt-client" rev="${/org.eclipse.jetty/jetty-alpn-conscrypt-client}" conf="compile"/>
<dependency org="org.eclipse.jetty" name="jetty-alpn-client" rev="${/org.eclipse.jetty/jetty-alpn-client}" conf="compile"/>
+ <dependency org="org.conscrypt" name="conscrypt-openjdk-uber" rev="${/org.conscrypt/conscrypt-openjdk-uber}" conf="compile"/>
<dependency org="org.apache.logging.log4j" name="log4j-slf4j-impl" rev="${/org.apache.logging.log4j/log4j-slf4j-impl}" conf="test"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5421120/solr/webapp/build.xml
----------------------------------------------------------------------
diff --git a/solr/webapp/build.xml b/solr/webapp/build.xml
index c56deb2..99f8d17 100644
--- a/solr/webapp/build.xml
+++ b/solr/webapp/build.xml
@@ -46,9 +46,6 @@
<fileset dir="web" excludes="${exclude.from.webapp}"/>
<fileset dir="${dest}/web" excludes="${exclude.from.war}"/> <!-- contribs' additions -->
</copy>
- <!--<copy todir="${server.dir}/lib">-->
- <!--<fileset dir="${common-solr.dir}/base-deps/lib" excludes="${exclude.from.webapp}"/>-->
- <!--</copy>-->
<mkdir dir="${server.dir}/solr-webapp/webapp/WEB-INF/lib"/>
<copy todir="${server.dir}/solr-webapp/webapp/WEB-INF/lib">
<fileset dir="${common-solr.dir}/core/lib" excludes="${exclude.from.webapp},${common.classpath.excludes}"/>