preparing release 1.3.0-alpha5

qos-ch · Oct 11, 2019 · 241d1e7 · 241d1e7
1 parent 2c1e06a
commit 241d1e7
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 306 deletions.
diff --git a/logback-access/pom.xml b/logback-access/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>ch.qos.logback</groupId>
     <artifactId>logback-parent</artifactId>
-    <version>1.3.0-alpha5-SNAPSHOT</version>
+    <version>1.3.0-alpha5</version>
   </parent>
 
   <artifactId>logback-access</artifactId>

diff --git a/logback-classic/.gitignore b/logback-classic/.gitignore
@@ -1,3 +1,4 @@
 bundle/
 lib/
-felix-cache/
+felix-cache/
+bin/
diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>ch.qos.logback</groupId>
     <artifactId>logback-parent</artifactId>
-    <version>1.3.0-alpha5-SNAPSHOT</version>
+    <version>1.3.0-alpha5</version>
   </parent>
 
   <artifactId>logback-classic</artifactId>

diff --git a/logback-core/pom.xml b/logback-core/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>ch.qos.logback</groupId>
     <artifactId>logback-parent</artifactId>
-    <version>1.3.0-alpha5-SNAPSHOT</version>
+    <version>1.3.0-alpha5</version>
   </parent>
 
   <artifactId>logback-core</artifactId>

diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>ch.qos.logback</groupId>
     <artifactId>logback-parent</artifactId>
-    <version>1.3.0-alpha5-SNAPSHOT</version>
+    <version>1.3.0-alpha5</version>
   </parent>
 
   <artifactId>logback-examples</artifactId>

diff --git a/logback-site/pom.xml b/logback-site/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>ch.qos.logback</groupId>
     <artifactId>logback-parent</artifactId>
-    <version>1.3.0-alpha5-SNAPSHOT</version>
+    <version>1.3.0-alpha5</version>
   </parent>
 
   <artifactId>logback-site</artifactId>

diff --git a/logback-site/src/site/pages/download.html b/logback-site/src/site/pages/download.html
@@ -23,56 +23,25 @@
       <script type="text/javascript" src="templates/right.js" ></script>
     </div>
 
-    <div id="popupContents">
-      <p style="font-size: large; padding-bottom: 5px; ">Would you like to subscribe to the
-      QOS.CH announcements mailing list?</p>
-
-
-      <p>The list is reserved for announcements related to QOS.CH
-      projects such as cal10n, logback, mistletoe and SLF4J.</p>
-      <br/>
-      <table width="100%">
-        <tr>
-          <td><a class="popupLink" id="announce">Yes, I'd like to subscribe.</a></td>
-          <td><a class="popupLink" id="popupContentsClose">No, thanks.</a></td>
-        </tr>
-      </table>
-    </div>
-    <div id="backgroundPopup"></div>
-
-
     <div id="content">
 
-      <h2>Latest STABLE version</h2>
-
-      <p>Download logback version 1.2.3 including <i>full source code</i>,
-      class files and documentation in ZIP or TAR.GZ format: </p>
-
-      <ul>
-        <li><a href="dist/logback-1.2.3.zip">logback-1.2.3.zip</a></li>
-        <li><a href="dist/logback-1.2.3.tar.gz">logback-1.2.3.tar.gz</a></li>
-		  </ul>
+    <h2>Latest STABLE version</h2>
 
-      <h2>EXPERIMENTAL version compatible with SLF4J 1.8.x (Jigsaw/Java9 modular)</h2>
+    <p>The latest stable logback is version
+    ${latest.stable.version}. </p>
+
+    <h2>EXPERIMENTAL/UNSTABLE requiring SLF4J version 2.0.x</h2>
+
+    <p>The current actively developped version is ${project.version}.</p>
 
-      <p>Download logback version ${project.version} including <i>full source code</i>,
-      class files and documentation in ZIP or TAR.GZ format: </p>
+    <h2>Binaries in Maven central</h2>
+
+    <p>Logback artifacts such as <em>.jar</em>, <em>.sources.jar</em>
+    and <em>javadoc.jar</em> files can be downloaded from <a
+    href="http://repo2.maven.org/maven2/ch/qos/logback">Maven
+    central</a> under the <code>ch.qos.logback</code> groupId.</p>
+
 
-		  <p>Logback modules are available as downloads including full
-		    source code, class files and documentation.
-		  </p>
-
-		  <ul>
-        <li><a href="dist/logback-${project.version}.zip">logback-${project.version}.zip</a></li>
-        <li><a href="dist/logback-${project.version}.tar.gz">logback-${project.version}.tar.gz</a></li>
-		  </ul>
-
-
-    <p>If you wish to download an older version of logback, please
-    refer to the <a href="http://logback.qos.ch/dist/">distributions
-    directory</a>.</p>
-
-
     <h3>logback-beagle: an Eclipse plug-in for viewing logs</h3>
 
     <p><a href="beagle/index.html"><img style="float:left;

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>ch.qos.logback</groupId>
   <artifactId>logback-parent</artifactId>
-  <version>1.3.0-alpha5-SNAPSHOT</version>
+  <version>1.3.0-alpha5</version>
   <packaging>pom</packaging>
 
   <name>Logback-Parent</name>
@@ -34,8 +34,8 @@
   </licenses>
 
   <scm>
-    <url>https://github.com/ceki/logback</url>
-    <connection>git@github.com:ceki/logback.git</connection>
+    <url>https://github.com/qos-ch/logback</url>
+    <connection>scm:git@github.com:qos-ch/logback.git</connection>
   </scm>
 
   <modules>
@@ -47,6 +47,7 @@
   </modules>
 
   <properties>
+    <latest.stable.version>1.2.3</latest.stable.version>
     <jdk.version>8</jdk.version>
     <maven.compiler.source>${jdk.version}</maven.compiler.source>
     <maven.compiler.target>${jdk.version}</maven.compiler.target>
@@ -56,9 +57,9 @@
     <javax.mail.version>1.6.2</javax.mail.version>
     <janino.version>3.0.6</janino.version>
     <!-- slf4j.version property is used below, in
-         logback-classic/pom.xml and in setClasspath.cmd 
+         logback-classic/pom.xml, /logback-examples/src/main/resources/setClasspath.cmd, download.htnl
     -->    
-    <slf4j.version>2.0.0-alpha1-SNAPSHOT</slf4j.version>
+    <slf4j.version>2.0.0-alpha1</slf4j.version>
     <cal10n.version>0.8.1</cal10n.version>
     <consolePlugin.version>1.1.0</consolePlugin.version>
     <!--<tomcat.version>7.0.59</tomcat.version>-->
@@ -67,10 +68,10 @@
     <!--<jetty.version>9.2.9.v20150224</jetty.version>-->
     <compiler-plugin.version>3.8.0</compiler-plugin.version> <!-- 3.6.1, 3.7.0 -->
     <jansi.version>1.17</jansi.version>
-    <javadoc.plugin.version>2.10.4</javadoc.plugin.version>
+    <maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
     <!--<javadoc.plugin.version>3.0.0</javadoc.plugin.version>-->
 
-    <site-plugin.version>3.6</site-plugin.version>
+    <site-plugin.version>3.7.1</site-plugin.version>
     <cobertura.maven.plugin.version>2.7</cobertura.maven.plugin.version>
     <license-plugin.version>3.0</license-plugin.version>
   </properties>
@@ -285,7 +286,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>${javadoc.plugin.version}</version>
+          <version>${maven-javadoc-plugin.version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -398,20 +399,6 @@
         </executions>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.0.0</version>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/dist.xml</descriptor>
-          </descriptors>
-          <finalName>logback-${project.version}</finalName>
-          <appendAssemblyId>false</appendAssemblyId>
-          <outputDirectory>target/site/dist/</outputDirectory>
-        </configuration>
-      </plugin>
-
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
@@ -453,7 +440,9 @@
                 <aggregate>true</aggregate>
                 <linkJavadoc>true</linkJavadoc>
                 <linksource>true</linksource>
-                <additionalparam>-Xdoclint:none</additionalparam>
+                <additionalOptions>
+                  <additionalOption>-Xdoclint:none</additionalOption>
+                </additionalOptions>
                 <sourceFileExcludes>
                   <sourceFileExclude>**/module-info.java</sourceFileExclude>
                 </sourceFileExcludes>
@@ -575,7 +564,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>${javadoc.plugin.version}</version>
+            <version>2.10.4</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
@@ -585,6 +574,7 @@
               </execution>            
             </executions>
             <configuration>
+              <additionalparam>-Xdoclint:none</additionalparam>
               <sourceFileExcludes>
                 <sourceFileExclude>**/module-info.java</sourceFileExclude>
               </sourceFileExcludes>

diff --git a/release.sh b/release.sh
@@ -6,7 +6,7 @@ mvn animal-sniffer:check
 mvn site:site
 
 #mvn javadoc:jar
-mvn assembly:single
+#mvn assembly:single
 mvn deploy -P javadocjar,sign-artifacts -Dgpg.passphrase=passwd
 
 #uncomment diffie-hellman support in /etc/ssh/sshd_config