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.

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

Upgrade to Apache pom 24 and make build reproductible #313

Merged
merged 3 commits into from
Jul 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions cache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
org.apache.shiro.lang*;version="${shiro.osgi.importRange}",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions config/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
org.apache.shiro.lang*;version="${shiro.osgi.importRange}",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions config/ogdl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@
org.apache.shiro.event*;version="${shiro.osgi.importRange}",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@
<DynamicImport-Package>
org.apache.shiro.*
</DynamicImport-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions crypto/cipher/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
org.apache.shiro.lang*;version="${shiro.osgi.importRange}",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions crypto/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
org.apache.shiro.lang*;version="${shiro.osgi.importRange}",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions crypto/hash/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
org.apache.shiro.lang*;version="${shiro.osgi.importRange}",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions crypto/support/hashes/argon2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
com.google.inject*;version="1.3",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions crypto/support/hashes/bcrypt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
com.google.inject*;version="1.3",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions event/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
org.apache.shiro.lang*;version="${shiro.osgi.importRange}",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions lang/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@
javax.servlet.jsp*;resolution:=optional,
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
10 changes: 3 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>23</version>
<version>24</version>
</parent>

<groupId>org.apache.shiro</groupId>
Expand Down Expand Up @@ -69,6 +69,7 @@
<shiro.previousVersion>1.7.1</shiro.previousVersion>
<!-- Replaced by the build number plugin at build time: -->
<buildNumber>${user.name}-${maven.build.timestamp}</buildNumber>
<project.build.outputTimestamp>2021-07-16T23:08:15Z</project.build.outputTimestamp>
<jacoco.skip>true</jacoco.skip>
<!--suppress CheckTagEmptyBody -->
<surefire.argLine></surefire.argLine>
Expand Down Expand Up @@ -550,18 +551,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
<configuration>
<archive>
<manifest>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<!--suppress MavenModelInspection -->
<SCM-Revision>${buildNumber}</SCM-Revision>
<SCM-url>${project.scm.url}</SCM-url>
</manifestEntries>
</archive>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions support/aspectj/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@
org.aspectj*;version="[1.6.0, 2.0.0)",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions support/ehcache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
net.sf.ehcache*;version="[2.5, 3)",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions support/guice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@
com.google.inject*;version="1.3",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions support/hazelcast/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
com.hazelcast*;version="${hazelcast.osgi.importRange}",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions support/jaxrs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@
org.apache.shiro*;version="${shiro.osgi.importRange}",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions support/quartz/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
org.quartz*;version="[1.7.2, 3)",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions support/spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@
org.springframework*;version="[4.0.0, 6.0.0)",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
4 changes: 3 additions & 1 deletion tools/hasher/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.1.12.RELEASE</version>
<version>2.3.12.RELEASE</version>
<executions>
<execution>
<goals>
Expand All @@ -102,6 +102,8 @@
org.apache.shiro*;version="${shiro.osgi.importRange}",
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 2 additions & 0 deletions web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@
javax.servlet.jsp*;resolution:=optional,
*
</Import-Package>
<_removeheaders>Bnd-LastModified</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
</configuration>
</plugin>
Expand Down