Skip to content
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: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
java: [8, 11, 17, 21, 25]
java: [17, 20, 21, 25]
fail-fast: false

runs-on: ${{ matrix.os }}
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ GA: [![Github Action master branch status](https://github.com/apache/creadur-ten

[![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://develocity.apache.org/scans?search.buildToolType=maven&search.rootProjectNames=Apache%20Tentacles&search.timeZoneId=Europe%2FBerlin)

# Running with at least JDK8
# Running with at least JDK 17

The tool will download all the archives from a staging repo, unpack
them and create a little report of what is there.
Expand Down Expand Up @@ -80,10 +80,10 @@ also be unpacked.
## Reports

The "main" report is currently called `archives.html` and will list
all of the top-level binaires, their LICENSE and NOTICE files and any
all of the top-level binaries, their LICENSE and NOTICE files and any
LICENSE and NOTICE files of any binaries they may contain.

Validation of the output at this point is all still manual. One of
Validation of the output at this point is all still manual. One of
the first improvements would be to automatically flag any binaries
that:

Expand All @@ -105,7 +105,7 @@ collect any LICENSE file text from any binaries contained in the
foo.zip. Well call these "sub" LICENSES for simplicity.

Some attempt is made to figure out if the text from sub LICENSE files
are contained in the declared LICENSE file. If the sub license text
are contained in the declared LICENSE file. If the sublicense text
is contained in the declared LICENSE file it is not listed as
Undeclared.

Expand All @@ -118,12 +118,12 @@ declared.
Functions identical to the previously described LICENSE page with
identical matching.

Note on the code, this all could probably be abstracted. We probably
Note on the code, this all could probably be abstracted. We probably
don't need separate License and Notice classes.

### foo.zip.contents

The unpacked contents of the foo.zip as described above. Can be nice
The unpacked contents of the foo.zip as described above. Can be nice
to be able to browse around the zip and look for any jars that might
have LICENSE or NOTICE requirements but were overlooked.

Expand Down
47 changes: 19 additions & 28 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@
<artifactId>log4j-core</artifactId>
<version>${loggerVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<version>${loggerVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
Expand Down Expand Up @@ -86,10 +91,10 @@
<currentSnapshotTentaclesVersion>0.2-SNAPSHOT</currentSnapshotTentaclesVersion>
<previousTentaclesVersion>0.1</previousTentaclesVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<javaVersion>1.8</javaVersion>
<javaVersion>17</javaVersion>
<httpClientVersion>4.5.14</httpClientVersion>
<loggerVersion>2.26.0</loggerVersion>
<apacheRatVersion>0.17</apacheRatVersion>
<apacheRatVersion>0.18</apacheRatVersion>
<!-- taken from https://maven.apache.org/guides/mini/guide-reproducible-builds.html, updated by maven-release-plugin -->
<project.build.outputTimestamp>2022-10-22T23:25:45Z</project.build.outputTimestamp>
<maven.compiler.source>${javaVersion}</maven.compiler.source>
Expand Down Expand Up @@ -131,11 +136,16 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.15.0</version>
<configuration>
<release>${javaVersion}</release>
<source>${javaVersion}</source>
<target>${javaVersion}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.6.2</version>
<version>3.6.3</version>
<executions>
<execution>
<!-- This checks the bytecode version of the dependencies transitively -->
Expand All @@ -149,7 +159,7 @@
<maxJdkVersion>${javaVersion}</maxJdkVersion>
</enforceBytecodeVersion>
<requireMavenVersion>
<version>3.0.5</version>
<version>3.9</version>
</requireMavenVersion>
</rules>
<fail>true</fail>
Expand Down Expand Up @@ -235,7 +245,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.21.0</version>
<version>3.22.0</version>
<configuration>
<outputEncoding>${project.build.sourceEncoding}</outputEncoding>
<inputEncoding>${project.build.sourceEncoding}</inputEncoding>
Expand Down Expand Up @@ -305,13 +315,11 @@
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
<!-- Later versions require Java 1.6+ -->
<version>3.28.0</version>
<configuration>
<linkXRef>true</linkXRef>
<sourceEncoding>utf-8</sourceEncoding>
<minimumTokens>100</minimumTokens>
<targetJdk>${target.jdk}</targetJdk>
<targetJdk>${javaVersion}</targetJdk>
<excludes>
<exclude>**/generated/**/*.java</exclude>
<exclude>**/target/clover/**/*.java</exclude>
Expand All @@ -332,12 +340,11 @@
</reportSet>
</reportSets>
</plugin>
<!-- Disabled until https://github.com/apache/maven-changelog-plugin/issues/200 is fixed
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changelog-plugin</artifactId>
<version>2.3</version>
</plugin-->
<version>3.0.0-M2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
Expand Down Expand Up @@ -427,7 +434,7 @@
<licenses>
<license>
<name>Apache License, Version 2</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
<comments>An OSI approved open source license.</comments>
</license>
Expand All @@ -436,20 +443,4 @@
<name>Apache Software Foundation</name>
<url>https://www.apache.org</url>
</organization>
<profiles>
<profile>
<id>maven.compiler.release</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<properties>
<!--
Note that this cannot use our ${javaVersion} property, so it must
be changed manually when we decide to move to a higher version of
Java
-->
<maven.compiler.release>8</maven.compiler.release>
</properties>
</profile>
</profiles>
</project>
3 changes: 3 additions & 0 deletions src/changes/changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ The <action> type attribute can be add,update,fix,remove.
</release>
-->
<release version="0.2-SNAPSHOT" date="xxxx-yy-zz" description="Current SNAPSHOT - release to be done">
<action issue="TENTACLES-25" type="add" dev="pottlinger">
Migrated to JDK 17 and updated the RAT plugin to version 0.18. Support for JDK 8 has been dropped.
</action>
<action issue="TENTACLES-24" type="add" dev="pottlinger">
Enable reproducible build and keep a changing timestamp for webpage generation.
</action>
Expand Down
18 changes: 7 additions & 11 deletions src/main/java/org/apache/creadur/tentacles/Templates.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@
*/
package org.apache.creadur.tentacles;

import java.util.Properties;

import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.runtime.log.CommonsLogLogChute;

public final class Templates {
import java.util.Properties;

public final class Templates {
private final IOSystem ioSystem;
private final VelocityEngine engine;
private final TentaclesResources tentaclesResources;
Expand All @@ -31,16 +29,14 @@ public Templates(final Platform platform) {
this.ioSystem = platform.getIoSystem();
this.tentaclesResources = platform.getTentaclesResources();
final Properties properties = new Properties();
properties.setProperty("file.resource.loader.cache", "true");
properties.setProperty("resource.loader", "file, class");
properties.setProperty("class.resource.loader.description",
properties.setProperty("resource.loader.class.cache", "true");
properties.setProperty("resource.loaders", "class");
properties.setProperty("resource.loader.class.description",
"Velocity Classpath Resource Loader");
properties
.setProperty("class.resource.loader.class",
.setProperty("resource.loader.class.class",
"org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
properties.setProperty("runtime.log.logsystem.class",
CommonsLogLogChute.class.getName());
properties.setProperty("runtime.log.logsystem.commons.logging.name",
properties.setProperty("runtime.log.name",
Templates.class.getName());

this.engine = new VelocityEngine();
Expand Down
2 changes: 1 addition & 1 deletion src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
</menu>
<menu ref="modules"/>
<menu ref="reports"/>
<footer>Copyright &amp;copy; 2014-2025 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
<footer>Copyright &amp;copy; 2014-2026 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
Apache Creadur, Creadur, Apache RAT, Apache Tentacles, Apache Whisker, Apache and the ASF logo are trademarks
of The Apache Software Foundation.
Oracle and Java are registered trademarks of Oracle and/or its affiliates.
Expand Down
Loading