Skip to content

Commit

Permalink
Merge pull request #58 from jfcjm/dcache_master_pom_versions
Browse files Browse the repository at this point in the history 
Define properties for plugin/dependency verrsions && describe maven-jar-plugin in toplevel pom.xml
  • Loading branch information
@kofemann
kofemann authored Nov 21, 2017
2 parents b7b1691 + e452d65 commit 2a6e29d
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 24 deletions.
8 changes: 5 additions & 3 deletions oncrpc4j-portmapdaemon/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@
</parent>

<artifactId>oncrpc4j-portmapdaemon</artifactId>

<properties>
<maven-shade-plugin>2.4.3</maven-shade-plugin>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<version>${maven-shade-plugin}</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -56,4 +58,4 @@
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>
1 change: 0 additions & 1 deletion oncrpc4j-rpcgen/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<archive>
<manifest>
Expand Down
9 changes: 6 additions & 3 deletions oncrpc4j-spring/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@

<name>Spring integarion for ONCRPC4J</name>
<url>http://www.dCache.ORG</url>


<properties>
<maven-assembly-plugin.version>2.3</maven-assembly-plugin.version>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
<version>${maven-assembly-plugin.version}</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -49,7 +53,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<archive>
<manifest>
Expand Down
71 changes: 54 additions & 17 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,38 @@
<module>oncrpc4j-rpcgen</module>
<module>oncrpc4j-portmapdaemon</module>
</modules>

<properties>
<!-- PROPERTIES FOR DEPENDENCIES
Each property is constructed from the artifact name
They are in alphabetical order for each subsection
-->

<!-- version of plugins in pluginManagement -->
<build-helper-maven-plugin.version>1.9.1</build-helper-maven-plugin.version>
<exec-maven-plugin.version>1.4.0</exec-maven-plugin.version>
<maven-pmd-plugin.version>3.0.1</maven-pmd-plugin.version>

<!-- version of other plugins-->
<animal-sniffer-maven-plugin>1.15</animal-sniffer-maven-plugin>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>2.4</maven-jar-plugin.version>
<maven-release-plugin>2.4.2</maven-release-plugin>

<!-- version of dependencies-->
<dcache-auth.version>0.0.11</dcache-auth.version>
<gmbal-api-only.version>3.2.0-b003</gmbal-api-only.version>
<grizzly-framework.version>2.3.24</grizzly-framework.version>
<guava.version>20.0</guava.version>
<slf4j-api.version>1.7.25</slf4j-api.version>
<spring-context.version>4.0.3.RELEASE</spring-context.version>

<!-- version of test dependencies -->
<junit.version>4.12</junit.version>
<mockito-core.version>2.10.0</mockito-core.version>
<logback-classic.version>1.2.3</logback-classic.version>
</properties>


<build>

Expand All @@ -50,26 +82,31 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.0.1</version>
<version>${maven-pmd-plugin}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<version>${exec-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.9.1</version>
<version>${build-helper-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -81,7 +118,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.15</version>
<version>${animal-sniffer-maven-plugin}</version>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
Expand All @@ -102,7 +139,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.4.2</version>
<version>${maven-release-plugin}</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
Expand All @@ -122,59 +159,59 @@
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-framework</artifactId>
<version>2.3.24</version>
<version>${grizzly-framework.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-framework-monitoring</artifactId>
<version>2.3.24</version>
<version>${grizzly-framework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.0.3.RELEASE</version>
<version>${spring-context.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.10.0</version>
<version>${mockito-core.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>20.0</version>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.dcache.common</groupId>
<artifactId>dcache-auth</artifactId>
<version>0.0.11</version>
<version>${dcache-auth.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.gmbal</groupId>
<artifactId>gmbal-api-only</artifactId>
<version>3.2.0-b003</version>
<version>${gmbal-api-only.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<version>${slf4j-api.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<version>${logback-classic.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.25</version>
<version>${slf4j-api.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down

0 comments on commit 2a6e29d

Please sign in to comment.