Put info into parent pom

Concordium · Feb 1, 2024 · 7522a80 · 7522a80
1 parent c6386e6
commit 7522a80
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 30 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -87,7 +87,7 @@ jobs:
           name: windows-library
           path: crypto-jni\target\release\crypto_jni.dll
 
-  build-aar-library:
+  build-native-android:
     runs-on: ubuntu-22.04
     steps:
     - name: Set Up Android tools
@@ -114,7 +114,7 @@ jobs:
         path: ./concordium-android-sdk/native
 
   build-and-release-jar:
-    needs: [build-native-ubuntu, build-native-macos, build-native-windows, build-aar-library]
+    needs: [build-native-ubuntu, build-native-macos, build-native-windows, build-native-android]
     # Use fixed OS version because we install packages on the system.
     runs-on: ubuntu-22.04
     environment: release

diff --git a/concordium-android-sdk/.gitignore b/concordium-android-sdk/.gitignore
@@ -3,4 +3,5 @@
 /target
 /native/*
 /delombok
-.flattened-pom.xml
+.flattened-pom.xml
+
diff --git a/concordium-android-sdk/pom.xml b/concordium-android-sdk/pom.xml
@@ -17,32 +17,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
-    
+
     <name>concordium-android-sdk</name>
     <description>An SDK for interacting with the Concordium blockchain packaged for Android</description>
-    <url>https://github.com/Concordium/concordium-java-sdk</url>
-
-    <licenses>
-        <license>
-            <name>The Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <name>Concordium Software</name>
-            <email>support@concordium.software</email>
-            <organization>Concordium Software</organization>
-            <organizationUrl>https://concordium.com</organizationUrl>
-        </developer>
-    </developers>
-
-    <scm>
-        <connection>scm:git:git://github.com:Concordium/concordium-java-sdk.git</connection>
-        <developerConnection>scm:git:ssh://github.com:Concordium/concordium-java-sdk.git</developerConnection>
-        <url>https://github.com/Concordium/concordium-java-sdk/tree/main</url>
-    </scm>
 
     <dependencies>
         <dependency>
@@ -330,4 +307,4 @@
             <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
     </distributionManagement>
-</project>
+</project>
diff --git a/concordium-sdk/pom.xml b/concordium-sdk/pom.xml
@@ -14,7 +14,7 @@
     <artifactId>concordium-sdk</artifactId>
 
     <name>concordium-sdk</name>
-    <url>https://github.com/Concordium/concordium-java-sdk</url>
+    <description>An SDK for interacting with the Concordium blockchain</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/pom.xml b/pom.xml
@@ -8,9 +8,33 @@
     <version>6.0.2</version>
     <packaging>pom</packaging>
 
+    <url>https://github.com/Concordium/concordium-java-sdk</url>
+
+    <licenses>
+        <license>
+            <name>The Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Concordium Software</name>
+            <email>support@concordium.software</email>
+            <organization>Concordium Software</organization>
+            <organizationUrl>https://concordium.com</organizationUrl>
+        </developer>
+    </developers>
+
+    <scm>
+        <connection>scm:git:git://github.com:Concordium/concordium-java-sdk.git</connection>
+        <developerConnection>scm:git:ssh://github.com:Concordium/concordium-java-sdk.git</developerConnection>
+        <url>https://github.com/Concordium/concordium-java-sdk/tree/main</url>
+    </scm>
+
     <modules>
         <module>concordium-sdk</module>
         <module>concordium-android-sdk</module>
         <module>concordium-sdk-examples</module>
     </modules>
-</project>
+</project>