Merge pull request #18 from ebocher/central

Fix maven central portal

Author: ebocher

.github/workflows/CI release.yml

@@ -31,7 +31,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '11'
-          server-id: ossrh
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
           gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}

.github/workflows/CI snapshot.yml

@@ -34,7 +34,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '11'
-          server-id: ossrh
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
           gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}

docs/CHANGELOG.md

@@ -1,3 +1,4 @@
 ## Changelog for v0.7.1
 
 - Fix github actions
+- Update to central portal

pom.xml

@@ -53,18 +53,18 @@
     <!-- Dependencies -->
     <repositories>
         <repository>
-            <id>oss-sonatype</id>
-            <name>oss-sonatype-snapshot</name>
-            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-        </repository>
-        <repository>
-            <id>orbisgis-release</id>
-            <name>oss-sonatype-release</name>
-            <url>https://oss.sonatype.org/content/repositories/releases/</url>
+            <name>Central Portal Snapshots</name>
+            <id>central-portal-snapshots</id>
+            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
         </repository>
     </repositories>
 
-
     <!-- Properties -->
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -74,20 +74,20 @@
         <maven.compiler.source>${java-version}</maven.compiler.source>
 
         <!-- Dependencies versions -->
-        <junit-version>5.8.2</junit-version>
-        <slf4j-version>2.0.10</slf4j-version>
+        <junit-version>5.9.2</junit-version>
+        <slf4j-version>2.0.16</slf4j-version>
 
         <!-- Plugins versions -->
         <exec-maven-version>3.0.0</exec-maven-version>
-        <maven-assembly-version>3.3.0</maven-assembly-version>
+        <maven-assembly-version>3.6.0</maven-assembly-version>
         <maven-bundle-version>5.1.2</maven-bundle-version>
-        <maven-enforcer-version>3.0.0</maven-enforcer-version>
-        <maven-gpg-plugin-version>3.0.1</maven-gpg-plugin-version>
-        <maven-jar-version>3.2.0</maven-jar-version>
+        <maven-enforcer-version>3.4.1</maven-enforcer-version>
+        <maven-gpg-plugin-version>3.1.0</maven-gpg-plugin-version>
+        <maven-jar-version>3.3.0</maven-jar-version>
         <maven-javadoc-version>3.3.1</maven-javadoc-version>
-        <maven-release-version>3.0.0-M4</maven-release-version>
-        <maven-surefire-version>3.0.0-M5</maven-surefire-version>
-        <version-maven-version>2.8.1</version-maven-version>
+        <maven-release-version>3.0.1</maven-release-version>
+        <maven-surefire-version>3.2.2</maven-surefire-version>
+        <version-maven-version>2.16.0</version-maven-version>
     </properties>
 
     <dependencies>
@@ -281,12 +281,12 @@
 
     <distributionManagement>
         <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <id>central</id>
+            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
         </snapshotRepository>
         <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+            <id>central</id>
+            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
     </distributionManagement>
 

src/main/java/org/poly2tri/triangulation/Triangulatable.java

@@ -8,7 +8,7 @@ public interface Triangulatable {
     /**
      * Preparations needed before triangulation start should be handled here
      *
-     * @param tcx
+     * @param tcx {@link TriangulationContext}
      */
     public void prepareTriangulation(TriangulationContext<?> tcx);
 

src/main/java/org/poly2tri/triangulation/TriangulationUtil.java

@@ -134,11 +134,10 @@ public static boolean smartIncircle(final TriangulationPoint pa,
     }
 
     /**
-     * @param pa
-     * @param pb
-     * @param pc
-     * @param pd
-     * @return
+     * @param pa {@link TriangulationPoint}
+     * @param pb {@link TriangulationPoint}
+     * @param pc {@link TriangulationPoint}
+     * @param pd {@link TriangulationPoint}
      * @see #smartIncircle(TriangulationPoint, TriangulationPoint, TriangulationPoint, TriangulationPoint)
      */
     public static boolean inScanArea(final TriangulationPoint pa,

src/main/java/org/poly2tri/triangulation/delaunay/DelaunayTriangle.java

@@ -179,7 +179,6 @@ public void clear() {
     /**
      * @param t - opposite triangle
      * @param p - the point in t that isn't shared between the triangles
-     * @return
      */
     public TriangulationPoint oppositePoint(DelaunayTriangle t, TriangulationPoint p) {
         assert t != this : "self-pointer error";

src/main/java/org/poly2tri/triangulation/delaunay/sweep/AdvancingFront.java

@@ -77,7 +77,6 @@ private final AdvancingFrontNode findSearchNode(double x) {
      * We use a balancing tree to locate a node smaller or equal to
      * given key value
      *
-     * @return
      */
     public AdvancingFrontNode locateNode(TriangulationPoint point) {
         return locateNode(point.getX());
@@ -107,8 +106,7 @@ private AdvancingFrontNode locateNode(double x) {
      * This implementation will use simple node traversal algorithm to find
      * a point on the front
      *
-     * @param point
-     * @return
+     * @param point {@link TriangulationPoint}
      */
     public AdvancingFrontNode locatePoint(final TriangulationPoint point) {
         final double px = point.getX();

src/main/java/org/poly2tri/triangulation/delaunay/sweep/DTSweep.java

@@ -30,6 +30,7 @@
  */
 package org.poly2tri.triangulation.delaunay.sweep;
 
+import org.poly2tri.triangulation.TriangulationContext;
 import org.poly2tri.triangulation.TriangulationMode;
 import org.poly2tri.triangulation.TriangulationPoint;
 import org.poly2tri.triangulation.TriangulationUtil.*;
@@ -78,7 +79,7 @@ public static void triangulate(DTSweepContext tcx) {
     /**
      * Start sweeping the Y-sorted point set from bottom to top
      *
-     * @param tcx
+     * @param tcx {@link TriangulationContext}
      */
     private static void sweep(DTSweepContext tcx) {
         TriangulationPoint point;
@@ -104,7 +105,7 @@ private static void sweep(DTSweepContext tcx) {
      * If this is a Delaunay Triangulation of a pointset we need to
      * fill so the triangle mesh gets a ConvexHull
      *
-     * @param tcx
+     * @param tcx {@link TriangulationContext}
      */
     private static void finalizationConvexHull(DTSweepContext tcx) {
         AdvancingFrontNode n1, n2;
@@ -214,7 +215,7 @@ private static void turnAdvancingFrontConvex(DTSweepContext tcx,
 
     /**
      * Create the triangles as polygons
-     * @param tcx
+     * @param tcx {@link TriangulationContext}
      */
     private static void finalizationPolygon(DTSweepContext tcx) {
         // Get an Internal triangle to start with
@@ -233,9 +234,8 @@ private static void finalizationPolygon(DTSweepContext tcx) {
      * create a new triangle. If needed new holes and basins
      * will be filled to.
      *
-     * @param tcx
-     * @param point
-     * @return
+     * @param tcx {@link TriangulationContext}
+     * @param point a point
      */
     private static AdvancingFrontNode pointEvent(DTSweepContext tcx,
                                                  TriangulationPoint point) {
@@ -261,10 +261,9 @@ private static AdvancingFrontNode pointEvent(DTSweepContext tcx,
     /**
      * Creates a new front triangle and legalize it
      *
-     * @param tcx
-     * @param point
-     * @param node
-     * @return
+     * @param tcx {@link TriangulationContext}
+     * @param point a point
+     * @param node a node in the triangulation
      */
     private static AdvancingFrontNode newFrontTriangle(DTSweepContext tcx,
                                                        TriangulationPoint point,
@@ -296,9 +295,9 @@ private static AdvancingFrontNode newFrontTriangle(DTSweepContext tcx,
     }
 
     /**
-     * @param tcx
-     * @param edge
-     * @param node
+     * @param tcx {@link TriangulationContext}
+     * @param edge a segment
+     * @param node a node in the triangulation
      */
     private static void edgeEvent(DTSweepContext tcx,
                                   DTSweepConstraint edge,
@@ -624,11 +623,10 @@ private static void flipEdgeEvent(DTSweepContext tcx,
      * the point in current triangle that is the opposite point to the next
      * triangle.
      *
-     * @param ep
-     * @param eq
-     * @param ot
-     * @param op
-     * @return
+     * @param ep {@link TriangulationPoint}
+     * @param eq {@link TriangulationPoint}
+     * @param ot {@link DelaunayTriangle}
+     * @param op {@link TriangulationPoint}
      */
     private static TriangulationPoint nextFlipPoint(TriangulationPoint ep,
                                                     TriangulationPoint eq,
@@ -651,7 +649,7 @@ private static TriangulationPoint nextFlipPoint(TriangulationPoint ep,
      * After a flip we have two triangles and know that only one will still be
      * intersecting the edge. So decide which to contiune with and legalize the other
      *
-     * @param tcx
+     * @param tcx {@link TriangulationContext}
      * @param o   - should be the result of an orient2d( eq, op, ep )
      * @param t   - triangle 1
      * @param ot  - triangle 2
@@ -688,12 +686,12 @@ private static DelaunayTriangle nextFlipTriangle(DTSweepContext tcx,
      * point that is inside the flip triangle scan area. When found
      * we generate a new flipEdgeEvent
      *
-     * @param tcx
+     * @param tcx {@link TriangulationContext}
      * @param ep           - last point on the edge we are traversing
      * @param eq           - first point on the edge we are traversing
      * @param flipTriangle - the current triangle sharing the point eq with edge
-     * @param t
-     * @param p
+     * @param t a triangle
+     * @param p a point
      */
     private static void flipScanEdgeEvent(DTSweepContext tcx,
                                           TriangulationPoint ep,
@@ -743,8 +741,8 @@ private static void flipScanEdgeEvent(DTSweepContext tcx,
     /**
      * Fills holes in the Advancing Front
      *
-     * @param tcx
-     * @param n
+     * @param tcx {@link TriangulationContext}
+     * @param n a node in the triangulation
      */
     private static void fillAdvancingFront(DTSweepContext tcx, AdvancingFrontNode n) {
         AdvancingFrontNode node;
@@ -857,7 +855,7 @@ private static boolean isLargeHole(AdvancingFrontNode node) {
      * First we decide a left,bottom and right node that forms the
      * boundaries of the basin. Then we do a reqursive fill.
      *
-     * @param tcx
+     * @param tcx {@link TriangulationContext}
      * @param node - starting node, this or next node will be left node
      */
     private static void fillBasin(DTSweepContext tcx, AdvancingFrontNode node) {
@@ -897,9 +895,8 @@ private static void fillBasin(DTSweepContext tcx, AdvancingFrontNode node) {
     /**
      * Recursive algorithm to fill a Basin with triangles
      *
-     * @param tcx
+     * @param tcx {@link TriangulationContext}
      * @param node - bottomNode
-     * @param cnt  - counter used to alternate on even and odd numbers
      */
     private static void fillBasinReq(DTSweepContext tcx, AdvancingFrontNode node) {
         // if shallow stop filling
@@ -982,7 +979,7 @@ private static double basinAngle(AdvancingFrontNode node) {
     /**
      * Adds a triangle to the advancing front to fill a hole.
      *
-     * @param tcx
+     * @param tcx {@link TriangulationContext}
      * @param node - middle node, that is the bottom of the hole
      */
     private static void fill(DTSweepContext tcx, AdvancingFrontNode node) {

src/main/java/org/poly2tri/triangulation/sets/ConstrainedPointSet.java

@@ -106,7 +106,6 @@ public void prepareTriangulation(TriangulationContext tcx) {
      * 1. Check's if there any constraint edges are crossing or collinear<br>
      * 2.
      *
-     * @return
      */
     public boolean isValid() {
         return true;