Merge pull request #313 from fpapon/apache-pom

Upgrade to Apache pom 24 and make build reproductible
apache · Jul 25, 2021 · 0554a2d · 0554a2d
2 parents bdc7f45 + e425908
commit 0554a2d
Show file tree

Hide file tree

Showing 21 changed files with 44 additions and 8 deletions.
diff --git a/cache/pom.xml b/cache/pom.xml
@@ -45,6 +45,8 @@
                             org.apache.shiro.lang*;version="${shiro.osgi.importRange}",
                             *
                         </Import-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/config/core/pom.xml b/config/core/pom.xml
@@ -46,6 +46,8 @@
                             org.apache.shiro.lang*;version="${shiro.osgi.importRange}",
                             *
                         </Import-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/config/ogdl/pom.xml b/config/ogdl/pom.xml
@@ -61,6 +61,8 @@
                             org.apache.shiro.event*;version="${shiro.osgi.importRange}",
                             *
                         </Import-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/core/pom.xml b/core/pom.xml
@@ -82,6 +82,8 @@
                         <DynamicImport-Package>
                             org.apache.shiro.*
                         </DynamicImport-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/crypto/cipher/pom.xml b/crypto/cipher/pom.xml
@@ -46,6 +46,8 @@
                             org.apache.shiro.lang*;version="${shiro.osgi.importRange}",
                             *
                         </Import-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/crypto/core/pom.xml b/crypto/core/pom.xml
@@ -45,6 +45,8 @@
                             org.apache.shiro.lang*;version="${shiro.osgi.importRange}",
                             *
                         </Import-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/crypto/hash/pom.xml b/crypto/hash/pom.xml
@@ -46,6 +46,8 @@
                             org.apache.shiro.lang*;version="${shiro.osgi.importRange}",
                             *
                         </Import-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/crypto/support/hashes/argon2/pom.xml b/crypto/support/hashes/argon2/pom.xml
@@ -58,6 +58,8 @@
                             com.google.inject*;version="1.3",
                             *
                         </Import-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/crypto/support/hashes/bcrypt/pom.xml b/crypto/support/hashes/bcrypt/pom.xml
@@ -58,6 +58,8 @@
                             com.google.inject*;version="1.3",
                             *
                         </Import-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/event/pom.xml b/event/pom.xml
@@ -45,6 +45,8 @@
                             org.apache.shiro.lang*;version="${shiro.osgi.importRange}",
                             *
                         </Import-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/lang/pom.xml b/lang/pom.xml
@@ -68,6 +68,8 @@
                             javax.servlet.jsp*;resolution:=optional,
                             *
                         </Import-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>23</version>
+        <version>24</version>
     </parent>
 
     <groupId>org.apache.shiro</groupId>
@@ -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>
@@ -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>

diff --git a/support/aspectj/pom.xml b/support/aspectj/pom.xml
@@ -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>

diff --git a/support/ehcache/pom.xml b/support/ehcache/pom.xml
@@ -70,6 +70,8 @@
                             net.sf.ehcache*;version="[2.5, 3)",
                             *
                         </Import-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/support/guice/pom.xml b/support/guice/pom.xml
@@ -104,6 +104,8 @@
                             com.google.inject*;version="1.3",
                             *
                         </Import-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/support/hazelcast/pom.xml b/support/hazelcast/pom.xml
@@ -74,6 +74,8 @@
                             com.hazelcast*;version="${hazelcast.osgi.importRange}",
                             *
                         </Import-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/support/jaxrs/pom.xml b/support/jaxrs/pom.xml
@@ -115,6 +115,8 @@
                             org.apache.shiro*;version="${shiro.osgi.importRange}",
                             *
                         </Import-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/support/quartz/pom.xml b/support/quartz/pom.xml
@@ -70,6 +70,8 @@
                             org.quartz*;version="[1.7.2, 3)",
                             *
                         </Import-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/support/spring/pom.xml b/support/spring/pom.xml
@@ -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>

diff --git a/tools/hasher/pom.xml b/tools/hasher/pom.xml
@@ -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>
@@ -102,6 +102,8 @@
                             org.apache.shiro*;version="${shiro.osgi.importRange}",
                             *
                         </Import-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/web/pom.xml b/web/pom.xml
@@ -100,6 +100,8 @@
                             javax.servlet.jsp*;resolution:=optional,
                             *
                         </Import-Package>
+                        <_removeheaders>Bnd-LastModified</_removeheaders>
+                        <_reproducible>true</_reproducible>
                     </instructions>
                 </configuration>
             </plugin>