From 5e42a1b74ede93a7f086eb49d2a0c2cbdb7d56ca Mon Sep 17 00:00:00 2001
From: SupremeMortal <6178101+SupremeMortal@users.noreply.github.com>
Date: Mon, 16 Nov 2020 01:11:08 +0000
Subject: [PATCH 1/2] Use artifactory jenkins plugin
---
Jenkinsfile | 23 ++++++++++++++++++++++-
bootstrap/bungeecord/pom.xml | 4 ++--
bootstrap/pom.xml | 5 ++---
bootstrap/spigot/pom.xml | 4 ++--
bootstrap/sponge/pom.xml | 4 ++--
bootstrap/standalone/pom.xml | 4 ++--
bootstrap/velocity/pom.xml | 4 ++--
common/pom.xml | 5 ++---
connector/pom.xml | 5 ++---
pom.xml | 15 +--------------
10 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 1a93391d..96b189f2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,8 +24,29 @@ pipeline {
when {
branch "master"
}
+
steps {
- sh 'mvn javadoc:jar source:jar deploy -DskipTests'
+ rtMavenDeployer(
+ id: "maven-deployer",
+ serverId: "opencollab-artifactory",
+ releaseRepo: "maven-releases",
+ snapshotRepo: "maven-snapshots"
+ )
+ rtMavenResolver(
+ id: "maven-resolver",
+ serverId: "opencollab-artifactory",
+ releaseRepo: "release",
+ snapshotRepo: "snapshot"
+ )
+ rtMavenRun(
+ pom: 'pom.xml',
+ goals: 'javadoc:jar source:jar install -DskipTests',
+ deployerId: "maven-deployer",
+ resolverId: "maven-resolver"
+ )
+ rtPublishBuildInfo(
+ serverId: "opencollab-artifactory"
+ )
}
}
}
diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml
index 44b28e93..5744b6b4 100644
--- a/bootstrap/bungeecord/pom.xml
+++ b/bootstrap/bungeecord/pom.xml
@@ -6,10 +6,10 @@
org.geysermc
bootstrap-parent
- 1.1.0
- ../
+ 1.1.0-SNAPSHOT
bootstrap-bungeecord
+
org.geysermc
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index d9bac67d..f5d918af 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -6,12 +6,11 @@
org.geysermc
geyser-parent
- parent
- ../
+ 1.1.0-SNAPSHOT
bootstrap-parent
- 1.1.0
pom
+
spigot-public
diff --git a/bootstrap/spigot/pom.xml b/bootstrap/spigot/pom.xml
index 067b446a..a50f6cd1 100644
--- a/bootstrap/spigot/pom.xml
+++ b/bootstrap/spigot/pom.xml
@@ -6,10 +6,10 @@
org.geysermc
bootstrap-parent
- 1.1.0
- ../
+ 1.1.0-SNAPSHOT
bootstrap-spigot
+
org.geysermc
diff --git a/bootstrap/sponge/pom.xml b/bootstrap/sponge/pom.xml
index 132f3817..4ec8813c 100644
--- a/bootstrap/sponge/pom.xml
+++ b/bootstrap/sponge/pom.xml
@@ -6,10 +6,10 @@
org.geysermc
bootstrap-parent
- 1.1.0
- ../
+ 1.1.0-SNAPSHOT
bootstrap-sponge
+
org.geysermc
diff --git a/bootstrap/standalone/pom.xml b/bootstrap/standalone/pom.xml
index 07458f73..d3818667 100644
--- a/bootstrap/standalone/pom.xml
+++ b/bootstrap/standalone/pom.xml
@@ -6,10 +6,10 @@
org.geysermc
bootstrap-parent
- 1.1.0
- ../
+ 1.1.0-SNAPSHOT
bootstrap-standalone
+
org.geysermc
diff --git a/bootstrap/velocity/pom.xml b/bootstrap/velocity/pom.xml
index babb9a3e..1eb59546 100644
--- a/bootstrap/velocity/pom.xml
+++ b/bootstrap/velocity/pom.xml
@@ -6,10 +6,10 @@
org.geysermc
bootstrap-parent
- 1.1.0
- ../
+ 1.1.0-SNAPSHOT
bootstrap-velocity
+
org.geysermc
diff --git a/common/pom.xml b/common/pom.xml
index 85dde12c..02546c29 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -6,11 +6,10 @@
org.geysermc
geyser-parent
- parent
- ../
+ 1.1.0-SNAPSHOT
common
- 1.1.0
+
com.google.code.gson
diff --git a/connector/pom.xml b/connector/pom.xml
index d837f057..c5ad1191 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -6,11 +6,10 @@
org.geysermc
geyser-parent
- parent
- ../
+ 1.1.0-SNAPSHOT
connector
- 1.1.0
+
org.geysermc
diff --git a/pom.xml b/pom.xml
index 345933ac..9ab92a1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
4.0.0
org.geysermc
geyser-parent
- parent
+ 1.1.0-SNAPSHOT
pom
Geyser
Allows for players from Minecraft Bedrock Edition to join Minecraft Java Edition servers.
@@ -71,19 +71,6 @@
-
-
- releases
- opencollab-releases
- https://repo.opencollab.dev/maven-releases
-
-
- snapshots
- opencollab-snapshots
- https://repo.opencollab.dev/maven-snapshots
-
-
-
org.projectlombok
From 98f388b0198d6de6879bc01437f3a5c999e5bd5f Mon Sep 17 00:00:00 2001
From: SupremeMortal <6178101+SupremeMortal@users.noreply.github.com>
Date: Tue, 17 Nov 2020 16:51:08 +0000
Subject: [PATCH 2/2] Bump version to 1.2.0-SNAPSHOT
---
bootstrap/bungeecord/pom.xml | 4 ++--
bootstrap/pom.xml | 2 +-
bootstrap/spigot/pom.xml | 4 ++--
bootstrap/sponge/pom.xml | 4 ++--
bootstrap/standalone/pom.xml | 4 ++--
bootstrap/velocity/pom.xml | 4 ++--
common/pom.xml | 2 +-
connector/pom.xml | 4 ++--
pom.xml | 2 +-
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml
index 5744b6b4..124967b0 100644
--- a/bootstrap/bungeecord/pom.xml
+++ b/bootstrap/bungeecord/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
bootstrap-parent
- 1.1.0-SNAPSHOT
+ 1.2.0-SNAPSHOT
bootstrap-bungeecord
@@ -14,7 +14,7 @@
org.geysermc
connector
- 1.1.0
+ 1.2.0-SNAPSHOT
compile
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index f5d918af..a5ad53cb 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
geyser-parent
- 1.1.0-SNAPSHOT
+ 1.2.0-SNAPSHOT
bootstrap-parent
pom
diff --git a/bootstrap/spigot/pom.xml b/bootstrap/spigot/pom.xml
index a50f6cd1..f3b9cf88 100644
--- a/bootstrap/spigot/pom.xml
+++ b/bootstrap/spigot/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
bootstrap-parent
- 1.1.0-SNAPSHOT
+ 1.2.0-SNAPSHOT
bootstrap-spigot
@@ -14,7 +14,7 @@
org.geysermc
connector
- 1.1.0
+ 1.2.0-SNAPSHOT
compile
diff --git a/bootstrap/sponge/pom.xml b/bootstrap/sponge/pom.xml
index 4ec8813c..e6ce8f85 100644
--- a/bootstrap/sponge/pom.xml
+++ b/bootstrap/sponge/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
bootstrap-parent
- 1.1.0-SNAPSHOT
+ 1.2.0-SNAPSHOT
bootstrap-sponge
@@ -14,7 +14,7 @@
org.geysermc
connector
- 1.1.0
+ 1.2.0-SNAPSHOT
compile
diff --git a/bootstrap/standalone/pom.xml b/bootstrap/standalone/pom.xml
index d3818667..831239f6 100644
--- a/bootstrap/standalone/pom.xml
+++ b/bootstrap/standalone/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
bootstrap-parent
- 1.1.0-SNAPSHOT
+ 1.2.0-SNAPSHOT
bootstrap-standalone
@@ -14,7 +14,7 @@
org.geysermc
connector
- 1.1.0
+ 1.2.0-SNAPSHOT
compile
diff --git a/bootstrap/velocity/pom.xml b/bootstrap/velocity/pom.xml
index 1eb59546..86de99ba 100644
--- a/bootstrap/velocity/pom.xml
+++ b/bootstrap/velocity/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
bootstrap-parent
- 1.1.0-SNAPSHOT
+ 1.2.0-SNAPSHOT
bootstrap-velocity
@@ -14,7 +14,7 @@
org.geysermc
connector
- 1.1.0
+ 1.2.0-SNAPSHOT
compile
diff --git a/common/pom.xml b/common/pom.xml
index 02546c29..32c4b187 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
geyser-parent
- 1.1.0-SNAPSHOT
+ 1.2.0-SNAPSHOT
common
diff --git a/connector/pom.xml b/connector/pom.xml
index c5ad1191..8382fd9a 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
geyser-parent
- 1.1.0-SNAPSHOT
+ 1.2.0-SNAPSHOT
connector
@@ -14,7 +14,7 @@
org.geysermc
common
- 1.1.0
+ 1.2.0-SNAPSHOT
compile
diff --git a/pom.xml b/pom.xml
index 9ab92a1b..011b320f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
4.0.0
org.geysermc
geyser-parent
- 1.1.0-SNAPSHOT
+ 1.2.0-SNAPSHOT
pom
Geyser
Allows for players from Minecraft Bedrock Edition to join Minecraft Java Edition servers.