Fridrich Strba 2019-11-25 16:56:04 +00:00 committed by Git OBS Bridge
parent 20fa6d070b
commit a7655e2256
6 changed files with 51 additions and 44 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1035961b4d8119bfa56e04b009425e008f37e12017482fb473be4ff916b982c2
size 569602

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c636642705d56f22ee6a0f802e811efedd2e9f84526c7a10c8a88e59571e52f1
size 588951

View File

@ -1,5 +1,5 @@
--- maven-compiler-plugin-3.8.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-compiler-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100
+++ maven-compiler-plugin-3.8.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-compiler-plugin/plugin-help.xml 2019-04-01 10:49:48.537467091 +0200
--- maven-compiler-plugin-3.8.1/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-compiler-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100
+++ maven-compiler-plugin-3.8.1/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-compiler-plugin/plugin-help.xml 2019-11-25 17:47:55.264289561 +0100
@@ -0,0 +1,720 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin>
@ -721,9 +721,8 @@
+ </mojo>
+ </mojos>
+</plugin>
diff -urEbwBN maven-compiler-plugin-3.8.0.orig/src/main/filtered-resources/META-INF/maven/plugin.xml maven-compiler-plugin-3.8.0/src/main/filtered-resources/META-INF/maven/plugin.xml
--- maven-compiler-plugin-3.8.0/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100
+++ maven-compiler-plugin-3.8.0/src/main/filtered-resources/META-INF/maven/plugin.xml 2019-04-01 10:52:00.226118248 +0200
--- maven-compiler-plugin-3.8.1/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100
+++ maven-compiler-plugin-3.8.1/src/main/filtered-resources/META-INF/maven/plugin.xml 2019-11-25 17:48:57.728635290 +0100
@@ -0,0 +1,1396 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin>
@ -1883,19 +1882,19 @@ diff -urEbwBN maven-compiler-plugin-3.8.0.orig/src/main/filtered-resources/META-
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <type>jar</type>
+ <version>3.5.4</version>
+ <version>3.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ <type>jar</type>
+ <version>2.5.2</version>
+ <version>2.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <type>jar</type>
+ <version>3.1.0</version>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
@ -1925,13 +1924,13 @@ diff -urEbwBN maven-compiler-plugin-3.8.0.orig/src/main/filtered-resources/META-
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <type>jar</type>
+ <version>3.5.4</version>
+ <version>3.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-util</artifactId>
+ <type>jar</type>
+ <version>1.1.1</version>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
@ -1958,22 +1957,10 @@ diff -urEbwBN maven-compiler-plugin-3.8.0.orig/src/main/filtered-resources/META-
+ <version>any</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <type>jar</type>
+ <version>20.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <type>jar</type>
+ <version>4.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <type>jar</type>
+ <version>3.2.0</version>
+ <version>4.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
@ -1982,16 +1969,34 @@ diff -urEbwBN maven-compiler-plugin-3.8.0.orig/src/main/filtered-resources/META-
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <type>jar</type>
+ <version>3.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <type>jar</type>
+ <version>19.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-resolver-provider</artifactId>
+ <type>jar</type>
+ <version>3.5.4</version>
+ <version>3.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <type>jar</type>
+ <version>1.7.25</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-api</artifactId>
+ <type>jar</type>
+ <version>1.1.1</version>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
@ -2003,25 +2008,19 @@ diff -urEbwBN maven-compiler-plugin-3.8.0.orig/src/main/filtered-resources/META-
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-impl</artifactId>
+ <type>jar</type>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <type>jar</type>
+ <version>1.7.25</version>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-repository-metadata</artifactId>
+ <type>jar</type>
+ <version>3.5.4</version>
+ <version>3.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-spi</artifactId>
+ <type>jar</type>
+ <version>1.1.1</version>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
@ -2033,19 +2032,19 @@ diff -urEbwBN maven-compiler-plugin-3.8.0.orig/src/main/filtered-resources/META-
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model-builder</artifactId>
+ <type>jar</type>
+ <version>3.5.4</version>
+ <version>3.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-builder-support</artifactId>
+ <type>jar</type>
+ <version>3.5.4</version>
+ <version>3.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings-builder</artifactId>
+ <type>jar</type>
+ <version>3.5.4</version>
+ <version>3.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.plexus</groupId>
@ -2087,7 +2086,7 @@ diff -urEbwBN maven-compiler-plugin-3.8.0.orig/src/main/filtered-resources/META-
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <type>jar</type>
+ <version>6.2</version>
+ <version>7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.qdox</groupId>
@ -2117,7 +2116,7 @@ diff -urEbwBN maven-compiler-plugin-3.8.0.orig/src/main/filtered-resources/META-
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interpolation</artifactId>
+ <type>jar</type>
+ <version>1.24</version>
+ <version>1.25</version>
+ </dependency>
+ </dependencies>
+</plugin>

View File

@ -14,7 +14,7 @@
value="The Compiler Plugin is used to compile the sources of your project."/>
<property name="project.groupId" value="org.apache.maven.plugins"/>
<property name="project.artifactId" value="maven-compiler-plugin"/>
<property name="project.version" value="3.8.0"/>
<property name="project.version" value="3.8.1"/>
<property name="project.organization.name" value="The Apache Software Foundation"/>
<property name="spec.version" value="3.8"/>

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Nov 25 16:53:16 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Update to upstream version 3.8.1
- Modified patch:
* maven-compiler-plugin-bootstrap-resources.patch
+ Regenerate from the non-bootstrap build
-------------------------------------------------------------------
Thu Nov 21 20:20:18 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -23,7 +23,7 @@
%bcond_with bootstrap
%endif
%global base_name maven-compiler-plugin
Version: 3.8.0
Version: 3.8.1
Release: 0
Summary: Maven Compiler Plugin
License: Apache-2.0