You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2021/01/16 20:03:53 UTC
[maven-artifact-plugin] branch public created (now fa0518e)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch public
in repository https://gitbox.apache.org/repos/asf/maven-artifact-plugin.git.
at fa0518e make less public
This branch includes the following new commits:
new fa0518e make less public
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-artifact-plugin] 01/01: make less public
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch public
in repository https://gitbox.apache.org/repos/asf/maven-artifact-plugin.git
commit fa0518ed50629fa602d1b6efc73dca88d77c6979
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sat Jan 16 15:03:31 2021 -0500
make less public
---
.../plugins/artifact/buildinfo/BuildInfoWriter.java | 16 ++++++++--------
.../maven/plugins/artifact/buildinfo/BuildinfoMojo.java | 5 +++--
.../maven/plugins/artifact/buildinfo/DigestHelper.java | 2 +-
.../maven/plugins/artifact/buildinfo/MavenVersion.java | 5 +++--
.../maven/plugins/artifact/buildinfo/PluginUtil.java | 4 ++--
.../artifact/buildinfo/ReferenceBuildinfoUtil.java | 6 +++---
6 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildInfoWriter.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildInfoWriter.java
index 320c6b6..ea5d003 100644
--- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildInfoWriter.java
+++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildInfoWriter.java
@@ -36,7 +36,7 @@ import org.codehaus.plexus.util.PropertyUtils;
/**
* Buildinfo content writer.
*/
-public class BuildInfoWriter
+class BuildInfoWriter
{
private final Log log;
private final PrintWriter p;
@@ -52,7 +52,7 @@ public class BuildInfoWriter
this.mono = mono;
}
- public void printHeader( MavenProject project, MavenProject aggregate )
+ void printHeader( MavenProject project, MavenProject aggregate )
{
p.println( "# https://reproducible-builds.org/docs/jvm/" );
p.println( "buildinfo.version=1.0-SNAPSHOT" );
@@ -119,7 +119,7 @@ public class BuildInfoWriter
}
}
- public void printArtifacts( MavenProject project )
+ void printArtifacts( MavenProject project )
throws MojoExecutionException
{
if ( project.getArtifact() == null )
@@ -195,7 +195,7 @@ public class BuildInfoWriter
return path.toString();
}
- public void printFile( String prefix, File file )
+ void printFile( String prefix, File file )
throws MojoExecutionException
{
printFile( prefix, file, file.getName() );
@@ -210,7 +210,7 @@ public class BuildInfoWriter
p.println( prefix + ".checksums.sha512=" + DigestHelper.calculateSha512( file ) );
}
- public Map<Artifact, String> getArtifacts()
+ Map<Artifact, String> getArtifacts()
{
return artifacts;
}
@@ -222,7 +222,7 @@ public class BuildInfoWriter
* @return output properties
* @throws MojoExecutionException
*/
- public static Properties loadOutputProperties( File buildinfo )
+ static Properties loadOutputProperties( File buildinfo )
throws MojoExecutionException
{
try
@@ -243,12 +243,12 @@ public class BuildInfoWriter
}
}
- public boolean getIgnoreJavadoc()
+ boolean getIgnoreJavadoc()
{
return ignoreJavadoc;
}
- public void setIgnoreJavadoc( boolean ignoreJavadoc )
+ void setIgnoreJavadoc( boolean ignoreJavadoc )
{
this.ignoreJavadoc = ignoreJavadoc;
}
diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildinfoMojo.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildinfoMojo.java
index 1eb8979..b704fa5 100644
--- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildinfoMojo.java
+++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildinfoMojo.java
@@ -64,13 +64,13 @@ public class BuildinfoMojo
* The Maven project.
*/
@Parameter( defaultValue = "${project}", readonly = true )
- protected MavenProject project;
+ private MavenProject project;
/**
* The reactor projects.
*/
@Parameter( defaultValue = "${reactorProjects}", required = true, readonly = true )
- protected List<MavenProject> reactorProjects;
+ private List<MavenProject> reactorProjects;
/**
* Location of the generated buildinfo file.
@@ -149,6 +149,7 @@ public class BuildinfoMojo
@Component
private ArtifactRepositoryLayout artifactRepositoryLayout;
+ @Override
public void execute()
throws MojoExecutionException
{
diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/DigestHelper.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/DigestHelper.java
index 2710911..82b7714 100644
--- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/DigestHelper.java
+++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/DigestHelper.java
@@ -31,7 +31,7 @@ import java.security.NoSuchAlgorithmException;
/**
* Helper to calculate sha512.
*/
-public class DigestHelper
+class DigestHelper
{
static String calculateSha512( File file )
throws MojoExecutionException
diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/MavenVersion.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/MavenVersion.java
index 88002b3..9b22d72 100644
--- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/MavenVersion.java
+++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/MavenVersion.java
@@ -33,7 +33,8 @@ import java.util.Properties;
* in CLIReportingUtils.
* @see org.apache.maven.cli.CLIReportingUtils
*/
-public class MavenVersion
+
+class MavenVersion
{
static String createMavenVersionString()
{
@@ -95,7 +96,7 @@ public class MavenVersion
return properties;
}
- public static String formatTimestamp( long timestamp )
+ private static String formatTimestamp( long timestamp )
{
SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ssXXX" );
return sdf.format( new Date( timestamp ) );
diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/PluginUtil.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/PluginUtil.java
index 369dd8d..d19ed94 100644
--- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/PluginUtil.java
+++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/PluginUtil.java
@@ -28,9 +28,9 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
* Plugin utility to detect if install or deploy is skipped in a build.
*/
-public class PluginUtil
+class PluginUtil
{
- public static boolean isSkip( MavenProject project )
+ static boolean isSkip( MavenProject project )
{
return isSkip( project, "install" ) || isSkip( project, "deploy" );
}
diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/ReferenceBuildinfoUtil.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/ReferenceBuildinfoUtil.java
index 25f301e..cba3448 100644
--- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/ReferenceBuildinfoUtil.java
+++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/ReferenceBuildinfoUtil.java
@@ -57,7 +57,7 @@ import java.util.jar.Manifest;
/**
* Utility to download or generate reference buildinfo.
*/
-public class ReferenceBuildinfoUtil
+class ReferenceBuildinfoUtil
{
private static final Set<String> JAR_TYPES;
@@ -88,7 +88,7 @@ public class ReferenceBuildinfoUtil
private final RepositorySystemSession repoSession;
- public ReferenceBuildinfoUtil( Log log, File referenceDir, Map<Artifact, String> artifacts,
+ ReferenceBuildinfoUtil( Log log, File referenceDir, Map<Artifact, String> artifacts,
ArtifactFactory artifactFactory, RepositorySystem repoSystem,
RepositorySystemSession repoSession )
{
@@ -100,7 +100,7 @@ public class ReferenceBuildinfoUtil
this.repoSession = repoSession;
}
- public File downloadOrCreateReferenceBuildinfo( RemoteRepository repo, MavenProject project, File buildinfoFile,
+ File downloadOrCreateReferenceBuildinfo( RemoteRepository repo, MavenProject project, File buildinfoFile,
boolean mono )
throws MojoExecutionException
{