Skip to content

Commit

Permalink
Try to hardcode asm
Browse files Browse the repository at this point in the history
  • Loading branch information
@cunningt
cunningt committed Apr 29, 2022
1 parent 24a2d12 commit d84cad7
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 67 deletions.
12 changes: 9 additions & 3 deletions google-oauth-client-servlet/pom.xml
View file
@@ -1,10 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client-parent</artifactId>
<version>1.22.0</version>
<version>1.22.0.redhat-00002</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>google-oauth-client-servlet</artifactId>
Expand Down Expand Up @@ -61,6 +60,13 @@
<configuration>
<verbose>true</verbose>
</configuration>
<dependencies>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>3.3.1.redhat-13</version>
</dependency>
</dependencies>
<executions>
<execution>
<phase>process-classes</phase>
Expand Down
110 changes: 46 additions & 64 deletions pom.xml
View file
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
<version>7.0.0.redhat-6</version>
</parent>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client-parent</artifactId>
<version>1.22.0</version>
<version>1.22.0.redhat-00002</version>
<packaging>pom</packaging>
<name>Parent for the Google OAuth Client Library for Java</name>

Expand Down Expand Up @@ -86,7 +85,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<version>4.8.2-redhat-1</version>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
Expand All @@ -113,6 +112,16 @@
<artifactId>jsr305</artifactId>
<version>${project.jsr305.version}</version>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>3.3.1</version>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm-parent</artifactId>
<version>3.3.1</version>
</dependency>
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo2-api</artifactId>
Expand All @@ -127,7 +136,7 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<scope>provided</scope>
<version>1.6</version>
<version>1.6.0.redhat-5</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
Expand Down Expand Up @@ -163,27 +172,27 @@
<dependency>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client</artifactId>
<version>${project.version}</version>
<version>1.22.0.redhat-00002</version>
</dependency>
<dependency>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client-appengine</artifactId>
<version>${project.version}</version>
<version>1.22.0.redhat-00002</version>
</dependency>
<dependency>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client-servlet</artifactId>
<version>${project.version}</version>
<version>1.22.0.redhat-00002</version>
</dependency>
<dependency>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client-java6</artifactId>
<version>${project.version}</version>
<version>1.22.0.redhat-00002</version>
</dependency>
<dependency>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client-jetty</artifactId>
<version>${project.version}</version>
<version>1.22.0.redhat-00002</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
Expand Down Expand Up @@ -226,70 +235,37 @@
This is a workaround for known bug: https://issues.sonatype.org/browse/CENTRALSRV-35 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.1</version>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
<useReleaseProfile>true</useReleaseProfile>
<arguments>-Psonatype-oss-release ${arguments}</arguments>
</configuration>
</plugin>
<!--This plugin configuration is present to override the configuration specified in the
parent's pom.xml.
This is a workaround for known bug: https://issues.sonatype.org/browse/CENTRALSRV-35 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.1</version>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
<useReleaseProfile>true</useReleaseProfile>
<arguments>-Psonatype-oss-release ${arguments}</arguments>
</configuration>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2</version>
</plugin>
<!--This plugin configuration is present to override the configuration specified in the
parent's pom.xml.
This is a workaround for known bug: https://issues.sonatype.org/browse/CENTRALSRV-35 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.1</version>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
<useReleaseProfile>true</useReleaseProfile>
<arguments>-Psonatype-oss-release ${arguments}</arguments>
</configuration>
<artifactId>maven-clean-plugin</artifactId>
<version>2.4.1</version>
</plugin>
<!--This plugin configuration is present to override the configuration specified in the
parent's pom.xml.
This is a workaround for known bug: https://issues.sonatype.org/browse/CENTRALSRV-35 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.1</version>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
<useReleaseProfile>true</useReleaseProfile>
<arguments>-Psonatype-oss-release ${arguments}</arguments>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.4.1</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>



</configuration>
</plugin>
<!--This plugin configuration is present to override the configuration specified in the
parent's pom.xml.
This is a workaround for known bug: https://issues.sonatype.org/browse/CENTRALSRV-35 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.1</version>
</plugin>
Expand Down Expand Up @@ -362,26 +338,24 @@
<version>2.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<version>2.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<version>1.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.7</version>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
Expand All @@ -399,7 +373,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<ignore />
</action>
</pluginExecution>
<pluginExecution>
Expand All @@ -412,7 +386,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<ignore />
</action>
</pluginExecution>
<pluginExecution>
Expand All @@ -425,13 +399,18 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>



<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->

</plugins>
</pluginManagement>
<plugins>
Expand Down Expand Up @@ -549,7 +528,7 @@
<project.appengine.version>1.7.7</project.appengine.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.http.version>1.22.0</project.http.version>
<project.jsr305.version>1.3.9</project.jsr305.version>
<project.jsr305.version>1.3.9.redhat-00003</project.jsr305.version>
<project.gson.version>2.1</project.gson.version>
<project.jackson-core-asl.version>1.9.11</project.jackson-core-asl.version>
<project.jackson-core2.version>2.1.3</project.jackson-core2.version>
Expand All @@ -564,3 +543,6 @@
<project.transaction-api.version>1.1</project.transaction-api.version>
</properties>
</project>
<!--
Modified by POM Manipulation Extension for Maven 4.7 ( SHA: 3f0f9dad )
-->

0 comments on commit d84cad7

Please sign in to comment.