diff options
| -rw-r--r-- | bukkit/pom.xml | 30 | ||||
| -rw-r--r-- | bungeecord/pom.xml | 30 | ||||
| -rw-r--r-- | bungeecord/src/main/resources/bungee.yml (renamed from bungeecord/src/main/resources/plugin.yml) | 0 | ||||
| -rw-r--r-- | pom.xml | 1 | ||||
| -rw-r--r-- | sponge/pom.xml | 30 | ||||
| -rw-r--r-- | universal/pom.xml | 78 |
6 files changed, 82 insertions, 87 deletions
diff --git a/bukkit/pom.xml b/bukkit/pom.xml index d2af7d4..3e24269 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -31,34 +31,6 @@ <target>1.8</target> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>${shade.version}</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <minimizeJar>false</minimizeJar> - <createDependencyReducedPom>false</createDependencyReducedPom> - <relocations> - <!-- shaded dependencies --> - <relocation> - <pattern>okio</pattern> - <shadedPattern>me.lucko.spark.lib.okio</shadedPattern> - </relocation> - <relocation> - <pattern>okhttp3</pattern> - <shadedPattern>me.lucko.spark.lib.okhttp3</shadedPattern> - </relocation> - </relocations> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> @@ -68,7 +40,7 @@ <groupId>me.lucko</groupId> <artifactId>spark-common</artifactId> <version>${project.version}</version> - <scope>compile</scope> + <scope>provided</scope> </dependency> <!-- Spigot --> diff --git a/bungeecord/pom.xml b/bungeecord/pom.xml index c43a510..a8c2db9 100644 --- a/bungeecord/pom.xml +++ b/bungeecord/pom.xml @@ -31,34 +31,6 @@ <target>1.8</target> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>${shade.version}</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <minimizeJar>false</minimizeJar> - <createDependencyReducedPom>false</createDependencyReducedPom> - <relocations> - <!-- shaded dependencies --> - <relocation> - <pattern>okio</pattern> - <shadedPattern>me.lucko.spark.lib.okio</shadedPattern> - </relocation> - <relocation> - <pattern>okhttp3</pattern> - <shadedPattern>me.lucko.spark.lib.okhttp3</shadedPattern> - </relocation> - </relocations> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> @@ -68,7 +40,7 @@ <groupId>me.lucko</groupId> <artifactId>spark-common</artifactId> <version>${project.version}</version> - <scope>compile</scope> + <scope>provided</scope> </dependency> <!-- BungeeCord --> diff --git a/bungeecord/src/main/resources/plugin.yml b/bungeecord/src/main/resources/bungee.yml index d5aede0..d5aede0 100644 --- a/bungeecord/src/main/resources/plugin.yml +++ b/bungeecord/src/main/resources/bungee.yml @@ -13,6 +13,7 @@ <module>bukkit</module> <module>bungeecord</module> <module>sponge</module> + <module>universal</module> </modules> <name>spark</name> diff --git a/sponge/pom.xml b/sponge/pom.xml index 44cfa6f..d926108 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -32,34 +32,6 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>${shade.version}</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <minimizeJar>false</minimizeJar> - <createDependencyReducedPom>false</createDependencyReducedPom> - <relocations> - <!-- shaded dependencies --> - <relocation> - <pattern>okio</pattern> - <shadedPattern>me.lucko.spark.lib.okio</shadedPattern> - </relocation> - <relocation> - <pattern>okhttp3</pattern> - <shadedPattern>me.lucko.spark.lib.okhttp3</shadedPattern> - </relocation> - </relocations> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>templating-maven-plugin</artifactId> <version>1.0.0</version> @@ -81,7 +53,7 @@ <groupId>me.lucko</groupId> <artifactId>spark-common</artifactId> <version>${project.version}</version> - <scope>compile</scope> + <scope>provided</scope> </dependency> <!-- Sponge --> diff --git a/universal/pom.xml b/universal/pom.xml new file mode 100644 index 0000000..ad6fb74 --- /dev/null +++ b/universal/pom.xml @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <artifactId>spark-parent</artifactId> + <groupId>me.lucko</groupId> + <version>1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>spark-universal</artifactId> + <packaging>jar</packaging> + + <build> + <defaultGoal>clean package</defaultGoal> + <finalName>spark</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>${shade.version}</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <minimizeJar>false</minimizeJar> + <createDependencyReducedPom>false</createDependencyReducedPom> + <relocations> + <!-- shaded dependencies --> + <relocation> + <pattern>okio</pattern> + <shadedPattern>me.lucko.spark.lib.okio</shadedPattern> + </relocation> + <relocation> + <pattern>okhttp3</pattern> + <shadedPattern>me.lucko.spark.lib.okhttp3</shadedPattern> + </relocation> + </relocations> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>me.lucko</groupId> + <artifactId>spark-common</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>me.lucko</groupId> + <artifactId>spark-bukkit</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>me.lucko</groupId> + <artifactId>spark-bungeecord</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>me.lucko</groupId> + <artifactId>spark-sponge</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + </dependencies> + +</project> |