Merge pull request #7 from skynetcap/feature/new-group-id

Update version to 1.2. Update to Java 17.
skynetcap · Aug 12, 2022 · c96f9ba · c96f9ba
2 parents a5c6fbb + 4b0c033
commit c96f9ba
Show file tree

Hide file tree

Showing 9 changed files with 125 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -3,14 +3,24 @@
 SolanaJ implementations of popular Solana programs, including the Project Serum DEX.
 
 # Installation
-solanaj-programs is not yet on Maven Central. You'll need to install it using `mvn clean install`.
+1. Add Sonatype repository to your project's pom.xml file:
+
+```xml
+<repositories>
+  <repository>
+      <id>Sonatype Releases</id>
+      <url>https://oss.sonatype.org/content/repositories/releases/</url>
+  </repository>
+</repositories>
+```
+
+2. Add `solanaj-programs` dependency
 
-After running `mvn clean install`:
 ```xml
 <dependency>
         <groupId>com.mmorrell</groupId>
         <artifactId>solanaj-programs</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2</version>
 </dependency>
 ```
 

diff --git a/bonfida/pom.xml b/bonfida/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>solanaj-programs</artifactId>
         <groupId>com.mmorrell</groupId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/magiceden/pom.xml b/magiceden/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>solanaj-programs</artifactId>
         <groupId>com.mmorrell</groupId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/mango/pom.xml b/mango/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>solanaj-programs</artifactId>
         <groupId>com.mmorrell</groupId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -3,11 +3,33 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>com.mmorrell</groupId>
     <artifactId>solanaj-programs</artifactId>
     <packaging>pom</packaging>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2</version>
+    <name>${project.groupId}:${project.artifactId}</name>
+    <description>Program libraries for SolanaJ, a library for Solana RPC</description>
+    <url>https://github.com/skynetcap/solanaj-programs</url>
+    <licenses>
+        <license>
+            <name>MIT License</name>
+            <url>https://www.opensource.org/licenses/mit-license.php</url>
+        </license>
+    </licenses>
+    <scm>
+        <connection>scm:git:git://github.com/skynetcap/solanaj-programs.git</connection>
+        <developerConnection>scm:git:ssh://github.com/skynetcap/solanaj-programs.git</developerConnection>
+        <url>https://github.com/skynetcap/solanaj-programs/tree/main</url>
+    </scm>
+    <developers>
+        <developer>
+            <name>Michael Morrell</name>
+            <email>[email protected]</email>
+            <organization>Openserum</organization>
+            <organizationUrl>https://openserum.io/</organizationUrl>
+        </developer>
+    </developers>
+
     <modules>
         <module>mango</module>
         <module>serum</module>
@@ -17,8 +39,8 @@
     </modules>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -37,7 +59,7 @@
         <dependency>
             <groupId>com.mmorrell</groupId>
             <artifactId>solanaj</artifactId>
-            <version>1.9-SNAPSHOT</version>
+            <version>1.10</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -58,11 +80,85 @@
     </dependencies>
 
     <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
         <repository>
-            <id>github</id>
-            <name>GitHub Packages</name>
-            <url>https://maven.pkg.github.com/skynetcap/solanaj-programs</url>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
     </distributionManagement>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.13</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>ossrh</serverId>
+                    <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <source>17</source>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <version>1.5</version>
+                <executions>
+                    <execution>
+                        <id>sign-artifacts</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>sign</goal>
+                        </goals>
+                        <configuration>
+                            <keyname>0x67A54591</keyname>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+            </plugin>
+        </plugins>
+    </build>
+    <repositories>
+        <repository>
+            <id>Sonatype Releases</id>
+            <url>https://oss.sonatype.org/content/repositories/releases/</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/pyth/README.md b/pyth/README.md
@@ -6,7 +6,7 @@ A SolanaJ module for interfacing with Pyth.
 <dependency>
         <groupId>com.mmorrell</groupId>
         <artifactId>solanaj-programs</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2</version>
 </dependency>
 ```
 

diff --git a/pyth/pom.xml b/pyth/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>solanaj-programs</artifactId>
         <groupId>com.mmorrell</groupId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/serum/pom.xml b/serum/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>solanaj-programs</artifactId>
         <groupId>com.mmorrell</groupId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/serum/src/main/java/com/mmorrell/serum/model/Market.java b/serum/src/main/java/com/mmorrell/serum/model/Market.java
@@ -4,7 +4,7 @@
 import org.p2p.solanaj.core.PublicKey;
 
 /**
- * Class to represent a Serum market. Should be instantiated using a {@link .MarketBuilder}.
+ * Class to represent a Serum market. Should be instantiated using a {@link MarketBuilder}.
  */
 @EqualsAndHashCode(of = {"ownAddress"})
 public class Market {