Merge pull request #30 from SourceWriters/release

Rebase
SourceWriters · Jan 20, 2022 · bb83427 · bb83427
2 parents a2c1ef5 + dabe338
commit bb83427
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 28 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,15 @@
 	<artifactId>vcompat-parent</artifactId>
 	<version>3.0.0</version>
 	<packaging>pom</packaging>
-
+
+	<distributionManagement>
+		<repository>
+			<id>github</id>
+		    	<name>GitHub OWNER Apache Maven Packages</name>
+		    	<url>https://maven.pkg.github.com/SourceWriters/vCompat</url>
+		</repository>
+	</distributionManagement>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
@@ -66,6 +74,14 @@
 					<target>11</target>
 				</configuration>
 			</plugin>
+			<plugin>
+			  <groupId>org.apache.maven.plugins</groupId>
+			  <artifactId>maven-deploy-plugin</artifactId>
+			  <version>3.0.0-M2</version>
+			  <configuration>
+			    <skip>true</skip>
+			  </configuration>
+			</plugin>
 		</plugins>
 	</build>
 	<modules>
@@ -75,4 +91,4 @@
 		<module>vcompat-1_17_R1</module>
 		<module>vcompat-1_18_R1</module>
 	</modules>
-</project>
+</project>
diff --git a/vcompat-api/pom.xml b/vcompat-api/pom.xml
@@ -49,14 +49,14 @@
 			<version>2.0.11</version>
 		</dependency>
 
-        <!-- Minecraft -->
+    <!-- Minecraft -->
 
-        <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
-            <version>2.12.1</version>
-            <scope>provided</scope>
-        </dependency>
+    <dependency>
+        <groupId>jline</groupId>
+        <artifactId>jline</artifactId>
+        <version>2.12.1</version>
+        <scope>provided</scope>
+    </dependency>
 	</dependencies>
 
     <build>
@@ -93,4 +93,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/vcompat-core/pom.xml b/vcompat-core/pom.xml
@@ -9,24 +9,16 @@
 	</parent>
 	<artifactId>vcompat</artifactId>
 
-    <distributionManagement>
-        <repository>
-            <id>github</id>
-            <name>GitHub OWNER Apache Maven Packages</name>
-            <url>https://maven.pkg.github.com/SourceWriters/vCompat</url>
-        </repository>
-    </distributionManagement>
-
 	<dependencies>
-    
+
         <!-- vCompat Api -->
 
         <dependency>
             <groupId>net.sourcewriters.minecraft</groupId>
             <artifactId>vcompat-api</artifactId>
             <version>3.0.0</version>
         </dependency>
-    
+
         <!-- vCompat Versions -->
 
         <dependency>
@@ -50,7 +42,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+      	<version>3.2.4</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -70,14 +62,22 @@
 							</excludes>
 						</filter>
 					</filters>
-                    <relocations>
-                        <relocation>
-                            <pattern>com.syntaxphoenix.syntaxapi</pattern>
-                            <shadedPattern>net.sourcewriters.minecraft.vcompat.shaded.syntaxapi</shadedPattern>
-                        </relocation>
-                    </relocations>
+            <relocations>
+                <relocation>
+                    <pattern>com.syntaxphoenix.syntaxapi</pattern>
+                    <shadedPattern>net.sourcewriters.minecraft.vcompat.shaded.syntaxapi</shadedPattern>
+                </relocation>
+            </relocations>
 				</configuration>
 			</plugin>
+			<plugin>
+			  <groupId>org.apache.maven.plugins</groupId>
+			  <artifactId>maven-deploy-plugin</artifactId>
+			  <version>3.0.0-M2</version>
+			  <configuration>
+			    <skip>false</skip>
+			  </configuration>
+			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>