[Git][java-team/libminlog-java][master] 7 commits: Removed the -java-doc package
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Mon Sep 30 08:28:02 BST 2024
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libminlog-java
Commits:
e5bbefe9 by Emmanuel Bourg at 2024-09-30T09:20:19+02:00
Removed the -java-doc package
- - - - -
fa480c86 by Emmanuel Bourg at 2024-09-30T09:20:37+02:00
Standards-Version updated to 4.7.0
- - - - -
cd190293 by Emmanuel Bourg at 2024-09-30T09:20:43+02:00
Switch to debhelper level 13
- - - - -
168f7e42 by Emmanuel Bourg at 2024-09-30T09:20:50+02:00
Use salsa.debian.org Vcs-* URLs
- - - - -
97068d47 by Emmanuel Bourg at 2024-09-30T09:25:08+02:00
New upstream version 1.3.1
- - - - -
a878e779 by Emmanuel Bourg at 2024-09-30T09:25:08+02:00
Update upstream source from tag 'upstream/1.3.1'
Update to upstream version '1.3.1'
with Debian dir 954ae1e67253c9df08aff345c342355f325cebd7
- - - - -
0c8d8359 by Emmanuel Bourg at 2024-09-30T09:27:07+02:00
New upstream release (1.3.1)
- - - - -
11 changed files:
- .classpath
- + .settings/org.eclipse.jdt.core.prefs
- + CONTRIBUTING.md
- debian/changelog
- − debian/compat
- debian/control
- − debian/libminlog-java-doc.install
- debian/maven.ignoreRules
- debian/rules
- pom.xml
- src/com/esotericsoftware/minlog/Log.java
Changes:
=====================================
.classpath
=====================================
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**/.svn/*" kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="output" path="bin"/>
</classpath>
=====================================
.settings/org.eclipse.jdt.core.prefs
=====================================
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
=====================================
CONTRIBUTING.md
=====================================
@@ -0,0 +1,7 @@
+Project license(s): 3-Clause BSD License
+
+* You will only Submit Contributions where You have authored 100% of the content.
+
+* You will only Submit Contributions to which You have the necessary rights. This means that if You are employed You have received the necessary permissions from Your employer to make the Contributions.
+
+* Whatever content You Contribute will be provided under the Project License(s).
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+libminlog-java (1.3.1-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ * Removed the -java-doc package
+ * Standards-Version updated to 4.7.0
+ * Switch to debhelper level 13
+ * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 30 Sep 2024 09:25:58 +0200
+
libminlog-java (1.3.0-1) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-10
=====================================
debian/control
=====================================
@@ -4,14 +4,13 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Damien Raude-Morvan <drazzib at debian.org>
Build-Depends:
- debhelper (>= 10),
+ debhelper-compat (= 13),
default-jdk,
libmaven-bundle-plugin-java,
- libmaven-javadoc-plugin-java,
maven-debian-helper
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libminlog-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libminlog-java.git
+Standards-Version: 4.7.0
+Vcs-Git: https://salsa.debian.org/java-team/libminlog-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libminlog-java
Homepage: https://github.com/EsotericSoftware/minlog
Package: libminlog-java
@@ -28,21 +27,3 @@ Description: minimal Java logging library
very efficient at runtime.
* Extremely lightweight The entire project consists of a single Java file
with ~100 non-comment lines of code.
-
-Package: libminlog-java-doc
-Architecture: all
-Section: doc
-Depends: ${maven:DocDepends}, ${misc:Depends}
-Recommends: ${maven:DocOptionalDepends}
-Description: minimal Java logging library - doc
- MinLog is a Java logging library. Key features:
- * Zero overhead Logging statements below a given level can
- be automatically removed by javac at compile time.
- This means applications can have detailed trace and debug logging
- without having any impact on the finished product.
- * Simple and efficient The API is concise and the code is
- very efficient at runtime.
- * Extremely lightweight The entire project consists of a single Java file
- with ~100 non-comment lines of code.
- .
- This package contains the Javadoc API
=====================================
debian/libminlog-java-doc.install deleted
=====================================
@@ -1,2 +0,0 @@
-
-target/apidocs/* usr/share/doc/libminlog-java/api
=====================================
debian/maven.ignoreRules
=====================================
@@ -1,4 +1,5 @@
junit junit * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
org.apache.maven.plugins maven-release-plugin * * * *
org.apache.maven.plugins maven-source-plugin * * * *
=====================================
debian/rules
=====================================
@@ -2,6 +2,3 @@
%:
dh $@
-
-get-orig-source:
- uscan --force-download
=====================================
pom.xml
=====================================
@@ -9,7 +9,7 @@
<groupId>com.esotericsoftware</groupId>
<artifactId>minlog</artifactId>
- <version>1.3.0</version>
+ <version>1.3.1</version>
<packaging>bundle</packaging>
<name>MinLog</name>
@@ -18,8 +18,8 @@
<licenses>
<license>
- <name>New BSD License</name>
- <url>http://www.opensource.org/licenses/bsd-license.php</url>
+ <name>3-Clause BSD License</name>
+ <url>https://opensource.org/licenses/BSD-3-Clause</url>
<distribution>repo</distribution>
</license>
</licenses>
@@ -34,9 +34,9 @@
<scm>
<url>https://github.com/EsotericSoftware/minlog</url>
- <connection>scm:git:https://github.com/EsotericSoftware/minlog.git</connection>
- <developerConnection>scm:git:https://github.com/EsotericSoftware/minlog.git</developerConnection>
- <tag>minlog-1.3.0</tag>
+ <connection>scm:git:git at github.com:EsotericSoftware/minlog.git</connection>
+ <developerConnection>scm:git:git at github.com:EsotericSoftware/minlog.git</developerConnection>
+ <tag>HEAD</tag>
</scm>
<build>
@@ -71,6 +71,10 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <!-- required for java8, so that javadoc errors don't fail the build -->
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
@@ -90,6 +94,9 @@
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
+ <manifestEntries>
+ <Automatic-Module-Name>com.esotericsoftware.minlog</Automatic-Module-Name>
+ </manifestEntries>
</archive>
</configuration>
</plugin>
=====================================
src/com/esotericsoftware/minlog/Log.java
=====================================
@@ -3,12 +3,9 @@ package com.esotericsoftware.minlog;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.Date;
-/**
- * A low overhead, lightweight logging system.
- * @author Nathan Sweet <misc at n4te.com>
- */
+/** A low overhead, lightweight logging system.
+ * @author Nathan Sweet <misc at n4te.com> */
public class Log {
/** No logging at all. */
static public final int LEVEL_NONE = 6;
@@ -23,10 +20,8 @@ public class Log {
/** Trace messages. A lot of information is logged, so this level is usually only needed when debugging a problem. */
static public final int LEVEL_TRACE = 1;
- /**
- * The level of messages that will be logged. Compiling this and the booleans below as "final" will cause the compiler to
- * remove all "if (Log.info) ..." type statements below the set level.
- */
+ /** The level of messages that will be logged. Compiling this and the booleans below as "final" will cause the compiler to
+ * remove all "if (Log.info) ..." type statements below the set level. */
static private int level = LEVEL_INFO;
/** True when the ERROR level will be logged. */
@@ -40,9 +35,7 @@ public class Log {
/** True when the TRACE level will be logged. */
static public boolean TRACE = level <= LEVEL_TRACE;
- /**
- * Sets the level to log. If a version of this class is being used that has a final log level, this has no affect.
- */
+ /** Sets the level to log. If a version of this class is being used that has a final log level, this has no affect. */
static public void set (int level) {
// Comment out method contents when compiling fixed level JARs.
Log.level = level;
@@ -77,9 +70,7 @@ public class Log {
set(LEVEL_TRACE);
}
- /**
- * Sets the logger that will write the log messages.
- */
+ /** Sets the logger that will write the log messages. */
static public void setLogger (Logger logger) {
Log.logger = logger;
}
@@ -169,17 +160,15 @@ public class Log {
private Log () {
}
- /**
- * Performs the actual logging. Default implementation logs to System.out. Extended and use {@link Log#logger} set to handle
- * logging differently.
- */
+ /** Performs the actual logging. Default implementation logs to System.out. Extended and use {@link Log#logger} set to handle
+ * logging differently. */
static public class Logger {
- private long firstLogTime = new Date().getTime();
+ private final long firstLogTime = System.currentTimeMillis();
public void log (int level, String category, String message, Throwable ex) {
StringBuilder builder = new StringBuilder(256);
- long time = new Date().getTime() - firstLogTime;
+ long time = System.currentTimeMillis() - firstLogTime;
long minutes = time / (1000 * 60);
long seconds = time / (1000) % 60;
if (minutes <= 9) builder.append('0');
@@ -224,9 +213,7 @@ public class Log {
print(builder.toString());
}
- /**
- * Prints the message to System.out. Called by the default implementation of {@link #log(int, String, String, Throwable)}.
- */
+ /** Prints the message to System.out. Called by the default implementation of {@link #log(int, String, String, Throwable)}. */
protected void print (String message) {
System.out.println(message);
}
View it on GitLab: https://salsa.debian.org/java-team/libminlog-java/-/compare/6505fdc268d215c2788ff6b13d15e39a978cf677...0c8d8359afead2b9a23fcabdc44e306a7cf24fbb
--
View it on GitLab: https://salsa.debian.org/java-team/libminlog-java/-/compare/6505fdc268d215c2788ff6b13d15e39a978cf677...0c8d8359afead2b9a23fcabdc44e306a7cf24fbb
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20240930/df96630e/attachment.htm>
More information about the pkg-java-commits
mailing list