Skip to content

Commit

Permalink
Poms: remove unneeded parent-tracking to make things easier for downs…
Browse files Browse the repository at this point in the history 
…tream consumers
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Jun 4, 2023
1 parent 1521501 commit 899af09
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 39 deletions.
10 changes: 7 additions & 3 deletions dist/pom.xml
View file
Expand Up @@ -11,20 +11,24 @@

<artifactId>denizen-dist</artifactId>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<BUILD_NUMBER>Unknown</BUILD_NUMBER>
<BUILD_CLASS>CUSTOM</BUILD_CLASS>
</properties>

<dependencies>
<dependency>
<groupId>com.denizenscript</groupId>
<artifactId>denizencore</artifactId>
<version>${dcore.version}</version>
<version>1.91.0-SNAPSHOT</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.denizenscript</groupId>
<artifactId>denizen</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.denizenscript</groupId>
Expand Down
24 changes: 17 additions & 7 deletions paper/pom.xml
View file
Expand Up @@ -2,14 +2,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<parent>
<groupId>com.denizenscript</groupId>
<artifactId>denizen-parent</artifactId>
<version>1.2.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>com.denizenscript</groupId>
<artifactId>denizen-paper</artifactId>
<version>1.2.7-SNAPSHOT</version>

<repositories>
<repository>
Expand All @@ -22,9 +19,8 @@
<dependency>
<groupId>com.denizenscript</groupId>
<artifactId>denizen</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.papermc.paper</groupId>
Expand All @@ -34,4 +30,18 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<source>16</source>
<target>16</target>
</configuration>
</plugin>
</plugins>
</build>

</project>
17 changes: 9 additions & 8 deletions plugin/pom.xml
View file
@@ -1,39 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<parent>
<groupId>com.denizenscript</groupId>
<artifactId>denizen-parent</artifactId>
<version>1.2.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>com.denizenscript</groupId>
<artifactId>denizen</artifactId>
<version>1.2.7-SNAPSHOT</version>

<name>Denizen</name>
<description>Scriptable Minecraft and Citizens2</description>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<!-- Dependencies -->
<dependencies>
<!-- Required APIs -->
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>${craftbukkit.version}</version>
<version>1.19.4-R0.1-SNAPSHOT</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.denizenscript</groupId>
<artifactId>denizencore</artifactId>
<version>${dcore.version}</version>
<version>1.91.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<!-- Basic dependencies -->
<dependency>
<groupId>net.citizensnpcs</groupId>
<artifactId>citizens-main</artifactId>
<version>${citizens.version}</version>
<version>2.0.31-SNAPSHOT</version>
<type>jar</type>
<scope>provided</scope>
<exclusions>
Expand Down
3 changes: 0 additions & 3 deletions pom.xml
View file
Expand Up @@ -10,9 +10,6 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<craftbukkit.version>1.19.4-R0.1-SNAPSHOT</craftbukkit.version>
<citizens.version>2.0.31-SNAPSHOT</citizens.version>
<dcore.version>1.91.0-SNAPSHOT</dcore.version>
<BUILD_NUMBER>Unknown</BUILD_NUMBER>
<BUILD_CLASS>CUSTOM</BUILD_CLASS>
<DENIZEN_VERSION>1.2.7</DENIZEN_VERSION>
Expand Down
18 changes: 12 additions & 6 deletions v1_17/pom.xml
View file
Expand Up @@ -2,20 +2,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<parent>
<groupId>com.denizenscript</groupId>
<artifactId>denizen-parent</artifactId>
<version>1.2.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>com.denizenscript</groupId>
<artifactId>denizen-v1_17</artifactId>
<version>1.2.7-SNAPSHOT</version>

<dependencies>
<dependency>
<groupId>com.denizenscript</groupId>
<artifactId>denizen</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -81,6 +78,15 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<source>16</source>
<target>16</target>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
18 changes: 12 additions & 6 deletions v1_18/pom.xml
View file
Expand Up @@ -2,20 +2,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<parent>
<groupId>com.denizenscript</groupId>
<artifactId>denizen-parent</artifactId>
<version>1.2.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>com.denizenscript</groupId>
<artifactId>denizen-v1_18</artifactId>
<version>1.2.7-SNAPSHOT</version>

<dependencies>
<dependency>
<groupId>com.denizenscript</groupId>
<artifactId>denizen</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -69,6 +66,15 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<source>16</source>
<target>16</target>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
18 changes: 12 additions & 6 deletions v1_19/pom.xml
View file
Expand Up @@ -2,20 +2,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<parent>
<groupId>com.denizenscript</groupId>
<artifactId>denizen-parent</artifactId>
<version>1.2.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>com.denizenscript</groupId>
<artifactId>denizen-v1_19</artifactId>
<version>1.2.7-SNAPSHOT</version>

<dependencies>
<dependency>
<groupId>com.denizenscript</groupId>
<artifactId>denizen</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -69,6 +66,15 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<source>16</source>
<target>16</target>
</configuration>
</plugin>
</plugins>
</build>

Expand Down

0 comments on commit 899af09

Please sign in to comment.