Update packaging name to better match Maven Central

Author: AndrewQuijano

.github/workflows/build-gradle-project.yml

@@ -33,6 +33,6 @@ jobs:
         run: sh gradlew test jacocoTestReport -PcreateReports=true
 
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/publish_jar.yml

@@ -30,6 +30,7 @@ jobs:
 
   upload_release:
     needs: [ create_release ]
+    if: github.repository == 'adwise-fiu/homomorphic-path-comparison'
     runs-on: ubuntu-latest
     permissions:
       contents: write

build.gradle

@@ -26,7 +26,7 @@ java {
 
 dependencies {
     implementation 'junit:junit:4.13.2'
-    implementation 'io.github.andrewquijano:ciphercraft:1.0.6'
+    implementation 'io.github.andrewquijano:ciphercraft:1.0.7'
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
@@ -164,9 +164,17 @@ publishing {
                         id.set('AndrewQuijano')
                         name.set('Andrew Quijano')
                         email.set('[email protected]')
+                        roles.add('Lead Developer')
+                        organization.set('New York University')
+                        organizationUrl.set('https://www.nyu.edu')
                     }
                 }
 
+                organization {
+                    name.set('ADWISE Research Lab, Florida International University')
+                    url.set('https://adwise.fiu.edu/')
+                }
+
                 scm {
                     connection.set('scm:git:git://github.com/adwise-fiu/homomorphic-path-comparison.git')
                     developerConnection.set('scm:git:ssh://github.com:adwise-fiu/homomorphic-path-comparison.git')
@@ -175,20 +183,6 @@ publishing {
             }
         }
     }
-
-    repositories {
-        maven {
-            name = "Sonatype"
-            url = version.endsWith("SNAPSHOT") ?
-                    uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") :
-                    uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
-
-            credentials {
-                username = findProperty("ossrhUsername") ?: System.getenv("OSSRH_USERNAME")
-                password = findProperty("ossrhPassword") ?: System.getenv("OSSRH_PASSWORD")
-            }
-        }
-    }
 }
 
 // Update this file, ~/.gnupg/dirmngr.conf
@@ -198,7 +192,7 @@ signing {
     // Point to the key file on your machine, used for local testing
     def signingKeyFile = findProperty("signingKeyFile") ?: System.getenv("SIGNING_KEY_FILE")
     // gpg --armor --export-secret-keys YOUR_KEY_ID, export the key into a secret
-    def signingKey = findProperty("signingKey") ?: System.getenv("SIGNING_KEY") ?: ""
+    def signingKey = findProperty("signingKey") ?: System.getenv("SIGNING_KEY")
     // If no property or environment variable is found, it will be empty password
     def signingPassword = findProperty("signingPassword") ?: System.getenv("SIGNING_PASSWORD") ?: ""
 

src/main/java/edu/fiu/adwise/BobThread.java renamed to src/main/java/edu/fiu/adwise/drone_collision_avoidance/BobThread.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2024 ADWISE Lab, Florida International University (FIU), AndrewQuijano
  * Licensed under the MIT License. See LICENSE file in the project root for details.
  */
-package edu.fiu.adwise;
+package edu.fiu.adwise.drone_collision_avoidance;
 
 import java.io.IOException;
 import java.net.ServerSocket;

src/main/java/edu/fiu/adwise/CleartextPathsComparison.java renamed to src/main/java/edu/fiu/adwise/drone_collision_avoidance/CleartextPathsComparison.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2024 ADWISE Lab, Florida International University (FIU), AndrewQuijano
  * Licensed under the MIT License. See LICENSE file in the project root for details.
  */
-package edu.fiu.adwise;
+package edu.fiu.adwise.drone_collision_avoidance;
 
-import edu.fiu.adwise.structs.BigIntPoint;
+import edu.fiu.adwise.drone_collision_avoidance.structs.BigIntPoint;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

src/main/java/edu/fiu/adwise/EncryptedPathsComparison.java renamed to src/main/java/edu/fiu/adwise/drone_collision_avoidance/EncryptedPathsComparison.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2024 ADWISE Lab, Florida International University (FIU), AndrewQuijano
  * Licensed under the MIT License. See LICENSE file in the project root for details.
  */
-package edu.fiu.adwise;
+package edu.fiu.adwise.drone_collision_avoidance;
 
-import edu.fiu.adwise.structs.BigIntPoint;
+import edu.fiu.adwise.drone_collision_avoidance.structs.BigIntPoint;
 import edu.fiu.adwise.homomorphic_encryption.dgk.DGKOperations;
 import edu.fiu.adwise.homomorphic_encryption.misc.HomomorphicException;
 import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierCipher;

src/main/java/edu/fiu/adwise/SpeedTestingAlice.java renamed to src/main/java/edu/fiu/adwise/drone_collision_avoidance/SpeedTestingAlice.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2024 ADWISE Lab, Florida International University (FIU), AndrewQuijano
  * Licensed under the MIT License. See LICENSE file in the project root for details.
  */
-package edu.fiu.adwise;
+package edu.fiu.adwise.drone_collision_avoidance;
 
-import edu.fiu.adwise.structs.BigIntPoint;
+import edu.fiu.adwise.drone_collision_avoidance.structs.BigIntPoint;
 import org.apache.commons.io.serialization.ValidatingObjectInputStream;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/edu/fiu/adwise/SpeedTestingBob.java renamed to src/main/java/edu/fiu/adwise/drone_collision_avoidance/SpeedTestingBob.java

@@ -2,15 +2,15 @@
  * Copyright (c) 2024 ADWISE Lab, Florida International University (FIU), AndrewQuijano
  * Licensed under the MIT License. See LICENSE file in the project root for details.
  */
-package edu.fiu.adwise;
+package edu.fiu.adwise.drone_collision_avoidance;
 
 import java.io.*;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.security.KeyPair;
 import java.util.List;
 
-import edu.fiu.adwise.structs.BigIntPoint;
+import edu.fiu.adwise.drone_collision_avoidance.structs.BigIntPoint;
 import edu.fiu.adwise.homomorphic_encryption.dgk.DGKKeyPairGenerator;
 import edu.fiu.adwise.homomorphic_encryption.misc.HomomorphicException;
 import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierKeyPairGenerator;

src/main/java/edu/fiu/adwise/shared.java renamed to src/main/java/edu/fiu/adwise/drone_collision_avoidance/shared.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2024 ADWISE Lab, Florida International University (FIU), AndrewQuijano
  * Licensed under the MIT License. See LICENSE file in the project root for details.
  */
-package edu.fiu.adwise;
+package edu.fiu.adwise.drone_collision_avoidance;
 
-import edu.fiu.adwise.structs.BigIntPoint;
+import edu.fiu.adwise.drone_collision_avoidance.structs.BigIntPoint;
 import org.apache.commons.io.serialization.ValidatingObjectInputStream;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/edu/fiu/adwise/structs/BigIntPoint.java renamed to src/main/java/edu/fiu/adwise/drone_collision_avoidance/structs/BigIntPoint.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2024 ADWISE Lab, Florida International University (FIU), AndrewQuijano
  * Licensed under the MIT License. See LICENSE file in the project root for details.
  */
-package edu.fiu.adwise.structs;
+package edu.fiu.adwise.drone_collision_avoidance.structs;
 
 import java.io.Serializable;
 import java.math.BigInteger;