From f73e384c27f6b8c8daf40f5cbe07d7b9e83208c7 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io> Date: Sat, 1 Jan 2011 11:47:24 +0100 Subject: [PATCH] Transition to Maven By: Erik Broes <erikbroes@grum.nl> --- paper-server/.gitignore | 16 +++++-- paper-server/pom.xml | 48 +++++++++++++++++++ .../org/bukkit/craftbukkit/CraftBlock.java | 0 .../org/bukkit/craftbukkit/CraftChunk.java | 0 .../org/bukkit/craftbukkit/CraftEntity.java | 0 .../bukkit/craftbukkit/CraftHumanEntity.java | 0 .../bukkit/craftbukkit/CraftLivingEntity.java | 0 .../org/bukkit/craftbukkit/CraftPlayer.java | 0 .../org/bukkit/craftbukkit/CraftServer.java | 0 .../org/bukkit/craftbukkit/CraftWorld.java | 0 .../java}/org/bukkit/craftbukkit/Main.java | 0 11 files changed, 59 insertions(+), 5 deletions(-) create mode 100755 paper-server/pom.xml rename paper-server/src/{ => main/java}/org/bukkit/craftbukkit/CraftBlock.java (100%) rename paper-server/src/{ => main/java}/org/bukkit/craftbukkit/CraftChunk.java (100%) rename paper-server/src/{ => main/java}/org/bukkit/craftbukkit/CraftEntity.java (100%) rename paper-server/src/{ => main/java}/org/bukkit/craftbukkit/CraftHumanEntity.java (100%) rename paper-server/src/{ => main/java}/org/bukkit/craftbukkit/CraftLivingEntity.java (100%) rename paper-server/src/{ => main/java}/org/bukkit/craftbukkit/CraftPlayer.java (100%) rename paper-server/src/{ => main/java}/org/bukkit/craftbukkit/CraftServer.java (100%) rename paper-server/src/{ => main/java}/org/bukkit/craftbukkit/CraftWorld.java (100%) rename paper-server/src/{ => main/java}/org/bukkit/craftbukkit/Main.java (100%) diff --git a/paper-server/.gitignore b/paper-server/.gitignore index f0fde81a2a..9c0573a55d 100644 --- a/paper-server/.gitignore +++ b/paper-server/.gitignore @@ -1,7 +1,13 @@ +# Eclipse stuff +/.classpath +/.project +/.settings -/jarjar -/build -/build.xml -/manifest.mf +# netbeans /nbproject -/dist \ No newline at end of file + +# maven +/target + +# vim +.*.sw[a-p] diff --git a/paper-server/pom.xml b/paper-server/pom.xml new file mode 100755 index 0000000000..cbfb2c7444 --- /dev/null +++ b/paper-server/pom.xml @@ -0,0 +1,48 @@ +<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"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.bukkit</groupId> + <artifactId>craftbukkit</artifactId> + <version>0.0.1-SNAPSHOT</version> + <name>CraftBukkit</name> + <url>http://www.bukkit.org</url> + <repositories> + <repository> + <id>tmp-repo</id> + <url>http://dl.dwim.org/~ebroes/maven</url> + </repository> + </repositories> + <dependencies> + <dependency> + <groupId>org.bukkit</groupId> + <artifactId>bukkit</artifactId> + <version>0.0.1-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.bukkit</groupId> + <artifactId>minecraft-server</artifactId> + <version>1.1_02</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + </dependencies> + <!-- to add the manifest with the Main-Class --> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <archive> + <manifest> + <mainClass>org.bukkit.craftbukkit.Main</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/paper-server/src/org/bukkit/craftbukkit/CraftBlock.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftBlock.java similarity index 100% rename from paper-server/src/org/bukkit/craftbukkit/CraftBlock.java rename to paper-server/src/main/java/org/bukkit/craftbukkit/CraftBlock.java diff --git a/paper-server/src/org/bukkit/craftbukkit/CraftChunk.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftChunk.java similarity index 100% rename from paper-server/src/org/bukkit/craftbukkit/CraftChunk.java rename to paper-server/src/main/java/org/bukkit/craftbukkit/CraftChunk.java diff --git a/paper-server/src/org/bukkit/craftbukkit/CraftEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftEntity.java similarity index 100% rename from paper-server/src/org/bukkit/craftbukkit/CraftEntity.java rename to paper-server/src/main/java/org/bukkit/craftbukkit/CraftEntity.java diff --git a/paper-server/src/org/bukkit/craftbukkit/CraftHumanEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java similarity index 100% rename from paper-server/src/org/bukkit/craftbukkit/CraftHumanEntity.java rename to paper-server/src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java diff --git a/paper-server/src/org/bukkit/craftbukkit/CraftLivingEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java similarity index 100% rename from paper-server/src/org/bukkit/craftbukkit/CraftLivingEntity.java rename to paper-server/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java diff --git a/paper-server/src/org/bukkit/craftbukkit/CraftPlayer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java similarity index 100% rename from paper-server/src/org/bukkit/craftbukkit/CraftPlayer.java rename to paper-server/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java diff --git a/paper-server/src/org/bukkit/craftbukkit/CraftServer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java similarity index 100% rename from paper-server/src/org/bukkit/craftbukkit/CraftServer.java rename to paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/paper-server/src/org/bukkit/craftbukkit/CraftWorld.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java similarity index 100% rename from paper-server/src/org/bukkit/craftbukkit/CraftWorld.java rename to paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/paper-server/src/org/bukkit/craftbukkit/Main.java b/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java similarity index 100% rename from paper-server/src/org/bukkit/craftbukkit/Main.java rename to paper-server/src/main/java/org/bukkit/craftbukkit/Main.java