chore: modernize plugin dependencies Note that `org.eclipse.mylyn.github:org.eclipse.egit.github.core` in the current version is a signed jar hence signature gets removed during shading as otherwise it fails to load in Gerrit with: [2023-10-11T12:18:58.433+02:00] [main] WARN com.google.gerrit.server.plugins.PluginLoader : Cannot load plugin github-plugin java.lang.SecurityException: Invalid signature file digest for Manifest main attributes Change-Id: Ifed1f475d6f9c16be8ccc8f3b9cfc5891db9872b
diff --git a/github-oauth/pom.xml b/github-oauth/pom.xml index 4372d9c..1f23fbb 100644 --- a/github-oauth/pom.xml +++ b/github-oauth/pom.xml
@@ -21,7 +21,7 @@ <parent> <groupId>com.googlesource.gerrit.plugins.github</groupId> <artifactId>github-parent</artifactId> - <version>3.8.0</version> + <version>3.8.2</version> </parent> <artifactId>github-oauth</artifactId> <name>Gerrit Code Review - GitHub OAuth login</name> @@ -71,35 +71,35 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> + <version>3.1.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <version>4.1.0</version> + <version>6.0.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>20.0</version> + <version>32.1.2-jre</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.kohsuke</groupId> <artifactId>github-api</artifactId> - <version>1.315</version> + <version>1.316</version> </dependency> <dependency> <groupId>com.infradna.tool</groupId> <artifactId>bridge-method-injector</artifactId> - <version>1.23</version> + <version>1.29</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.4</version> + <version>4.5.2</version> <scope>provided</scope> </dependency> <dependency>
diff --git a/github-plugin/pom.xml b/github-plugin/pom.xml index b77cd4e..b44634a 100644 --- a/github-plugin/pom.xml +++ b/github-plugin/pom.xml
@@ -20,7 +20,7 @@ <parent> <artifactId>github-parent</artifactId> <groupId>com.googlesource.gerrit.plugins.github</groupId> - <version>3.8.0</version> + <version>3.8.2</version> </parent> <artifactId>github-plugin</artifactId> @@ -87,6 +87,19 @@ <goals> <goal>shade</goal> </goals> + <configuration> + <filters> + <filter> + <!-- is a signed jar hence the singature has to be removed during shading --> + <artifact>org.eclipse.mylyn.github:org.eclipse.egit.github.core</artifact> + <excludes> + <exclude>META-INF/*.SF</exclude> + <exclude>META-INF/*.DSA</exclude> + <exclude>META-INF/*.RSA</exclude> + </excludes> + </filter> + </filters> + </configuration> </execution> </executions> </plugin> @@ -108,7 +121,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> + <version>3.1.0</version> <scope>provided</scope> </dependency> <dependency> @@ -124,33 +137,33 @@ <dependency> <groupId>org.eclipse.mylyn.github</groupId> <artifactId>org.eclipse.egit.github.core</artifactId> - <version>1.3.1</version> + <version>6.1.0.202203080745-r</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.6</version> + <version>2.10.1</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.4</version> + <version>4.5.2</version> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>1.4.5-rc1</version> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> + <version>1.6.2</version> </dependency> <dependency> - <groupId>org.apache.commons</groupId> + <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>1.3.2</version> + <version>2.14.0</version> </dependency> <dependency> <groupId>commons-discovery</groupId> <artifactId>commons-discovery</artifactId> - <version>20040218.194635</version> + <version>0.5</version> </dependency> <dependency> <groupId>org.apache.velocity</groupId>
diff --git a/pom.xml b/pom.xml index 5d6b07e..c397629 100644 --- a/pom.xml +++ b/pom.xml
@@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlesource.gerrit.plugins.github</groupId> <artifactId>github-parent</artifactId> - <version>3.8.0</version> + <version>3.8.2</version> <name>Gerrit Code Review - GitHub integration</name> <url>http://www.gerritforge.com</url> <packaging>pom</packaging> @@ -255,7 +255,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> - <version>3.0.0</version> + <version>3.0.5</version> </plugin> </plugins> </reporting> @@ -292,13 +292,13 @@ <dependency> <groupId>com.ryanharter.auto.value</groupId> <artifactId>auto-value-gson</artifactId> - <version>1.3.0</version> + <version>1.3.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> - <version>1.18.22</version> + <version>1.18.30</version> <scope>provided</scope> </dependency> </dependencies> @@ -313,7 +313,7 @@ <dependency> <groupId>com.google.truth</groupId> <artifactId>truth</artifactId> - <version>1.1.4</version> + <version>1.1.5</version> <scope>test</scope> </dependency> </dependencies>