You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2021/07/02 19:00:46 UTC
[sling-org-apache-sling-sitemap] 01/01: releng: don't redefine
plugins defined in parent
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/clean-up-pom
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-sitemap.git
commit a9120e0fac5a252bd281ef80b4dc7d14452f66e3
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Jul 2 21:00:31 2021 +0200
releng: don't redefine plugins defined in parent
add output timestamp property for reproducible builds
---
pom.xml | 24 +++-------------------
.../sitemap/impl/builder/SitemapImplTest.java | 2 +-
2 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 106ca19..0c9fbd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,14 +40,13 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <!-- necessary for reproducible builds, automatically updated with each release -->
+ <project.build.outputTimestamp>2020-07-02T15:10:15Z</project.build.outputTimestamp>
</properties>
<build>
<plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-baseline-maven-plugin</artifactId>
@@ -56,18 +55,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling-maven-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -104,11 +91,6 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.tracker</artifactId>
- <version>1.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>org.osgi.resource</artifactId>
<version>1.0.0</version>
</dependency>
diff --git a/src/test/java/org/apache/sling/sitemap/impl/builder/SitemapImplTest.java b/src/test/java/org/apache/sling/sitemap/impl/builder/SitemapImplTest.java
index 95c8a77..f0a8057 100644
--- a/src/test/java/org/apache/sling/sitemap/impl/builder/SitemapImplTest.java
+++ b/src/test/java/org/apache/sling/sitemap/impl/builder/SitemapImplTest.java
@@ -119,7 +119,7 @@ class SitemapImplTest extends AbstractBuilderTest {
// given
Writer throwingWriter = new Writer() {
@Override
- public void write(@NotNull char[] cbuf, int off, int len) throws IOException {
+ public void write(char[] cbuf, int off, int len) throws IOException {
throw new IOException();
}