UNITSOFMEASUREMENT-183: getProductUnits should probably be renamed

Task-Url: https://java.net/jira/browse/UNITSOFMEASUREMENT-183

Author: keilw

pom.xml

@@ -67,9 +67,12 @@
 		<maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
 
 		<!-- Plugins -->
-		<felix.version>2.5.3</felix.version>
+		<felix.version>3.0.1</felix.version>
 		<github.maven.version>0.12</github.maven.version>
 		<github.global.server>github</github.global.server>
+		<maven.resources.version>3.0.1</maven.resources.version>
+		<maven.site.version>3.5.1</maven.site.version>
+		<maven.jar.version>3.0.2</maven.jar.version>
 	</properties>
 
 	<!-- Developers and Contributors -->
@@ -314,7 +317,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>3.5.1</version>
 				<configuration>
 					<source>${maven.compile.sourceLevel}</source>
 					<target>${maven.compile.targetLevel}</target>
@@ -326,7 +329,7 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.5.201505241946</version>
+				<version>0.7.7.201606060606</version>
 				<configuration>
 					<destfile>${basedir}/target/coverage-reports/jacoco-unit.exec</destfile>
 					<datafile>${basedir}/target/coverage-reports/jacoco-unit.exec</datafile>
@@ -373,7 +376,7 @@
 			<plugin>
 				<groupId>org.eluder.coveralls</groupId>
 				<artifactId>coveralls-maven-plugin</artifactId>
-				<version>4.1.0</version>
+				<version>4.2.0</version>
 				<configuration>
 					<repoToken>${env.COVERALLS_REPO_TOKEN}</repoToken>
 				</configuration>
@@ -383,7 +386,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.4</version>
+				<version>3.0.1</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -398,7 +401,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.2</version>
+				<version>2.10.4</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -423,7 +426,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.6</version>
+				<version>${maven.jar.version}</version>
 				<configuration>
 					<archive>
 						<manifest>
@@ -454,7 +457,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.6</version>
+				<version>${maven.resources.version}</version>
 				<configuration>
 					<encoding>${project.build.sourceEncoding}</encoding>
 				</configuration>
@@ -517,7 +520,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
-				<version>3.4</version>
+				<version>${maven.site.version}</version>
 				<configuration>
 					<locales>en</locales>
 					<inputEncoding>${project.build.sourceEncoding}</inputEncoding>

src/main/java/javax/measure/Unit.java

@@ -67,7 +67,7 @@
  * @author <a href="mailto:steve@unidata.ucar.edu">Steve Emmerson</a>
  * @author <a href="mailto:desruisseaux@users.sourceforge.net">Martin Desruisseaux</a>
  * @author <a href="mailto:units@catmedia.us">Werner Keil</a>
- * @version 0.21, April 3, 2016
+ * @version 0.22, June 28, 2016
  *
  * @see <a href="http://en.wikipedia.org/wiki/Units_of_measurement">Wikipedia: Units of measurement</a>
  */
@@ -133,11 +133,6 @@ public interface Unit<Q extends Quantity<Q>> {
    */
   Map<? extends Unit<?>, Integer> getBaseUnits();
 
-  /**
-   * @deprecated use #getBaseUnits instead
-   */
-  Map<? extends Unit<?>, Integer> getProductUnits();
-
   /**
    * Indicates if this unit is compatible with the unit specified. Units don't need to be equals to be compatible. For example (assuming {@code ONE}
    * is a dimensionless unit):

src/test/java/javax/measure/test/TestUnit.java

@@ -44,12 +44,8 @@
  * @author Werner Keil
  */
 public abstract class TestUnit<Q extends Quantity<Q>> implements Unit<Q> {
-
   public static final Unit<Dimensionless> ONE = new BaseUnit<Dimensionless>("one");
 
-  // public static final Unit<Mass> METRIC_MASS =
-  // QuantityFactory.getInstance(Mass.class).getMetricUnit();
-
   protected String symbol; // e.g. "A"
   protected final String name; // e.g. "Angstrom"
   protected double multFactor; // e.g. 1E-10
@@ -192,8 +188,4 @@ public double getMultFactor() {
   public String toString() {
     return getName();
   }
-
-  public Map getProductUnits() {
-    throw new UnsupportedOperationException("Use getBaseUnits() instead");
-  }
 }