Skip to content
This repository has been archived by the owner on Oct 12, 2021. It is now read-only.

Commit

Permalink
Clean up POM files (#71)
Browse files Browse the repository at this point in the history 
* Deduplicate plugin and distribution management
* Centralise all deps management
* Centralise most properties
* Fix javadoc configuration for JDK11+

Signed-off-by: Andrew Berezovskyi <andriib@kth.se>
  • Loading branch information
@berezovskyi
berezovskyi committed Feb 15, 2019
1 parent 8881c52 commit c4708ca
Show file tree
Hide file tree
Showing 8 changed files with 102 additions and 364 deletions.
62 changes: 9 additions & 53 deletions oslc-query/pom.xml
View file
Expand Up @@ -7,37 +7,29 @@
<version>4.0.0-SNAPSHOT</version>
<relativePath>../oslc4j-core-build/pom.xml</relativePath>
</parent>
<!--TODO fix-->

<groupId>org.eclipse.lyo.core.query</groupId>
<artifactId>oslc-query</artifactId>
<name>OSLC4J Query</name>
<description>OSLC query support for the Eclipse Lyo OSLC4J SDK.</description>
<scm>
<url>http://git.eclipse.org/c/lyo/org.eclipse.lyo.core.git</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<lyo.version>${project.parent.version}</lyo.version>
</properties>

<dependencies>
<dependency>
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
<artifactId>oslc4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
<version>3.5.2</version>
</dependency>

<!-- TEST -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
<artifactId>oslc4j-core</artifactId>
<version>${lyo.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -82,38 +74,15 @@
</executions>
</plugin>

<!-- Source Jar Plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Javadoc Plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>

<pluginManagement>
Expand Down Expand Up @@ -149,17 +118,4 @@
</plugins>
</pluginManagement>
</build>

<distributionManagement>
<repository>
<id>repo.eclipse.org</id>
<name>Eclipse Lyo Releases</name>
<url>https://repo.eclipse.org/content/repositories/lyo-releases/</url>
</repository>
<snapshotRepository>
<id>repo.eclipse.org</id>
<name>Eclipse Lyo Snapshots</name>
<url>https://repo.eclipse.org/content/repositories/lyo-snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project>
52 changes: 2 additions & 50 deletions oslc-trs/pom.xml
View file
Expand Up @@ -8,34 +8,23 @@
<version>4.0.0-SNAPSHOT</version>
<relativePath>../oslc4j-core-build/pom.xml</relativePath>
</parent>
<!--TODO fix-->

<groupId>org.eclipse.lyo</groupId>
<artifactId>oslc-trs</artifactId>
<name>OSLC TRS Toolkit</name>
<description>Software development kit to assist with TRS adoption.</description>

<scm>
<url>http://git.eclipse.org/c/lyo/org.eclipse.lyo.core.git</url>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<lyo.version>${project.parent.version}</lyo.version>
</properties>
</properties>

<dependencies>
<dependency>
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
<artifactId>oslc4j-core</artifactId>
<version>${lyo.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
<artifactId>oslc4j-jena-provider</artifactId>
<version>${lyo.version}</version>
</dependency>

<dependency>
Expand All @@ -62,53 +51,16 @@
</dependencies>

<build>
<outputDirectory>target/classes</outputDirectory>
<plugins>
<!-- Source Jar Plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Javadoc Plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<distributionManagement>
<repository>
<id>repo.eclipse.org</id>
<name>Eclipse Lyo Releases</name>
<url>https://repo.eclipse.org/content/repositories/lyo-releases/</url>
</repository>
<snapshotRepository>
<id>repo.eclipse.org</id>
<name>Eclipse Lyo Snapshots</name>
<url>https://repo.eclipse.org/content/repositories/lyo-snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project>
86 changes: 74 additions & 12 deletions oslc4j-core-build/pom.xml
View file
Expand Up @@ -7,24 +7,15 @@
<packaging>pom</packaging>
<name>OSLC4J Build</name>

<profiles>
<profile>
<id>disable-java8-doclint</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<properties>
<additionalparam>-Xdoclint:none</additionalparam>
</properties>
</profile>
</profiles>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

<version.lyo>${project.version}</version.lyo>
<version.jena>3.6.0</version.jena>
<version.servlet>3.1.0</version.servlet>
</properties>

<modules>
Expand All @@ -39,6 +30,40 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
<artifactId>oslc4j-core</artifactId>
<version>${version.lyo}</version>
</dependency>
<dependency>
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
<artifactId>oslc4j-jena-provider</artifactId>
<version>${version.lyo}</version>
</dependency>
<dependency>
<groupId>org.eclipse.lyo.oslc4j.core</groupId>
<artifactId>oslc4j-json4j-provider</artifactId>
<version>${version.lyo}</version>
</dependency>

<dependency>
<!--TODO remove-->
<groupId>org.glassfish</groupId>
<artifactId>javax.servlet</artifactId>
<version>3.1-b33</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${version.servlet}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>21.0</version>
</dependency>
<dependency>
<!-- CQ 6577 -->
<groupId>javax.xml.bind</groupId>
Expand Down Expand Up @@ -172,6 +197,43 @@
</dependencies>
</dependencyManagement>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<source>8</source>
<additionalOptions>-Xdoclint:none</additionalOptions>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>

<repositories>
<repository>
<id>lyo-releases</id>
Expand Down
50 changes: 0 additions & 50 deletions oslc4j-core/pom.xml
View file
Expand Up @@ -13,11 +13,6 @@

<properties>
<powermock.version>1.4.9</powermock.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<lyo.version>${project.parent.version}</lyo.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -73,46 +68,13 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<wtpversion>2.0</wtpversion>
</configuration>
<version>2.8</version>
</plugin>

<!-- Source Jar Plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Javadoc Plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -121,16 +83,4 @@
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>repo.eclipse.org</id>
<name>Eclipse Lyo Releases</name>
<url>https://repo.eclipse.org/content/repositories/lyo-releases/</url>
</repository>
<snapshotRepository>
<id>repo.eclipse.org</id>
<name>Eclipse Lyo Snapshots</name>
<url>https://repo.eclipse.org/content/repositories/lyo-snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project>

0 comments on commit c4708ca

Please sign in to comment.