Skip to content

Commit 19c4b47

Browse files
committed
everything working
1 parent 900b9d1 commit 19c4b47

File tree

2 files changed

+16
-10
lines changed
  • jdk_8_maven
    • cs/rest/original/languagetool/languagetool-core
    • em/embedded/rest

2 files changed

+16
-10
lines changed

jdk_8_maven/cs/rest/original/languagetool/languagetool-core/pom.xml

+15-9
Original file line numberDiff line numberDiff line change
@@ -75,22 +75,28 @@
7575
-->
7676
<!-- START OF gRPC code generation -->
7777
<plugin>
78-
<groupId>org.xolstice.maven.plugins</groupId>
79-
<artifactId>protobuf-maven-plugin</artifactId>
80-
<version>0.6.1</version>
78+
<!-- <groupId>org.xolstice.maven.plugins</groupId>--> <!-- Disable to enable Apple Silicon support -->
79+
<!-- <artifactId>protobuf-maven-plugin</artifactId>--> <!-- Disable to enable Apple Silicon support -->
80+
<!-- <version>0.6.1</version>-->
81+
<groupId>com.github.os72</groupId>
82+
<artifactId>protoc-jar-maven-plugin</artifactId>
83+
<version>3.11.4</version>
8184
<configuration>
82-
<protocArtifact>com.google.protobuf:protoc:3.11.0:exe:${os.detected.classifier}</protocArtifact>
83-
<pluginId>grpc-java</pluginId>
84-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.27.1:exe:${os.detected.classifier}</pluginArtifact>
85+
<!-- <protocArtifact>com.google.protobuf:protoc:3.11.0:exe:${os.detected.classifier}</protocArtifact>--> <!-- Disable to enable Apple Silicon support -->
86+
<!-- <pluginId>grpc-java</pluginId>--> <!-- Disable to enable Apple Silicon support -->
87+
<protocArtifact>com.google.protobuf:protoc:3.17.3:exe:${os.detected.classifier}</protocArtifact>
88+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.42.1:exe:${os.detected.classifier}</pluginArtifact>
89+
<!-- <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.27.1:exe:${os.detected.classifier}</pluginArtifact>--> <!-- Disable to enable Apple Silicon support -->
8590
<!-- output into src/main/java, but don't ever clear it (would delete all regular source files) -->
8691
<outputDirectory>${project.build.sourceDirectory}/</outputDirectory>
87-
<clearOutputDirectory>false</clearOutputDirectory>
92+
<!-- <clearOutputDirectory>false</clearOutputDirectory>--> <!-- Disable to enable Apple Silicon support -->
8893
</configuration>
8994
<executions>
9095
<execution>
9196
<goals>
92-
<goal>compile</goal>
93-
<goal>compile-custom</goal>
97+
<goal>run</goal>
98+
<!-- <goal>compile</goal>--> <!-- Disable to enable Apple Silicon support -->
99+
<!-- <goal>compile-custom</goal>--> <!-- Disable to enable Apple Silicon support -->
94100
</goals>
95101
</execution>
96102
</executions>

jdk_8_maven/em/embedded/rest/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<module>catwatch</module>
2222
<module>news</module>
2323
<module>ocvn</module>
24-
<!-- <module>languagetool</module>-->
24+
<module>languagetool</module>
2525
<module>restcountries</module>
2626
<module>gestaohospital</module>
2727
<module>genome-nexus</module>

0 commit comments

Comments
 (0)