Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MSHADE-363 add ReproducibleResourceTransformer to restore compatibility #47

Merged
merged 3 commits into from
May 14, 2020
Merged

MSHADE-363 add ReproducibleResourceTransformer to restore compatibility #47

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51bbf72
[MSHADE-363] add IT showing broken compatibility
hboutemy May 2, 2020
229f4d7
[MSHADE-363] add ReproducibleResourceTransformer to keep compatibility
hboutemy May 3, 2020
4f83ae6
[MSHADE-363] IT to check new Reproducible transformer with old plugin
hboutemy May 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[MSHADE-363] add IT showing broken compatibility
  • Loading branch information
@hboutemy
hboutemy committed May 14, 2020
commit 51bbf72e195e34229a1d3ebba2f9608255068a9d
69 changes: 69 additions & 0 deletions src/it/projects/MSHADE-363_old-Transformer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:https://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:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http:https://maven.apache.org/POM/4.0.0 http:https://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&lt;Relocator&gt; 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>
18 changes: 18 additions & 0 deletions src/it/projects/MSHADE-363_old-Transformer/src/main/resources/Message.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:https://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