Skip to content

Commit

Permalink
Attempt local downgrade of Jetty in solr compliance module
Browse files Browse the repository at this point in the history
  • Loading branch information
erikgb committed May 18, 2023
1 parent 89f2bb8 commit 115c43d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
8 changes: 6 additions & 2 deletions compliance/solr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
<name>RDF4J: Solr Sail Tests</name>
<description>Tests for Solr Sail.</description>
<properties>
<!-- FIXME: Jetty 10.x requires Solr 9.x -->
<jetty.version>9.4.50.v20221201</jetty.version>
<enforce-javaee-provided.fail>false</enforce-javaee-provided.fail>
<!-- used to set up embedded solr server in integration tests -->
<test.solr.home>${project.basedir}/solr</test.solr.home>
</properties>
Expand Down Expand Up @@ -62,10 +65,11 @@
<version>${solr.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<!-- FIXME: Jetty 10.x requires Solr 9.x -->
<!--exclusion>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
</exclusion -->
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>*</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<enforce-no-javax-dependencies.fail>true</enforce-no-javax-dependencies.fail>
<enforce-javaee-provided.fail>true</enforce-javaee-provided.fail>
<jakartaee.version>8.0.0</jakartaee.version>
<!-- Jakarta XML Binding is part of Jakarta EE BOM from version 9 -->
Expand Down Expand Up @@ -975,7 +976,7 @@
</excludes>
</bannedDependencies>
</rules>
<fail>true</fail>
<fail>${enforce-no-javax-dependencies.fail}</fail>
</configuration>
</execution>
<execution>
Expand Down

0 comments on commit 115c43d

Please sign in to comment.