init: renew package

davidkhala · Mar 22, 2024 · 73e28df · 73e28df
1 parent eb3f4b4
commit 73e28df
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 36 deletions.
diff --git a/.github/workflows/on-push.yaml b/.github/workflows/on-push.yaml
@@ -1,11 +1,14 @@
+name: test
 on: push
 jobs:
-    liberica:
-      runs-on: ubuntu-latest
-      steps:
-        - uses: actions/checkout@main
-        - uses: actions/setup-java@main
-          with:
-              java-version: '21'
-              distribution: 'liberica'
-
+  liberica:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - uses: actions/setup-java@main
+        with:
+          java-version: '21'
+          distribution: 'liberica'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+      - run: ./gradlew build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,22 @@
+
+name: Publish package to GitHub Packages
+on:
+  workflow_dispatch:
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@main
+      - uses: actions/setup-java@main
+        with:
+          java-version: '21'
+          distribution: 'liberica'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+      - name: Publish package
+        run: ./gradlew publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.md b/README.md
@@ -2,10 +2,3 @@
 
 java utils 
 
-## jcenter publish
-
-
-`gradle bintrayUpload`
-
-## TODO
-- > Could not upload to 'https://api.bintray.com/content/davidkhala/java-common/org.davidkhala.common/0.0.0//java-common/unspecified/java-common-unspecified.jar': HTTP/1.1 409 Conflict [message:Unable to upload files: An artifact with the path 'java-common/unspecified/java-common-unspecified.jar' already exists]
diff --git a/build.gradle b/build.gradle
@@ -1,26 +1,29 @@
 plugins {
-    id "com.jfrog.bintray" version "1.8.4"
+    id 'java'
+    id 'maven-publish'
+    id 'java-library'
 }
-apply plugin: 'java'
-apply plugin: 'java-library'
-
 repositories {
     mavenCentral()
 }
-bintray {
-    user = 'davidkhala'
-    key = 'e3e886f0da913585a9bb8450a83998da2a4c87a4'
-    configurations = ['archives']
-    pkg {
-        repo = 'java-common'
-        name = 'org.davidkhala.common'
-        licenses = ['Apache-2.0']
-        vcsUrl = 'https://github.com/davidkhala/java-common.git'
-        version {
-            name = '0.0.0'
+
+publishing {
+    publications {
+        github(MavenPublication) {
+            group 'davidkhala'
+            version "0.0.0"
+        }
+    }
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = "https://maven.pkg.github.com/davidkhala/java-common"
+            credentials {
+                username = 'davidkhala'
+                password = System.getenv("GITHUB_TOKEN")
+            }
         }
     }
-
 }
 
 dependencies {
@@ -40,3 +43,4 @@ dependencies {
     implementation('org.jetbrains.kotlin:kotlin-scripting-jvm-host:latest.integration')
 
 }
+
diff --git a/src/main/java/org/davidkhala/common/Reflection.java b/src/main/java/org/davidkhala/common/Reflection.java
@@ -40,7 +40,7 @@ public Reflection asSuperClass(Class clazz){
     }
 
     public static boolean isWrapperType(Class<?> clazz) {
-        return WRAPPER_TYPES.keySet().contains(clazz);
+        return WRAPPER_TYPES.containsKey(clazz);
     }
 
     public Object method(String methodName, Object... args) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {

diff --git a/src/main/java/org/davidkhala/common/secure/X509CertTool.java b/src/main/java/org/davidkhala/common/secure/X509CertTool.java
@@ -28,7 +28,7 @@ public class X509CertTool {
 	public static String extractSubjectCN(X509Certificate certificate) {
 		String identity = null;
 
-		String name = certificate.getSubjectDN().getName();
+		String name = certificate.getSubjectX500Principal().getName();
 		Pattern pattern = Pattern.compile(CN_REGEX);
 		Matcher matcher = pattern.matcher(name);
 		if (matcher.find()) {
@@ -43,7 +43,7 @@ public static String extractSubjectCN(X509Certificate certificate) {
 	public static String extractIssuerCN(X509Certificate certificate) {
 		String identity = null;
 
-		String name = certificate.getIssuerDN().getName();
+		String name = certificate.getIssuerX500Principal().getName();
 		Pattern pattern = Pattern.compile(CN_REGEX);
 		Matcher matcher = pattern.matcher(name);
 		if (matcher.find()) {
@@ -62,7 +62,7 @@ public static String extractIssuerCN(X509Certificate certificate) {
 	public static class CsrHelper {
 
 
-		public static PKCS10CertificationRequest generateCSR(KeyPair keyPair, String cn) throws IOException, NoSuchAlgorithmException, OperatorCreationException {
+		public static PKCS10CertificationRequest generateCSR(KeyPair keyPair, String cn) throws IOException, OperatorCreationException {
 
 			return CSRTool.generateCSR(keyPair, getX500Principal(cn));
 		}