Skip to content

JENA-1474: Update Apache parent POM v18 -> v19 #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 1 commit into from
Feb 12, 2018
Merged

JENA-1474: Update Apache parent POM v18 -> v19 #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions jena-elephas/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,28 @@ limitations under the License.
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<!-- skip does not seem to skip -->
<executions>
<execution>
<id>enforce</id>
<phase/>
</execution>
</executions>
<configuration>
<!-- The Hadoop dependency has inconsistent dependencies -->
<!-- Really want to just turn off <dependencyConvergence/> -->
<skip>true</skip>
<fail>false</fail>
</configuration>
</plugin>
</plugins>
</build>

<dependencyManagement>
<dependencies>
<!-- Hadoop Dependencies -->
Expand Down
10 changes: 10 additions & 0 deletions jena-text-es/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,16 @@
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>transport</artifactId>
<exclusions>
<!-- Take "jackson" that comes via jsonld-java
At Jena 3.7.0 that is jsonld-java v0.11.1 depends on jackson 2.9.0
whereas elasticsearch depends on jackson 2.8.6
-->
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
7 changes: 5 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>18</version>
<version>19</version>
</parent>

<licenses>
Expand Down Expand Up @@ -252,7 +252,9 @@
<module>jena-fuseki1</module>
<module>jena-csv</module>
<module>jena-sdb</module>
<module>jena-maven-tools</module>
<!-- apache-19 breaks this
<module>jena-maven-tools</module>
-->

<!-- Other -->
<module>jena-permissions</module>
Expand Down Expand Up @@ -581,6 +583,7 @@
</goals>
<configuration combine.self="override">
<rules>
<dependencyConvergence/>
<requireJavaVersion>
<version>1.8.0</version>
</requireJavaVersion>
Expand Down