fix: rename slf4j-api-1 to slf4j-api-2

Signed-off-by: sebthom <sebthom@users.noreply.github.com>
lastnpe · Sep 30, 2024 · 24abb73 · 24abb73
1 parent 346e460
commit 24abb73
Show file tree

Hide file tree

Showing 48 changed files with 5 additions and 8 deletions.
diff --git a/libraries/pom.xml b/libraries/pom.xml
@@ -35,7 +35,7 @@
     <module>junit-5</module>
     <module>mockito-5</module>
     <module>osgi-core-8</module>
-    <module>slf4j-api-1</module>
+    <module>slf4j-api-2</module>
     <module>spring-6</module>
     <module>xstream-1</module>
   </modules>

diff --git a/libraries/slf4j-api-1/eea-generator.properties b/libraries/slf4j-api-1/eea-generator.properties
diff --git a/libraries/slf4j-api-2/eea-generator.properties b/libraries/slf4j-api-2/eea-generator.properties
@@ -0,0 +1 @@
+packages.include=org.slf4j
diff --git a/.../slf4j-api-1/org/slf4j/ILoggerFactory.eea → .../slf4j-api-2/org/slf4j/ILoggerFactory.eea b/.../slf4j-api-1/org/slf4j/ILoggerFactory.eea → .../slf4j-api-2/org/slf4j/ILoggerFactory.eea
diff --git a/.../slf4j-api-1/org/slf4j/IMarkerFactory.eea → .../slf4j-api-2/org/slf4j/IMarkerFactory.eea b/.../slf4j-api-1/org/slf4j/IMarkerFactory.eea → .../slf4j-api-2/org/slf4j/IMarkerFactory.eea
diff --git a/libraries/slf4j-api-1/org/slf4j/Logger.eea → libraries/slf4j-api-2/org/slf4j/Logger.eea b/libraries/slf4j-api-1/org/slf4j/Logger.eea → libraries/slf4j-api-2/org/slf4j/Logger.eea
diff --git a/...s/slf4j-api-1/org/slf4j/LoggerFactory.eea → ...s/slf4j-api-2/org/slf4j/LoggerFactory.eea b/...s/slf4j-api-1/org/slf4j/LoggerFactory.eea → ...s/slf4j-api-2/org/slf4j/LoggerFactory.eea
diff --git a/libraries/slf4j-api-1/org/slf4j/MDC.eea → libraries/slf4j-api-2/org/slf4j/MDC.eea b/libraries/slf4j-api-1/org/slf4j/MDC.eea → libraries/slf4j-api-2/org/slf4j/MDC.eea
diff --git a/libraries/slf4j-api-1/org/slf4j/Marker.eea → libraries/slf4j-api-2/org/slf4j/Marker.eea b/libraries/slf4j-api-1/org/slf4j/Marker.eea → libraries/slf4j-api-2/org/slf4j/Marker.eea
diff --git a/...s/slf4j-api-1/org/slf4j/MarkerFactory.eea → ...s/slf4j-api-2/org/slf4j/MarkerFactory.eea b/...s/slf4j-api-1/org/slf4j/MarkerFactory.eea → ...s/slf4j-api-2/org/slf4j/MarkerFactory.eea
diff --git a/...1/org/slf4j/event/DefaultLoggingEvent.eea → ...2/org/slf4j/event/DefaultLoggingEvent.eea b/...1/org/slf4j/event/DefaultLoggingEvent.eea → ...2/org/slf4j/event/DefaultLoggingEvent.eea
diff --git a/...-api-1/org/slf4j/event/EventConstants.eea → ...-api-2/org/slf4j/event/EventConstants.eea b/...-api-1/org/slf4j/event/EventConstants.eea → ...-api-2/org/slf4j/event/EventConstants.eea
diff --git a/.../org/slf4j/event/EventRecordingLogger.eea → .../org/slf4j/event/EventRecordingLogger.eea b/.../org/slf4j/event/EventRecordingLogger.eea → .../org/slf4j/event/EventRecordingLogger.eea
diff --git a/...4j-api-1/org/slf4j/event/KeyValuePair.eea → ...4j-api-2/org/slf4j/event/KeyValuePair.eea b/...4j-api-1/org/slf4j/event/KeyValuePair.eea → ...4j-api-2/org/slf4j/event/KeyValuePair.eea
diff --git a/...ies/slf4j-api-1/org/slf4j/event/Level.eea → ...ies/slf4j-api-2/org/slf4j/event/Level.eea b/...ies/slf4j-api-1/org/slf4j/event/Level.eea → ...ies/slf4j-api-2/org/slf4j/event/Level.eea
diff --git a/...4j-api-1/org/slf4j/event/LoggingEvent.eea → ...4j-api-2/org/slf4j/event/LoggingEvent.eea b/...4j-api-1/org/slf4j/event/LoggingEvent.eea → ...4j-api-2/org/slf4j/event/LoggingEvent.eea
diff --git a/...rg/slf4j/event/SubstituteLoggingEvent.eea → ...rg/slf4j/event/SubstituteLoggingEvent.eea b/...rg/slf4j/event/SubstituteLoggingEvent.eea → ...rg/slf4j/event/SubstituteLoggingEvent.eea
diff --git a/...pi-1/org/slf4j/helpers/AbstractLogger.eea → ...pi-2/org/slf4j/helpers/AbstractLogger.eea b/...pi-1/org/slf4j/helpers/AbstractLogger.eea → ...pi-2/org/slf4j/helpers/AbstractLogger.eea
diff --git a/...i-1/org/slf4j/helpers/BasicMDCAdapter.eea → ...i-2/org/slf4j/helpers/BasicMDCAdapter.eea b/...i-1/org/slf4j/helpers/BasicMDCAdapter.eea → ...i-2/org/slf4j/helpers/BasicMDCAdapter.eea
diff --git a/...j-api-1/org/slf4j/helpers/BasicMarker.eea → ...j-api-2/org/slf4j/helpers/BasicMarker.eea b/...j-api-1/org/slf4j/helpers/BasicMarker.eea → ...j-api-2/org/slf4j/helpers/BasicMarker.eea
diff --git a/.../org/slf4j/helpers/BasicMarkerFactory.eea → .../org/slf4j/helpers/BasicMarkerFactory.eea b/.../org/slf4j/helpers/BasicMarkerFactory.eea → .../org/slf4j/helpers/BasicMarkerFactory.eea
diff --git a/...i-1/org/slf4j/helpers/FormattingTuple.eea → ...i-2/org/slf4j/helpers/FormattingTuple.eea b/...i-1/org/slf4j/helpers/FormattingTuple.eea → ...i-2/org/slf4j/helpers/FormattingTuple.eea
diff --git a/...rg/slf4j/helpers/LegacyAbstractLogger.eea → ...rg/slf4j/helpers/LegacyAbstractLogger.eea b/...rg/slf4j/helpers/LegacyAbstractLogger.eea → ...rg/slf4j/helpers/LegacyAbstractLogger.eea
diff --git a/.../org/slf4j/helpers/MarkerIgnoringBase.eea → .../org/slf4j/helpers/MarkerIgnoringBase.eea b/.../org/slf4j/helpers/MarkerIgnoringBase.eea → .../org/slf4j/helpers/MarkerIgnoringBase.eea
diff --git a/...-1/org/slf4j/helpers/MessageFormatter.eea → ...-2/org/slf4j/helpers/MessageFormatter.eea b/...-1/org/slf4j/helpers/MessageFormatter.eea → ...-2/org/slf4j/helpers/MessageFormatter.eea
diff --git a/...f4j-api-1/org/slf4j/helpers/NOPLogger.eea → ...f4j-api-2/org/slf4j/helpers/NOPLogger.eea b/...f4j-api-1/org/slf4j/helpers/NOPLogger.eea → ...f4j-api-2/org/slf4j/helpers/NOPLogger.eea
diff --git a/...-1/org/slf4j/helpers/NOPLoggerFactory.eea → ...-2/org/slf4j/helpers/NOPLoggerFactory.eea b/...-1/org/slf4j/helpers/NOPLoggerFactory.eea → ...-2/org/slf4j/helpers/NOPLoggerFactory.eea
diff --git a/...api-1/org/slf4j/helpers/NOPMDCAdapter.eea → ...api-2/org/slf4j/helpers/NOPMDCAdapter.eea b/...api-1/org/slf4j/helpers/NOPMDCAdapter.eea → ...api-2/org/slf4j/helpers/NOPMDCAdapter.eea
diff --git a/...j/helpers/NOP_FallbackServiceProvider.eea → ...j/helpers/NOP_FallbackServiceProvider.eea b/...j/helpers/NOP_FallbackServiceProvider.eea → ...j/helpers/NOP_FallbackServiceProvider.eea
diff --git a/...rg/slf4j/helpers/NormalizedParameters.eea → ...rg/slf4j/helpers/NormalizedParameters.eea b/...rg/slf4j/helpers/NormalizedParameters.eea → ...rg/slf4j/helpers/NormalizedParameters.eea
diff --git a/...lf4j-api-1/org/slf4j/helpers/Reporter.eea → ...lf4j-api-2/org/slf4j/helpers/Reporter.eea b/...lf4j-api-1/org/slf4j/helpers/Reporter.eea → ...lf4j-api-2/org/slf4j/helpers/Reporter.eea
diff --git a/...-api-1/org/slf4j/helpers/Slf4jEnvUtil.eea → ...-api-2/org/slf4j/helpers/Slf4jEnvUtil.eea b/...-api-1/org/slf4j/helpers/Slf4jEnvUtil.eea → ...-api-2/org/slf4j/helpers/Slf4jEnvUtil.eea
diff --git a/...-1/org/slf4j/helpers/SubstituteLogger.eea → ...-2/org/slf4j/helpers/SubstituteLogger.eea b/...-1/org/slf4j/helpers/SubstituteLogger.eea → ...-2/org/slf4j/helpers/SubstituteLogger.eea
diff --git a/...slf4j/helpers/SubstituteLoggerFactory.eea → ...slf4j/helpers/SubstituteLoggerFactory.eea b/...slf4j/helpers/SubstituteLoggerFactory.eea → ...slf4j/helpers/SubstituteLoggerFactory.eea
diff --git a/...f4j/helpers/SubstituteServiceProvider.eea → ...f4j/helpers/SubstituteServiceProvider.eea b/...f4j/helpers/SubstituteServiceProvider.eea → ...f4j/helpers/SubstituteServiceProvider.eea
diff --git a/.../slf4j/helpers/ThreadLocalMapOfStacks.eea → .../slf4j/helpers/ThreadLocalMapOfStacks.eea b/.../slf4j/helpers/ThreadLocalMapOfStacks.eea → .../slf4j/helpers/ThreadLocalMapOfStacks.eea
diff --git a/...es/slf4j-api-1/org/slf4j/helpers/Util.eea → ...es/slf4j-api-2/org/slf4j/helpers/Util.eea b/...es/slf4j-api-1/org/slf4j/helpers/Util.eea → ...es/slf4j-api-2/org/slf4j/helpers/Util.eea
diff --git a/...i-1/org/slf4j/spi/CallerBoundaryAware.eea → ...i-2/org/slf4j/spi/CallerBoundaryAware.eea b/...i-1/org/slf4j/spi/CallerBoundaryAware.eea → ...i-2/org/slf4j/spi/CallerBoundaryAware.eea
diff --git a/.../slf4j/spi/DefaultLoggingEventBuilder.eea → .../slf4j/spi/DefaultLoggingEventBuilder.eea b/.../slf4j/spi/DefaultLoggingEventBuilder.eea → .../slf4j/spi/DefaultLoggingEventBuilder.eea
diff --git a/...i-1/org/slf4j/spi/LocationAwareLogger.eea → ...i-2/org/slf4j/spi/LocationAwareLogger.eea b/...i-1/org/slf4j/spi/LocationAwareLogger.eea → ...i-2/org/slf4j/spi/LocationAwareLogger.eea
diff --git a/...i-1/org/slf4j/spi/LoggerFactoryBinder.eea → ...i-2/org/slf4j/spi/LoggerFactoryBinder.eea b/...i-1/org/slf4j/spi/LoggerFactoryBinder.eea → ...i-2/org/slf4j/spi/LoggerFactoryBinder.eea
diff --git a/...api-1/org/slf4j/spi/LoggingEventAware.eea → ...api-2/org/slf4j/spi/LoggingEventAware.eea b/...api-1/org/slf4j/spi/LoggingEventAware.eea → ...api-2/org/slf4j/spi/LoggingEventAware.eea
diff --git a/...i-1/org/slf4j/spi/LoggingEventBuilder.eea → ...i-2/org/slf4j/spi/LoggingEventBuilder.eea b/...i-1/org/slf4j/spi/LoggingEventBuilder.eea → ...i-2/org/slf4j/spi/LoggingEventBuilder.eea
diff --git a/.../slf4j-api-1/org/slf4j/spi/MDCAdapter.eea → .../slf4j-api-2/org/slf4j/spi/MDCAdapter.eea b/.../slf4j-api-1/org/slf4j/spi/MDCAdapter.eea → .../slf4j-api-2/org/slf4j/spi/MDCAdapter.eea
diff --git a/...i-1/org/slf4j/spi/MarkerFactoryBinder.eea → ...i-2/org/slf4j/spi/MarkerFactoryBinder.eea b/...i-1/org/slf4j/spi/MarkerFactoryBinder.eea → ...i-2/org/slf4j/spi/MarkerFactoryBinder.eea
diff --git a/.../org/slf4j/spi/NOPLoggingEventBuilder.eea → .../org/slf4j/spi/NOPLoggingEventBuilder.eea b/.../org/slf4j/spi/NOPLoggingEventBuilder.eea → .../org/slf4j/spi/NOPLoggingEventBuilder.eea
diff --git a/...-1/org/slf4j/spi/SLF4JServiceProvider.eea → ...-2/org/slf4j/spi/SLF4JServiceProvider.eea b/...-1/org/slf4j/spi/SLF4JServiceProvider.eea → ...-2/org/slf4j/spi/SLF4JServiceProvider.eea
diff --git a/libraries/slf4j-api-1/pom.xml → libraries/slf4j-api-2/pom.xml b/libraries/slf4j-api-1/pom.xml → libraries/slf4j-api-2/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -10,8 +10,8 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>slf4j-api-1-eea</artifactId>
-  <name>EEA :: SLF4J API 1.x</name>
+  <artifactId>slf4j-api-2-eea</artifactId>
+  <name>EEA :: SLF4J API 2.x</name>
 
   <!-- Do NOT use a <version> of the JAR for which this is an EEA here,
        but version the EEA itself.  Put the version of the lib into