From b8a7dcaddb0f06ef4d508e93fa8052783b1c6140 Mon Sep 17 00:00:00 2001
From: Jitse Boonstra <Jitse@operamail.com>
Date: Mon, 3 Jun 2019 23:30:50 +0200
Subject: [PATCH] More fiddling around with Sonatype....

---
 api/pom.xml        |  88 -----------------------------------
 nms/pom.xml        |  36 ---------------
 plugin/pom.xml     |   2 -
 pom.xml            | 111 ++++++++++++---------------------------------
 release.properties |   9 ++++
 5 files changed, 37 insertions(+), 209 deletions(-)
 delete mode 100755 api/pom.xml
 delete mode 100755 nms/pom.xml
 create mode 100644 release.properties

diff --git a/api/pom.xml b/api/pom.xml
deleted file mode 100755
index d4af644..0000000
--- a/api/pom.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<project
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>net.jitse</groupId>
-        <artifactId>npclib</artifactId>
-        <version>1.5-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>npclib-api</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>net.jitse</groupId>
-            <artifactId>npclib-commons</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.jitse</groupId>
-            <artifactId>npclib-nms-v1_8_R1</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.jitse</groupId>
-            <artifactId>npclib-nms-v1_8_R2</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.jitse</groupId>
-            <artifactId>npclib-nms-v1_8_R3</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.jitse</groupId>
-            <artifactId>npclib-nms-v1_9_R1</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.jitse</groupId>
-            <artifactId>npclib-nms-v1_9_R2</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.jitse</groupId>
-            <artifactId>npclib-nms-v1_10_R1</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.jitse</groupId>
-            <artifactId>npclib-nms-v1_11_R1</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.jitse</groupId>
-            <artifactId>npclib-nms-v1_12_R1</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.jitse</groupId>
-            <artifactId>npclib-nms-v1_13_R1</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.jitse</groupId>
-            <artifactId>npclib-nms-v1_13_R2</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <defaultGoal>clean install</defaultGoal>
-        <finalName>npclib-api-${project.version}</finalName>
-    </build>
-</project>
diff --git a/nms/pom.xml b/nms/pom.xml
deleted file mode 100755
index b476296..0000000
--- a/nms/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<project
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-    <parent>
-        <groupId>net.jitse</groupId>
-        <artifactId>npclib</artifactId>
-        <version>1.5-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>npclib-nms</artifactId>
-
-    <modules>
-        <module>v1_8_R1</module>
-        <module>v1_8_R2</module>
-        <module>v1_8_R3</module>
-        <module>v1_9_R1</module>
-        <module>v1_9_R2</module>
-        <module>v1_10_R1</module>
-        <module>v1_11_R1</module>
-        <module>v1_12_R1</module>
-        <module>v1_13_R1</module>
-        <module>v1_13_R2</module>
-    </modules>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>npclib-commons</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 9c3b931..4cbace7 100755
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -13,8 +13,6 @@
     <artifactId>npclib-plugin</artifactId>
 
     <build>
-        <directory>../target</directory>
-        <finalName>npclib-plugin-${project.parent.version}</finalName>
         <resources>
             <resource>
                 <targetPath>.</targetPath>
diff --git a/pom.xml b/pom.xml
index a823f90..51b6546 100755
--- a/pom.xml
+++ b/pom.xml
@@ -10,15 +10,10 @@
     <artifactId>npclib</artifactId>
     <version>1.5-SNAPSHOT</version>
 
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>7</version>
-    </parent>
-
     <scm>
-        <url>https://github.com/sonatype/nexus-oss.git</url>
-        <connection>scm:git:git://github.com/JitseB/NPClib</connection>
+        <url>git@github.com:JitseB/NPCLib.git</url>
+        <connection>scm:git:git@github.com:JitseB/NPClib.git</connection>
+        <developerConnection>scm:git:git@github.com:JitseB/NPCLib.git</developerConnection>
     </scm>
 
     <developers>
@@ -37,16 +32,13 @@
     </properties>
 
     <distributionManagement>
-        <!-- Repository for snapshots -->
         <snapshotRepository>
-            <id>sonatype-nexus-snapshots</id>
+            <id>ossrh</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>
         </snapshotRepository>
-        <!-- Repository for releases -->
         <repository>
-            <id>nexus-releases</id>
-            <name>Nexus Release Repository</name>
-            <url>http://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
     </distributionManagement>
 
@@ -87,61 +79,6 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.1.2</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <quiet>true</quiet>
-                    <nonavbar>true</nonavbar>
-                    <notree>true</notree>
-                    <nocomment>true</nocomment>
-                    <nohelp>true</nohelp>
-
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
@@ -155,24 +92,32 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.7</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>ossrh</serverId>
+                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
     <modules>
         <module>commons</module>
-        <module>nms</module>
-        <module>api</module>
+        <module>nms/v1_8_R1</module>
+        <module>nms/v1_8_R2</module>
+        <module>nms/v1_8_R3</module>
+        <module>nms/v1_9_R1</module>
+        <module>nms/v1_9_R2</module>
+        <module>nms/v1_10_R1</module>
+        <module>nms/v1_11_R1</module>
+        <module>nms/v1_12_R1</module>
+        <module>nms/v1_13_R1</module>
+        <module>nms/v1_13_R2</module>
+        <module>plugin</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>plugin</id>
-            <modules>
-                <module>commons</module>
-                <module>nms</module>
-                <module>api</module>
-                <module>plugin</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/release.properties b/release.properties
new file mode 100644
index 0000000..23b9a57
--- /dev/null
+++ b/release.properties
@@ -0,0 +1,9 @@
+#release configuration
+#Mon Jun 03 22:24:55 CEST 2019
+preparationGoals=clean verify
+pushChanges=true
+scm.commentPrefix=[maven-release-plugin] 
+remoteTagging=true
+exec.additionalArguments=-Psonatype-oss-release
+completedPhase=scm-check-modifications
+scm.url=scm\:git\:git@github.com\:JitseB/NPCLib.git