MNT-22548: bump org.restlet version (#1292)

MNT-22548: bump org.restlet version
This commit is contained in:
Vitor Moreira
2021-12-20 15:19:29 +00:00
parent e44f656e61
commit 30cd2e02ea
4 changed files with 30 additions and 4 deletions

11
pom.xml
View File

@@ -43,6 +43,7 @@
<dependency.jakarta.xml.bind-api.version>3.0.1</dependency.jakarta.xml.bind-api.version> <dependency.jakarta.xml.bind-api.version>3.0.1</dependency.jakarta.xml.bind-api.version>
<dependency.tika.version>1.27</dependency.tika.version> <dependency.tika.version>1.27</dependency.tika.version>
<dependency.hadoop.version>2.7.7</dependency.hadoop.version> <dependency.hadoop.version>2.7.7</dependency.hadoop.version>
<dependency.restlet.version>2.3.12</dependency.restlet.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
@@ -101,6 +102,16 @@
<artifactId>hadoop-hdfs</artifactId> <artifactId>hadoop-hdfs</artifactId>
<version>${dependency.hadoop.version}</version> <version>${dependency.hadoop.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.restlet.jee</groupId>
<artifactId>org.restlet</artifactId>
<version>${dependency.restlet.version}</version>
</dependency>
<dependency>
<groupId>org.restlet.jee</groupId>
<artifactId>org.restlet.ext.servlet</artifactId>
<version>${dependency.restlet.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<modules> <modules>

View File

@@ -169,6 +169,12 @@
<version>1.1.4c</version> <version>1.1.4c</version>
</dependency> </dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-xmlfactory</artifactId>
<version>1.3</version>
</dependency>
<!-- DATE Functions (YEAR, MONTH, ...) are broken in Calcite 1.11.0 (default <!-- DATE Functions (YEAR, MONTH, ...) are broken in Calcite 1.11.0 (default
version provided by SOLR 6.6.x) version provided by SOLR 6.6.x)
Upgrading manually Calcite version to 1.15.0 Upgrading manually Calcite version to 1.15.0

View File

@@ -112,7 +112,7 @@
<outputDirectory>${project.build.directory}/solr-libs</outputDirectory> <outputDirectory>${project.build.directory}/solr-libs</outputDirectory>
<excludes>**/jackson-dataformat-smile-*.jar,**/asm-3.3.1.jar,**/jackson-core-asl-*.jar,**/jackson-mapper-asl-*.jar,**/dom4j-1.6.1.jar, <excludes>**/jackson-dataformat-smile-*.jar,**/asm-3.3.1.jar,**/jackson-core-asl-*.jar,**/jackson-mapper-asl-*.jar,**/dom4j-1.6.1.jar,
**/annotations-1.0.0.jar,**/spring-context-support-*.jar,**/spring-web-*.jar,**/woodstox-core-asl-4.4.1.jar, **/isoparser-1.1.18.jar, **/annotations-1.0.0.jar,**/spring-context-support-*.jar,**/spring-web-*.jar,**/woodstox-core-asl-4.4.1.jar, **/isoparser-1.1.18.jar,
**/metadata-extractor-2.9.1.jar **/metadata-extractor-2.9.1.jar,**/org.restlet.ext.servlet-2.3.0.jar
</excludes> </excludes>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
@@ -132,6 +132,12 @@
<version>${project.version}</version> <version>${project.version}</version>
<outputDirectory>${project.build.directory}/solr-libs/libs</outputDirectory> <outputDirectory>${project.build.directory}/solr-libs/libs</outputDirectory>
</artifactItem> </artifactItem>
<artifactItem>
<groupId>org.restlet.jee</groupId>
<artifactId>org.restlet.ext.servlet</artifactId>
<version>${dependency.restlet.version}</version>
<outputDirectory>${project.build.directory}/solr-libs/libs</outputDirectory>
</artifactItem>
</artifactItems> </artifactItems>
<outputDirectory>${project.build.directory}/wars</outputDirectory> <outputDirectory>${project.build.directory}/wars</outputDirectory>
<overWriteReleases>false</overWriteReleases> <overWriteReleases>false</overWriteReleases>
@@ -167,6 +173,8 @@
<delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/hadoop-common-2.7.4.jar" /> <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/hadoop-common-2.7.4.jar" />
<delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/hadoop-hdfs-2.7.4.jar" /> <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/hadoop-hdfs-2.7.4.jar" />
<delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/avatica-core-1.9.0.jar" /> <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/avatica-core-1.9.0.jar" />
<delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/org.restlet-2.3.0.jar" />
<delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/org.restlet.ext.servlet-2.3.0.jar" />
</target> </target>
</configuration> </configuration>

View File

@@ -68,7 +68,6 @@ spring-expression-5.3.9.jar http://projects.spring.io/spring-framework/
spring-jdbc-5.3.9.jar http://projects.spring.io/spring-framework/ spring-jdbc-5.3.9.jar http://projects.spring.io/spring-framework/
spring-orm-5.3.9.jar http://projects.spring.io/spring-framework/ spring-orm-5.3.9.jar http://projects.spring.io/spring-framework/
spring-tx-5.3.9.jar http://projects.spring.io/spring-framework/ spring-tx-5.3.9.jar http://projects.spring.io/spring-framework/
xercesImpl-2.12.1.jar http://xerces.apache.org/xerces2-j
guessencoding-1.4.jar http://docs.codehaus.org/display/GUESSENC/ guessencoding-1.4.jar http://docs.codehaus.org/display/GUESSENC/
jug-2.0.0-asl.jar http://jug.safehaus.org/ jug-2.0.0-asl.jar http://jug.safehaus.org/
acegi-security-0.8.2_patched.jar http://sourceforge.net/projects/acegisecurity/ acegi-security-0.8.2_patched.jar http://sourceforge.net/projects/acegisecurity/
@@ -105,6 +104,10 @@ hadoop-annotations-2.7.7.jar https://github.com/apache/hadoop/blob/rel/release-2
hadoop-auth-2.7.7.jar https://github.com/apache/hadoop/blob/rel/release-2.7.7/LICENSE.txt hadoop-auth-2.7.7.jar https://github.com/apache/hadoop/blob/rel/release-2.7.7/LICENSE.txt
hadoop-common-2.7.7.jar https://github.com/apache/hadoop/blob/rel/release-2.7.7/LICENSE.txt hadoop-common-2.7.7.jar https://github.com/apache/hadoop/blob/rel/release-2.7.7/LICENSE.txt
hadoop-hdfs-2.7.7.jar https://github.com/apache/hadoop/blob/rel/release-2.7.7/LICENSE.txt hadoop-hdfs-2.7.7.jar https://github.com/apache/hadoop/blob/rel/release-2.7.7/LICENSE.txt
org.restlet-2.3.12.jar https://github.com/restlet/restlet-framework-java/blob/2.3.12/README.md
org.restlet.ext.servlet-2.3.12.jar https://github.com/restlet/restlet-framework-java/blob/2.3.12/README.md
xercesImpl-2.11.0-alfresco-patched-20180402.jar http://www.apache.org/licenses/LICENSE-2.0.txt
xml-apis-1.4.01.jar http://www.apache.org/licenses/LICENSE-2.0.txt
=== Creative Commons Public Domain === === Creative Commons Public Domain ===
@@ -237,8 +240,6 @@ morfologik-fsa-2.1.1.jar
morfologik-polish-2.1.1.jar morfologik-polish-2.1.1.jar
morfologik-stemming-2.1.1.jar morfologik-stemming-2.1.1.jar
noggit-0.6.jar noggit-0.6.jar
org.restlet-2.3.0.jar
org.restlet.ext.servlet-2.3.0.jar
pdfbox-2.0.6.jar pdfbox-2.0.6.jar
pdfbox-tools-2.0.6.jar pdfbox-tools-2.0.6.jar
poi-3.17-beta1.jar poi-3.17-beta1.jar