From b873396d21ef9e6e49ab3779316b563832876b0b Mon Sep 17 00:00:00 2001
From: Luc Maisonobe <luc@orekit.org>
Date: Tue, 20 May 2014 15:04:05 +0200
Subject: [PATCH] Updated maven plugins versions.
---
design/dem-loading-class-diagram.puml | 16 +-
pom.xml | 290 +++++++++++++++-----------
2 files changed, 181 insertions(+), 125 deletions(-)
diff --git a/design/dem-loading-class-diagram.puml b/design/dem-loading-class-diagram.puml
index abfecd1e..99d16887 100644
--- a/design/dem-loading-class-diagram.puml
+++ b/design/dem-loading-class-diagram.puml
@@ -25,9 +25,9 @@
skinparam NoteFontColor #691616
skinparam ClassFontSize 11
- package fr.cs.rugged #ECEBD8
+ package fr.cs.rugged #ECEBD8 {
- package api #DDEBD8
+ package api #DDEBD8 {
interface UpdatableTile {
+setGeometry(φ₀, λ₀, δφ, δλ, rows, columns)
+setElevation(i, j, h)
@@ -36,9 +36,9 @@
+updateTile(φ, λ, UpdatableTile)
}
UpdatableTile <-- TileUpdater : updates
- end package
+ }
- package raster #DDEBD8
+ package raster #DDEBD8 {
interface Tile
class SpecializedTile
interface "TileFactory<T extends Tile>" as TileFactory_T_ {
@@ -53,12 +53,12 @@
TileUpdater "1" <--o "1" TilesCache_T_ : triggers
TileFactory_T_ "1" <--o "1" TilesCache_T_ : triggers
TileFactory_T_ --> SpecializedTile : creates
- end package
+ }
- end package
+ }
- package specific.interface #ECEBD8
+ package specific.interface #ECEBD8 {
TileUpdater <|-- MissionSpecificDEM
- end package
+ }
@enduml
diff --git a/pom.xml b/pom.xml
index 76b4572f..d8b6c54f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<groupId>org.orekit</groupId>
<artifactId>rugged</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Rugged Core</name>
<inceptionYear>2014</inceptionYear>
@@ -14,6 +14,33 @@
contribution to line of sight computation
</description>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ <rugged.maven-compiler-plugin.version>3.1</rugged.maven-compiler-plugin.version>
+ <rugged.maven-jar-plugin.version>2.4</rugged.maven-jar-plugin.version>
+ <rugged.maven-assembly-plugin.version>2.4</rugged.maven-assembly-plugin.version>
+ <rugged.maven-bundle-plugin.version>2.4.0</rugged.maven-bundle-plugin.version>
+ <rugged.maven-resources-plugin.version>2.6</rugged.maven-resources-plugin.version>
+ <rugged.maven-clean-plugin.version>2.5</rugged.maven-clean-plugin.version>
+ <rugged.jacoco-maven-plugin.version>0.7.1.201405082137</rugged.jacoco-maven-plugin.version>
+ <rugged.maven-plantuml-plugin.version>7940</rugged.maven-plantuml-plugin.version>
+ <rugged.plantuml.version>7999</rugged.plantuml.version>
+ <rugged.maven-site-plugin.version>3.3</rugged.maven-site-plugin.version>
+ <rugged.findbugs-maven-plugin.version>2.5.3</rugged.findbugs-maven-plugin.version>
+ <rugged.maven-surefire-plugin.version>2.17</rugged.maven-surefire-plugin.version>
+ <rugged.maven-surefire-report-plugin.version>2.17</rugged.maven-surefire-report-plugin.version>
+ <rugged.maven-checkstyle-plugin.version>2.12.1</rugged.maven-checkstyle-plugin.version>
+ <rugged.maven-changes-plugin.version>2.10</rugged.maven-changes-plugin.version>
+ <rugged.maven-jxr-plugin.version>2.4</rugged.maven-jxr-plugin.version>
+ <rugged.maven-javadoc-plugin.version>2.9.1</rugged.maven-javadoc-plugin.version>
+ <rugged.maven-source-plugin.version>2.2.1</rugged.maven-source-plugin.version>
+
+ <rugged.maven-project-info-reports-plugin.version>2.7</rugged.maven-project-info-reports-plugin.version>
+ </properties>
+
<developers>
<developer>
<name>Luc Maisonobe</name>
@@ -66,17 +93,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <encoding>UTF-8</encoding>
- </configuration>
+ <version>${rugged.maven-compiler-plugin.version}</version>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>${rugged.maven-jar-plugin.version}</version>
<configuration>
<archive>
<manifest>
@@ -86,96 +108,128 @@
</archive>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/source-assembly.xml</descriptor>
- <descriptor>src/main/assembly/binary-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.6.3.201306030806</version>
- <executions>
- <execution>
- <id>prepare-agent</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>report</id>
- <phase>site</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- <execution>
- <id>check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <rules>
- <rule>
- <element>BUNDLE</element>
- <limits>
- <limit>
- <counter>CLASS</counter>
- <value>COVEREDRATIO</value>
- <minimum>1.00</minimum>
- </limit>
- <limit>
- <counter>INSTRUCTION</counter>
- <value>COVEREDRATIO</value>
- <minimum>0.90</minimum>
- </limit>
- <limit>
- <counter>METHOD</counter>
- <value>COVEREDRATIO</value>
- <minimum>0.95</minimum>
- </limit>
- <limit>
- <counter>BRANCH</counter>
- <value>COVEREDRATIO</value>
- <minimum>0.85</minimum>
- </limit>
- <limit>
- <counter>COMPLEXITY</counter>
- <value>COVEREDRATIO</value>
- <minimum>0.85</minimum>
- </limit>
- <limit>
- <counter>LINE</counter>
- <value>COVEREDRATIO</value>
- <minimum>0.90</minimum>
- </limit>
- </limits>
- </rule>
- </rules>
- <haltOnFailure>false</haltOnFailure>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.github.jeluard</groupId>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${rugged.maven-assembly-plugin.version}</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/source-assembly.xml</descriptor>
+ <descriptor>src/main/assembly/binary-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${rugged.maven-bundle-plugin.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>org.orekit.rugged.api.*;version=${project.version};-noimport:=true</Export-Package>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${rugged.maven-resources-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>${rugged.maven-clean-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${rugged.jacoco-maven-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>prepare-agent</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>site</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>check</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <rule>
+ <element>BUNDLE</element>
+ <limits>
+ <limit>
+ <counter>CLASS</counter>
+ <value>COVEREDRATIO</value>
+ <minimum>1.00</minimum>
+ </limit>
+ <limit>
+ <counter>INSTRUCTION</counter>
+ <value>COVEREDRATIO</value>
+ <minimum>0.90</minimum>
+ </limit>
+ <limit>
+ <counter>METHOD</counter>
+ <value>COVEREDRATIO</value>
+ <minimum>0.95</minimum>
+ </limit>
+ <limit>
+ <counter>BRANCH</counter>
+ <value>COVEREDRATIO</value>
+ <minimum>0.85</minimum>
+ </limit>
+ <limit>
+ <counter>COMPLEXITY</counter>
+ <value>COVEREDRATIO</value>
+ <minimum>0.85</minimum>
+ </limit>
+ <limit>
+ <counter>LINE</counter>
+ <value>COVEREDRATIO</value>
+ <minimum>0.90</minimum>
+ </limit>
+ </limits>
+ </rule>
+ </rules>
+ <haltOnFailure>false</haltOnFailure>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.github.jeluard</groupId>
<artifactId>maven-plantuml-plugin</artifactId>
- <version>7940</version>
+ <version>${rugged.maven-plantuml-plugin.version}</version>
<configuration>
<sourceFiles>
<directory>${basedir}</directory>
@@ -201,7 +255,7 @@
<dependency>
<groupId>net.sourceforge.plantuml</groupId>
<artifactId>plantuml</artifactId>
- <version>7986</version>
+ <version>${rugged.plantuml.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -213,21 +267,22 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
- <configuration>
- <inputEncoding>UTF-8</inputEncoding>
- <outputEncoding>UTF-8</outputEncoding>
- </configuration>
+ <version>${rugged.maven-site-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${rugged.maven-project-info-reports-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.6.3.201306030806</version>
+ <version>${rugged.jacoco-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.3</version>
+ <version>${rugged.findbugs-maven-plugin.version}</version>
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
@@ -237,14 +292,18 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
+ <version>${rugged.maven-surefire-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${rugged.maven-surefire-report-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.11</version>
+ <version>${rugged.maven-checkstyle-plugin.version}</version>
<configuration>
- <encoding>UTF-8</encoding>
<configLocation>${basedir}/checkstyle.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary>
<headerLocation>${basedir}/license-header.txt</headerLocation>
@@ -260,7 +319,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.9</version>
+ <version>${rugged.maven-changes-plugin.version}</version>
<configuration>
<xmlPath>${basedir}/src/site/xdoc/changes.xml</xmlPath>
</configuration>
@@ -275,16 +334,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.3</version>
+ <version>${rugged.maven-jxr-plugin.version}</version>
<configuration>
- <outputEncoding>UTF-8</outputEncoding>
<linkJavadoc>false</linkJavadoc>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>${rugged.maven-javadoc-plugin.version}</version>
<configuration>
<overview>${basedir}/src/main/java/org/orekit/rugged/overview.html</overview>
<links>
@@ -292,9 +350,7 @@
<link>http://commons.apache.org/math/apidocs/</link>
<link>https://www.orekit.org/static/apidocs/index.html</link>
</links>
- <charset>UTF-8</charset>
- <docencoding>UTF-8</docencoding>
- <encoding>UTF-8</encoding>
+ <charset>${project.reporting.outputEncoding}</charset>
</configuration>
<reportSets>
<reportSet>
@@ -315,7 +371,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>${rugged.maven-source-plugin.version}</version>
<executions>
<execution>
<id>create-source-jar</id>
--
GitLab