Skip to content
Commits on Source (11)
Show whitespace changes
Inline Side-by-side
debian/changelog
View file @ 8ea46c43
jboss-logging (3.4.0-1) unstable; urgency=medium
* New upstream version 3.4.0.
* Switch to debhelper-compat = 12.
* Declare compliance with Debian Policy 4.4.0.
* Remove get-orig-source target.
* Use canonical VCS URI.
* Drop disable-apiviz-plugin.patch.
* Drop SLF4j-1.7.patch. No longer needed.
-- Markus Koschany <apo@debian.org> Sat, 20 Jul 2019 03:21:28 +0200
jboss-logging (3.3.2-1) unstable; urgency=medium
* New upstream version 3.3.2.
......
debian/control
View file @ 8ea46c43
......@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.or
Uploaders:
Markus Koschany <apo@debian.org>
Build-Depends:
debhelper (>= 11),
debhelper-compat (= 12),
default-jdk,
default-jdk-doc,
libjboss-logmanager-java,
......@@ -14,9 +14,9 @@ Build-Depends:
libmaven-bundle-plugin-java,
libmaven-javadoc-plugin-java,
maven-debian-helper (>= 1.5)
Standards-Version: 4.1.3
Vcs-Git: https://anonscm.debian.org/git/pkg-java/jboss-logging.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jboss-logging.git
Standards-Version: 4.4.0
Vcs-Git: https://salsa.debian.org/java-team/jboss-logging.git
Vcs-Browser: https://salsa.debian.org/java-team/jboss-logging
Homepage: http://www.jboss.org
Package: libjboss-logging-java
......
debian/copyright
View file @ 8ea46c43
......@@ -3,11 +3,11 @@ Upstream-Name: JBoss Logging 3
Source: https://github.com/jboss-logging/jboss-logging
Files: *
Copyright: 2010-2015, Redhat, Inc.
Copyright: 2010-2019, Redhat, Inc.
License: Apache-2.0
Files: debian/*
Copyright: 2015-2018, Markus Koschany <apo@debian.org>
Copyright: 2015-2019, Markus Koschany <apo@debian.org>
License: Apache-2.0
License: Apache-2.0
......
debian/maven.properties
View file @ 8ea46c43
......@@ -2,4 +2,5 @@
# For example:
# maven.test.skip=true
project.build.sourceEncoding=UTF-8
maven.compiler.source=1.8
maven.compiler.target=1.8
debian/patches/SLF4j-1.7.patch deleted 100644 → 0
View file @ 3869ffef
From: Markus Koschany <apo@debian.org>
Date: Sun, 31 May 2015 13:49:55 +0200
Subject: SLF4j-1.7
This patch allows jboss-logging to compile with the latest version of SLF4j.
Forwarded: no
---
src/main/java/org/jboss/logging/Slf4jLoggerProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java b/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java
index c4893e9..3790b5d 100644
--- a/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java
+++ b/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java
@@ -62,7 +62,7 @@ final class Slf4jLoggerProvider extends AbstractLoggerProvider implements Logger
public Map<String, Object> getMdcMap() {
@SuppressWarnings({"unchecked"})
- final Map<String, Object> map = MDC.getCopyOfContextMap();
+ final Map<String, Object> map = (Map) MDC.getCopyOfContextMap();
return map == null ? Collections.<String, Object>emptyMap() : map;
}
}
debian/patches/disable-apiviz-plugin.patch deleted 100644 → 0
View file @ 3869ffef
From: Markus Koschany <apo@debian.org>
Date: Tue, 12 May 2015 15:12:25 +0200
Subject: disable apiviz plugin
Forwarded: not-needed
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 69eb428..f0bf132 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
<plugin>
<artifactId>maven-source-plugin</artifactId>
</plugin>
- <plugin>
+ <!--<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<detectJavaApiLink>false</detectJavaApiLink>
@@ -108,7 +108,7 @@
<link>http://java.sun.com/javase/6/docs/api/</link>
</links>
</configuration>
- </plugin>
+ </plugin>-->
<!-- Adding OSGI metadata to the JAR without changing the packaging type. -->
<plugin>
<artifactId>maven-jar-plugin</artifactId>
debian/patches/series deleted 100644 → 0
View file @ 3869ffef
disable-apiviz-plugin.patch
SLF4j-1.7.patch
debian/rules
View file @ 8ea46c43
......@@ -2,6 +2,3 @@
%:
dh $@ --buildsystem=maven
get-orig-source:
uscan --download-current-version --force-download
pom.xml
View file @ 8ea46c43
......@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>3.3.2.Final</version>
<version>3.4.0.Final</version>
<packaging>jar</packaging>
<name>JBoss Logging 3</name>
<url>http://www.jboss.org</url>
......@@ -18,7 +18,7 @@
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
<version>15</version>
<version>34</version>
</parent>
<licenses>
......@@ -32,16 +32,9 @@
<properties>
<!-- Dependency versions -->
<version.org.apache.log4j>1.2.16</version.org.apache.log4j>
<version.org.apache.logging.log4j>2.0</version.org.apache.logging.log4j>
<version.org.jboss.logmanager>1.5.2.Final</version.org.jboss.logmanager>
<version.org.sfl4j>1.7.2</version.org.sfl4j>
<!-- Plugin versions -->
<version.org.jboss.apiviz.apiviz>1.3.2.GA</version.org.jboss.apiviz.apiviz>
<!-- maven-compiler-plugin -->
<maven.compiler.target>1.6</maven.compiler.target>
<maven.compiler.source>1.6</maven.compiler.source>
<version.org.apache.logging.log4j>2.11.2</version.org.apache.logging.log4j>
<version.org.jboss.logmanager>2.1.9.Final</version.org.jboss.logmanager>
<version.org.sfl4j>1.7.25</version.org.sfl4j>
</properties>
<dependencies>
......@@ -89,26 +82,6 @@
<plugin>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<detectJavaApiLink>false</detectJavaApiLink>
<detectLinks>false</detectLinks>
<doclet>net.gleamynode.apiviz.APIviz</doclet>
<docletArtifact>
<groupId>org.jboss.apiviz</groupId>
<artifactId>apiviz</artifactId>
<version>${version.org.jboss.apiviz.apiviz}</version>
</docletArtifact>
<doctitle><![CDATA[JBoss Logging ]]>${project.version}</doctitle>
<header><![CDATA[JBoss Logging ]]>${project.version}</header>
<footer><![CDATA[JBoss Logging ]]>${project.version}</footer>
<bottom><![CDATA[<i>Copyright &#169; 2015 Red Hat, Inc.</i>]]></bottom>
<links>
<link>http://java.sun.com/javase/6/docs/api/</link>
</links>
</configuration>
</plugin>
<!-- Adding OSGI metadata to the JAR without changing the packaging type. -->
<plugin>
<artifactId>maven-jar-plugin</artifactId>
......
src/main/java/org/jboss/logging/Cause.java deleted 100644 → 0
View file @ 3869ffef
/*
* JBoss, Home of Professional Open Source.
*
* Copyright 2010 Red Hat, Inc., and individual contributors
* as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.logging;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.CLASS;
/**
* Mark a parameter as being the "exception cause" parameter rather than a positional format parameter.
*
* @deprecated Use org.jboss.logging.annotations.Cause provided in module org.jboss.logging:jboss-logging-annotations
*
* @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
*/
@Retention(CLASS)
@Target(PARAMETER)
@Documented
@Deprecated
public @interface Cause {
}
src/main/java/org/jboss/logging/Field.java deleted 100644 → 0
View file @ 3869ffef
/*
* JBoss, Home of Professional Open Source.
*
* Copyright 2011 Red Hat, Inc., and individual contributors
* as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.logging;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.CLASS;
/**
* Indicate that a method parameter value should be applied to a field on the resultant exception object.
*
* @deprecated Use org.jboss.logging.annotations.Field provided in module org.jboss.logging:jboss-logging-annotations
*
* @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
*/
@Retention(CLASS)
@Target(PARAMETER)
@Documented
@Deprecated
public @interface Field {
/**
* The field name. If not specified, the parameter name is assumed to be the field name.
*
* @return the field name
*/
String name() default "";
}
src/main/java/org/jboss/logging/FormatWith.java deleted 100644 → 0
View file @ 3869ffef
/*
* JBoss, Home of Professional Open Source.
*
* Copyright 2011 Red Hat, Inc., and individual contributors
* as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.logging;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.CLASS;
/**
* Indicate that the given parameter should be wrapped with a formatting object of the given class. The class
* must have a one-argument constructor which unambiguously accepts a value of this parameter's type. The resultant
* object will be passed in as a parameter to the underlying format type; thus its {@link Object#toString() toString()}
* method will be invoked (or, if the format style is {@link org.jboss.logging.Message.Format#PRINTF PRINTF}, the
* object may implement {@link java.util.Formattable Formattable} to get extra functionality).
*
* @deprecated Use org.jboss.logging.annotations.FormatWith provided in module org.jboss.logging:jboss-logging-annotations
*
* @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
*/
@Target(PARAMETER)
@Retention(CLASS)
@Documented
@Deprecated
public @interface FormatWith {
/**
* The class of the formatting object to use.
*
* @return the class
*/
Class<?> value();
}
src/main/java/org/jboss/logging/LogMessage.java deleted 100644 → 0
View file @ 3869ffef
/*
* JBoss, Home of Professional Open Source.
*
* Copyright 2010 Red Hat, Inc., and individual contributors
* as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.logging;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.CLASS;
/**
* A typed logger method. Indicates that this method will log the associated {@link Message} to the logger system, as
* opposed to being a simple message lookup.
*
* @deprecated Use org.jboss.logging.annotations.LogMessage provided in module org.jboss.logging:jboss-logging-annotations
*
* @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
*/
@Retention(CLASS)
@Target(METHOD)
@Documented
@Deprecated
public @interface LogMessage {
/**
* The log level at which this message should be logged. Defaults to {@code INFO}.
*
* @return the log level
*/
Logger.Level level() default Logger.Level.INFO;
/**
* The logging class name to use for this message, if any.
*
* @return the logging class name
*/
Class<?> loggingClass() default Void.class;
}
src/main/java/org/jboss/logging/LoggingClass.java deleted 100644 → 0
View file @ 3869ffef
/*
* JBoss, Home of Professional Open Source.
*
* Copyright 2010 Red Hat, Inc., and individual contributors
* as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.logging;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.CLASS;
/**
* Mark a parameter as specifying the name of the logging class to use. The parameter
* may have a type of {@link String} or {@link Class}.
*
* @deprecated Use org.jboss.logging.annotations.LoggingClass provided in module org.jboss.logging:jboss-logging-annotations
*
* @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
*/
@Retention(CLASS)
@Target(PARAMETER)
@Documented
@Deprecated
public @interface LoggingClass {
}
src/main/java/org/jboss/logging/Message.java deleted 100644 → 0
View file @ 3869ffef
/*
* JBoss, Home of Professional Open Source.
*
* Copyright 2010 Red Hat, Inc., and individual contributors
* as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.logging;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.CLASS;
/**
* Assigns a message string to a resource method. The method arguments are used to supply the positional parameter
* values for the method.
*
* @deprecated Use org.jboss.logging.annotations.Message provided in module org.jboss.logging:jboss-logging-annotations
*
* @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
*/
@Target(METHOD)
@Retention(CLASS)
@Documented
@Deprecated
public @interface Message {
/**
* Indicates that this message has no ID.
*/
int NONE = 0;
/**
* Indicates that this message should inherit the ID from another message with the same name.
*/
int INHERIT = -1;
/**
* The message ID number. Only one message with a given name may specify an ID other than {@link #INHERIT}.
*
* @return the message ID number
*/
int id() default INHERIT;
/**
* The default format string of this message.
*
* @return the format string
*/
String value();
/**
* The format type of this method (defaults to {@link Format#PRINTF}).
*
* @return the format type
*/
Format format() default Format.PRINTF;
/**
* The possible format types.
*/
enum Format {
/**
* A {@link java.util.Formatter}-type format string.
*/
PRINTF,
/**
* A {@link java.text.MessageFormat}-type format string.
*/
MESSAGE_FORMAT,
/**
* Indicates the message should not be formatted.
*/
NO_FORMAT,
}
}
src/main/java/org/jboss/logging/MessageBundle.java deleted 100644 → 0
View file @ 3869ffef
/*
* JBoss, Home of Professional Open Source.
*
* Copyright 2010 Red Hat, Inc., and individual contributors
* as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.logging;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.CLASS;
/**
* Signify that an interface is a message bundle interface.
*
* @deprecated Use org.jboss.logging.annotations.MessageBundle provided in module org.jboss.logging:jboss-logging-annotations
*
* @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
*/
@Target(TYPE)
@Retention(CLASS)
@Documented
@Deprecated
public @interface MessageBundle {
/**
* Get the project code for messages that have an associated code. If no project code is associated
* with this bundle, specify {@code ""} (the empty string).
*
* @return the project code
*/
String projectCode();
}
src/main/java/org/jboss/logging/MessageLogger.java deleted 100644 → 0
View file @ 3869ffef
/*
* JBoss, Home of Professional Open Source.
*
* Copyright 2010 Red Hat, Inc., and individual contributors
* as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.logging;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.CLASS;
/**
* Signify that an interface is a typed logger interface. A message logger interface may optionally extend other message logger
* interfaces and message bundle interfaces (see {@link MessageBundle}, as well as the {@link org.jboss.logging.BasicLogger} interface.
*
* @deprecated Use org.jboss.logging.annotations.MessageLogger provided in module org.jboss.logging:jboss-logging-annotations
*
* @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
*/
@Retention(CLASS)
@Target(TYPE)
@Documented
@Deprecated
public @interface MessageLogger {
/**
* Get the project code for messages that have an associated code. If no project code is associated
* with this logger, specify {@code ""} (the empty string).
*
* @return the project code
*/
String projectCode();
}
src/main/java/org/jboss/logging/Param.java deleted 100644 → 0
View file @ 3869ffef
/*
* JBoss, Home of Professional Open Source.
*
* Copyright 2011 Red Hat, Inc., and individual contributors
* as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.logging;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.CLASS;
/**
* Identifies a parameter is to be used for constructing an exception and excluded from the formatting of the message.
* <p/>
* Parameters will be order-matched first, then type-matched to resolve ambiguity. If a match fails an error should
* occur.
* <p/>
* The {@link #value()} option will allow an optional class to be specified which will have to match the exact type of
* the parameter in question, to enable unambiguous resolution. The value must be the fully qualified class name.
*
* @deprecated Use org.jboss.logging.annotations.Param provided in module org.jboss.logging:jboss-logging-annotations
*
* @author <a href="mailto:jperkins@redhat.com">James R. Perkins</a>
*/
@Target(PARAMETER)
@Retention(CLASS)
@Documented
@Deprecated
public @interface Param {
/**
* Defines an exact class the parameter must match for unambiguous resolution.
*
* @return the class the parameter must match.
*/
Class<?> value() default Object.class;
}
src/main/java/org/jboss/logging/ParameterConverter.java
View file @ 8ea46c43
......@@ -26,13 +26,15 @@ import java.util.Locale;
*
* @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
* @param <I> the input type
* @deprecated this is not currently used anywhere and no replacement will be created
*/
@Deprecated
public interface ParameterConverter<I> {
/**
* Convert the parameter to its string or string-equivalent representation. The returned value will be passed in
* as a parameter to either a {@link java.text.MessageFormat} or {@link java.util.Formatter} instance, depending
* on the setting of {@link Message#format()}.
* on the setting of {@code org.jboss.logging.annotation.Message.format}.
*
* @param locale the locale
* @param parameter the parameter
......