diff --git a/.github/workflows/deploy_to_central.yaml b/.github/workflows/deploy_to_central.yaml
index 8f1fa68b..8f7b4d4b 100644
--- a/.github/workflows/deploy_to_central.yaml
+++ b/.github/workflows/deploy_to_central.yaml
@@ -9,10 +9,6 @@ jobs:
- name: Install gpg secret key
run: |
cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import
- - name: Install Protoc
- uses: arduino/setup-protoc@v1
- with:
- version: "3.x"
- name: Checkout
uses: actions/checkout@v2
- name: Set up Maven Central Repository
diff --git a/.github/workflows/java_ci.yml b/.github/workflows/java_ci.yml
index 6aff74a2..cdb350c5 100644
--- a/.github/workflows/java_ci.yml
+++ b/.github/workflows/java_ci.yml
@@ -13,10 +13,6 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- - name: Install Protoc
- uses: arduino/setup-protoc@v1
- with:
- version: "3.x"
- name: Checkout
uses: actions/checkout@v2
- name: Set up JDK 11
diff --git a/pom.xml b/pom.xml
index b620d5ef..1c3bfb06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,9 @@
3.10.0
- 3.25.0
+ 3.25.0
+ 0.6.1
+ 1.7.1
0.3.0
0.10.3
1.6
@@ -109,6 +111,32 @@
+
+
+ kr.motd.maven
+ os-maven-plugin
+ ${os-maven-plugin.version}
+
+
+
+
+
+ org.xolstice.maven.plugins
+ protobuf-maven-plugin
+ ${protobuf-maven-plugin.version}
+
+
+
+ compile
+
+
+
+
+ com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
+
+
+
+
org.apache.maven.plugins
@@ -162,49 +190,8 @@
- org.apache.maven.plugins
- maven-antrun-plugin
- ${maven-antrun.version}
-
-
- exec-protoc
- generate-sources
-
-
-
-
-
-
-
-
-
-
-
-
-
- run
-
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- ${build-helper-maven.version}
-
-
- add-classes
- generate-sources
-
- add-source
-
-
-
-
-
-
-
-
+ org.xolstice.maven.plugins
+ protobuf-maven-plugin
maven-surefire-plugin
@@ -222,7 +209,7 @@
com.google.protobuf
protobuf-java
- ${protobuf-java.version}
+ ${protobuf.version}
net.i2p.crypto
diff --git a/schema.proto b/src/main/proto/schema.proto
similarity index 100%
rename from schema.proto
rename to src/main/proto/schema.proto