66: Replace Bintray/JCenter in Library build settings

Task-Url: #66
unitsofmeasurement · Feb 20, 2021 · 3b62665 · 3b62665
1 parent 29fd11e
commit 3b62665
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 14 deletions.
diff --git a/assertj/pom.xml b/assertj/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>tech.uom.lib</groupId>
         <artifactId>uom-lib</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.1</version>
     </parent>
     <artifactId>uom-lib-assertj</artifactId>
     <name>Units of Measurement AssertJ Library</name>
@@ -19,6 +19,10 @@
             <url>LICENSE</url>
         </license>
     </licenses>
+    <properties>
+        <jsr.version>2.1.1</jsr.version>
+        <maven.surefire.version>3.0.0-M5</maven.surefire.version>
+    </properties>
     <developers>
         <developer>
             <id>keilw</id>
@@ -34,12 +38,22 @@
             <timezone>+1</timezone>
         </developer>
     </developers>
+
+    <dependencyManagement>
+        <dependencies>
+                <dependency>
+                <groupId>org.junit.platform</groupId>
+                <artifactId>junit-platform-commons</artifactId>
+                <version>${junit.platform.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.12.0</version>
+            <version>3.19.0</version>
         </dependency>
         <dependency>
             <groupId>javax.measure</groupId>
@@ -60,9 +74,8 @@
             <artifactId>jakarta.annotation-api</artifactId>
             <version>1.3.5</version>
             <scope>compile</scope>
-        </dependency>
-
-        	<dependency>
+        </dependency>        
+        <dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-junit</artifactId>
 			<scope>test</scope>
@@ -82,19 +95,31 @@
 			<artifactId>junit-jupiter-engine</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>org.junit.platform</groupId>
 			<artifactId>junit-platform-launcher</artifactId>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.platform</groupId>
 			<artifactId>junit-platform-runner</artifactId>
-			<scope>test</scope>
 		</dependency>
     </dependencies>
 
     <build>
+        <pluginManagement>
+	        <plugins>
+	            <plugin>
+	                <groupId>org.apache.maven.plugins</groupId>
+	                <artifactId>maven-surefire-plugin</artifactId>
+	                <version>${maven.surefire.version}</version>
+	            </plugin>
+	        </plugins>
+        </pluginManagement>
+
         <plugins>
             <!-- ======================================================= -->
             <!-- Source Attachment -->
@@ -185,4 +210,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>
diff --git a/assertj/src/main/jdk9/module-info.java b/assertj/src/main/jdk9/module-info.java
@@ -0,0 +1,39 @@
+/*
+ * Units of Measurement Common Library for Java
+ * Copyright (c) 2005-2021, Werner Keil and others.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions
+ *    and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of JSR-385, Indriya nor the names of their contributors may be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+module tech.uom.lib.assertj {
+    requires transitive java.measure;
+    requires tech.uom.lib.common;
+    requires java.annotation;
+    requires org.assertj.core;
+    requires org.junit.platform.commons;
+
+    exports tech.uom.lib.assertj;
+    exports tech.uom.lib.assertj.assertions;
+}
diff --git a/common/pom.xml b/common/pom.xml
@@ -10,11 +10,10 @@
 	</organization>
 	<description>Units Common Library</description>
 	<name>Units of Measurement Common Library for Java</name>
-	<version>2.1.1-SNAPSHOT</version>
 	<parent>
 		<groupId>tech.uom.lib</groupId>
 		<artifactId>uom-lib</artifactId>
-		<version>2.1</version>
+		<version>2.1.1-SNAPSHOT</version>
 	</parent>
 
 	<scm>

diff --git a/jackson/pom.xml b/jackson/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>tech.uom.lib</groupId>
         <artifactId>uom-lib</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.1</version>
     </parent>
     <artifactId>uom-lib-jackson</artifactId>
     <name>Units of Measurement Jackson Library</name>
@@ -219,4 +219,5 @@
             </plugins>
         </pluginManagement>
     </build>
+    <version>2.1-SNAPSHOT</version>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -7,9 +7,9 @@
 	<parent>
 		<groupId>tech.uom</groupId>
 		<artifactId>uom-parent</artifactId>
-		<version>2.1</version>
+		<version>2.1.1</version>
 	</parent>
-	<version>2.1-SNAPSHOT</version>
+	<version>2.1.1-SNAPSHOT</version>
 	<modules>
 		<module>common</module>
 		<module>assertj</module> 
@@ -50,6 +50,7 @@
 
 		<hamcrest.version>2.0.0.0</hamcrest.version>
 		<junit.platform.version>1.7.0</junit.platform.version>
+		<maven.surefire.version>3.0.0-M5</maven.surefire.version>
 	</properties>
 
 	<dependencyManagement>

diff --git a/yasson/pom.xml b/yasson/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>tech.uom.lib</groupId>
         <artifactId>uom-lib</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.1</version>
     </parent>
     <artifactId>uom-lib-yasson</artifactId>
     <name>Units of Measurement Jakarta JSON-B Library</name>
@@ -212,4 +212,5 @@
             </plugins>
         </pluginManagement>
     </build>
+    <version>2.1-SNAPSHOT</version>
 </project>