Skip to content

Commit

Permalink
[irods#131] Cleaned up whitespace in POM files.
Browse files Browse the repository at this point in the history
  • Loading branch information
korydraughn committed Jan 26, 2022
1 parent bd80a7c commit 5e8cdf9
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 11 deletions.
30 changes: 25 additions & 5 deletions irods-vfs-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,18 @@

<modelVersion>4.0.0</modelVersion>
<artifactId>nfsrods</artifactId>

<parent>
<groupId>org.irods.jargon</groupId>
<artifactId>nfs4j-irodsvfs-pom</artifactId>
<version>2.0.4</version>
</parent>

<packaging>jar</packaging>
<name>nfsrods</name>
<version>2.0.4</version>
<description>iRODS VFS implementation for NFS4J</description>

<properties>
<maven.compiler.release>17</maven.compiler.release>
</properties>
Expand Down Expand Up @@ -48,22 +50,27 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>

<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>

<exclusion>
<groupId>org.slf4</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>

<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>

<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>

<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
Expand All @@ -79,22 +86,27 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>

<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>

<exclusion>
<groupId>org.slf4</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>

<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>

<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>

<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
Expand Down Expand Up @@ -204,25 +216,28 @@
<debug>true</debug>
</configuration>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>

<configuration>
<archive>
<manifest>
<mainClass>org.irods.nfsrods.vfs.ServerMain</mainClass>
</manifest>

<manifestEntries>
<!--
This flag is required for JAR files that contain multiple,
java-specific versions of a class (e.g. slf4j-api-impl).
-->
<!-- This flag is required for JAR files that contain multiple, java-specific
versions of a class (e.g. slf4j-api-impl). -->
<Multi-Release>true</Multi-Release>
</manifestEntries>
</archive>

<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>

<executions>
<execution>
<id>make-assembly</id> <!-- this is used for inheritance merges -->
Expand All @@ -233,10 +248,12 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>4.0.0</version>

<executions>
<execution>
<id>get-the-git-infos</id>
Expand All @@ -246,13 +263,16 @@
<phase>initialize</phase>
</execution>
</executions>

<configuration>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>

<includeOnlyProperties>
<includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
<includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
</includeOnlyProperties>

<commitIdGenerationMode>full</commitIdGenerationMode>
</configuration>
</plugin>
Expand Down
26 changes: 20 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<groupId>org.irods.jargon</groupId>
<artifactId>nfs4j-irodsvfs-pom</artifactId>
Expand All @@ -11,16 +12,20 @@
<artifactId>jargon-pom</artifactId>
<version>4.3.2.3-SNAPSHOT</version>
</parent>

<packaging>pom</packaging>
<name>nfs4j-irodsvfs</name>
<description>iRODS NFS4J Virtual File System</description>

<properties>
<jargon.version>4.3.2.3-SNAPSHOT</jargon.version>
</properties>

<organization>
<name>iRODS Consortium</name>
<url>https://irods.org</url>
</organization>

<repositories>
<repository>
<id>dice.repository</id>
Expand Down Expand Up @@ -54,13 +59,14 @@
<url>https://download.dcache.org/nexus/content/repositories/releases</url>
<layout>default</layout>
</repository>
<repository>
<id>oracleReleases</id>
<name>Oracle Released Java Packages</name>
<url>https://download.oracle.com/maven</url>
<layout>default</layout>
</repository>
<repository>
<id>oracleReleases</id>
<name>Oracle Released Java Packages</name>
<url>https://download.oracle.com/maven</url>
<layout>default</layout>
</repository>
</repositories>

<developers>
<developer>
<id>korydraughn</id>
Expand All @@ -73,42 +79,50 @@
</roles>
</developer>
</developers>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.dcache</groupId>
<artifactId>nfs4j-core</artifactId>
<version>0.19.0</version>
</dependency>

<dependency>
<groupId>org.irods.jargon</groupId>
<artifactId>jargon-core</artifactId>
<version>${jargon.version}</version>
</dependency>

<dependency>
<groupId>org.irods.jargon</groupId>
<artifactId>jargon-pool</artifactId>
<version>${jargon.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.10.19</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins />
</build>

<modules>
<module>irods-vfs-impl</module>
</modules>

</project>

0 comments on commit 5e8cdf9

Please sign in to comment.