successful multi-release build

qos-ch · Aug 31, 2019 · 05583d3 · 05583d3
1 parent 79f5955
commit 05583d3
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 57 deletions.
diff --git a/logback-access/pom.xml b/logback-access/pom.xml
@@ -16,6 +16,10 @@
   <name>Logback Access Module</name>
   <description>logback-access module</description>
 
+  <properties>
+    <module-name>ch.qos.logback.access</module-name>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>ch.qos.logback</groupId>

diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml
@@ -24,12 +24,10 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-core</artifactId>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <scope>compile</scope>
     </dependency>
 <!--     <dependency>
       <groupId>org.slf4j</groupId>
@@ -101,7 +99,6 @@
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>javax.mail-api</artifactId>
-      <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -112,7 +109,6 @@
     <dependency>
       <groupId>org.codehaus.janino</groupId>
       <artifactId>janino</artifactId>
-      <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -184,6 +180,11 @@
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
+            <manifestEntries>
+                <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>	
+                <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
+                <Multi-Release>true</Multi-Release>
+            </manifestEntries>
             <manifestFile>
               ${project.build.outputDirectory}/META-INF/MANIFEST.MF
             </manifestFile>

diff --git a/logback-classic/src/main/java9/module-info.java b/logback-classic/src/main/java9/module-info.java
diff --git a/logback-core/pom.xml b/logback-core/pom.xml
@@ -16,7 +16,6 @@
   <name>Logback Core Module</name>
   <description>logback-core module</description>
 
-
   <properties>
     <module-name>ch.qos.logback.core</module-name>
   </properties>
@@ -91,15 +90,18 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
+
         <configuration>
           <archive>
             <manifestEntries>
               <Multi-Release>true</Multi-Release>
+              <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>	
+              <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
             </manifestEntries>
             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
           </archive>
-
         </configuration>
+
         <executions>
           <execution>
             <id>bundle-test-jar</id>

diff --git a/logback-core/src/main/java9/module-info.java b/logback-core/src/main/java9/module-info.java
diff --git a/pom.xml b/pom.xml
@@ -65,7 +65,11 @@
     <tomcat.version>8.5.9</tomcat.version>
     <jetty.version>8.2.0.v20160908</jetty.version>
     <!--<jetty.version>9.2.9.v20150224</jetty.version>-->
+<<<<<<< HEAD
     <compiler-plugin.version>3.8.0</compiler-plugin.version> <!-- 3.6.1, 3.7.0 -->
+=======
+    <compiler-plugin.version>3.8.0</compiler-plugin.version> 
+>>>>>>> 40788f36e... successful multi-release build
     <jansi.version>1.9</jansi.version>
     <javadoc.plugin.version>2.10.4</javadoc.plugin.version>
     <!--<javadoc.plugin.version>3.0.0</javadoc.plugin.version>-->
@@ -337,24 +341,7 @@
         	<configuration>
         		<lifecycleMappingMetadata>
         			<pluginExecutions>
-        				<pluginExecution>
-        					<pluginExecutionFilter>
-        						<groupId>
-        							org.apache.maven.plugins
-        						</groupId>
-        						<artifactId>
-        							maven-toolchains-plugin
-        						</artifactId>
-        						<versionRange>[1.1,)</versionRange>
-        						<goals>
-        							<goal>toolchain</goal>
-        						</goals>
-        					</pluginExecutionFilter>
-        					<action>
-        						<ignore></ignore>
-        					</action>
-        				</pluginExecution>
-        			</pluginExecutions>
+           			</pluginExecutions>
         		</lifecycleMappingMetadata>
         	</configuration>
         </plugin>
@@ -367,9 +354,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-
         <executions>
-
           <execution>
             <id>default-compile</id>
             <goals>
@@ -379,14 +364,14 @@
               <source>${jdk.version}</source>
               <target>${jdk.version}</target>
             </configuration>
-          </execution>
-
-          <execution>
+          </execution> 
+          <!--  requires module-name to be defined in submodule/pom.xml -->
+          <execution>                      
             <id>module-compile</id>
             <phase>compile</phase>
             <goals>
               <goal>compile</goal>
-            </goals>
+            </goals>          
             <configuration>
               <release>9</release>
               <compileSourceRoots>
@@ -400,9 +385,7 @@
             </configuration>
           </execution>
         </executions>
-
       </plugin>
-
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -636,31 +619,6 @@
       </build>
     </profile>
 
-    <profile>
-      <id>travis</id>
-      <activation>
-        <property>
-          <name>env.TRAVIS</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-toolchains-plugin</artifactId>
-            <version>1.1</version>
-            <executions>
-              <execution>
-                <id>toolchain</id>
-                <phase>none</phase>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
     <profile>
       <id>cobertura</id>
       <build>