mirror of
https://github.com/PaperMC/Waterfall.git
synced 2025-02-16 03:41:20 +01:00
Update upstream
This commit is contained in:
parent
2268a31735
commit
91d537c7cc
@ -1 +1 @@
|
||||
Subproject commit db1516ba000a18da6e5d0330ec5645d9aea74898
|
||||
Subproject commit 950d504bd87fe8401190dd7d8e192a266763f916
|
@ -1,4 +1,4 @@
|
||||
From b23fa70f4ee594b297212cc6c674756724f06d29 Mon Sep 17 00:00:00 2001
|
||||
From 10aa49668e02fea51e8db4edff6346f37fe6a217 Mon Sep 17 00:00:00 2001
|
||||
From: Tux <write@imaginarycode.com>
|
||||
Date: Thu, 19 May 2016 10:33:31 -0700
|
||||
Subject: [PATCH] POM Changes
|
||||
@ -492,7 +492,7 @@ index 940d257..18861da 100644
|
||||
<dependencies>
|
||||
<dependency>
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 7f9564c..569c424 100644
|
||||
index facd3bd..16601fc 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -4,23 +4,24 @@
|
||||
@ -587,7 +587,7 @@ index 7f9564c..569c424 100644
|
||||
+
|
||||
<properties>
|
||||
<build.number>unknown</build.number>
|
||||
<netty.version>4.1.6.Final</netty.version>
|
||||
<netty.version>4.1.7.Final</netty.version>
|
||||
- <maven.compiler.source>1.7</maven.compiler.source>
|
||||
- <maven.compiler.target>1.7</maven.compiler.target>
|
||||
+ <!-- Require Java 8 -->
|
||||
@ -724,7 +724,7 @@ index 63d0498..3421be0 100644
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
diff --git a/proxy/pom.xml b/proxy/pom.xml
|
||||
index 2bb124e..99d4628 100644
|
||||
index 850ab86..d8372c4 100644
|
||||
--- a/proxy/pom.xml
|
||||
+++ b/proxy/pom.xml
|
||||
@@ -4,18 +4,18 @@
|
||||
@ -836,5 +836,5 @@ index fbadb18..349d5cc 100644
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
--
|
||||
2.7.4
|
||||
2.10.0
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user