You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2020/05/02 11:20:43 UTC
[maven-shade-plugin] branch MSHADE-363 updated (3666fcd -> 0927436)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MSHADE-363
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git.
discard 3666fcd [MSHADE-363] add IT showing broken compatibility
new 0927436 [MSHADE-363] add IT showing broken compatibility
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (3666fcd)
\
N -- N -- N refs/heads/MSHADE-363 (0927436)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/resources/Message.properties | 36 +++++++++++-----------
1 file changed, 18 insertions(+), 18 deletions(-)
[maven-shade-plugin] 01/01: [MSHADE-363] add IT showing broken
compatibility
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MSHADE-363
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit 09274366f74b4f0b61ba4ad91d70ac9c29d05c50
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat May 2 11:31:51 2020 +0200
[MSHADE-363] add IT showing broken compatibility
---
src/it/projects/MSHADE-363_old-Transformer/pom.xml | 69 ++++++++++++++++++++++
.../src/main/resources/Message.properties | 18 ++++++
2 files changed, 87 insertions(+)
diff --git a/src/it/projects/MSHADE-363_old-Transformer/pom.xml b/src/it/projects/MSHADE-363_old-Transformer/pom.xml
new file mode 100644
index 0000000..8cfdd33
--- /dev/null
+++ b/src/it/projects/MSHADE-363_old-Transformer/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<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>
+
+ <groupId>org.apache.maven.its.shade.pp</groupId>
+ <artifactId>mshade-363</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>check non-breaking change to ResourceTransformer's API</name>
+ <description>support for Reproducible Builds in MSHADE-352 requires a new long time parameter to
+ void processResource( String resource, InputStream is, List<Relocator> relocators, long time )
+ breaking old maven-shade-plugin extensions implementing interface without this parameter
+ </description>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>@project.version@</version>
+ <dependencies>
+ <dependency><!-- adds an extra ResourceTransformer released a few years ago -->
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>1.5.22.RELEASE</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>use-extra-resource-transformer</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <transformers><!-- use the extra transformer that does not provide the new extra parameter for Reproducible Builds -->
+ <transformer implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
+ <resource>Message.properties</resource>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/it/projects/MSHADE-363_old-Transformer/src/main/resources/Message.properties b/src/it/projects/MSHADE-363_old-Transformer/src/main/resources/Message.properties
new file mode 100644
index 0000000..f94d1d0
--- /dev/null
+++ b/src/it/projects/MSHADE-363_old-Transformer/src/main/resources/Message.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+one = one