pom.xml (logback-1.2.3) | : | pom.xml (logback-v_1.2.7) | ||
---|---|---|---|---|
<?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | |||
<project xmlns="http://maven.apache.org/POM/4.0.0" | <project xmlns="http://maven.apache.org/POM/4.0.0" | |||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | |||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apac he.org/xsd/maven-4.0.0.xsd"> | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apac he.org/xsd/maven-4.0.0.xsd"> | |||
<modelVersion>4.0.0</modelVersion> | <modelVersion>4.0.0</modelVersion> | |||
<groupId>ch.qos.logback</groupId> | <groupId>ch.qos.logback</groupId> | |||
<artifactId>logback-parent</artifactId> | <artifactId>logback-parent</artifactId> | |||
<version>1.2.3</version> | <version>1.2.7-SNAPSHOT</version> | |||
<packaging>pom</packaging> | <packaging>pom</packaging> | |||
<name>Logback-Parent</name> | <name>Logback-Parent</name> | |||
<description>logback project pom.xml file</description> | <description>logback project pom.xml file</description> | |||
<url>http://logback.qos.ch</url> | <url>http://logback.qos.ch</url> | |||
<organization> | <organization> | |||
<name>QOS.ch</name> | <name>QOS.ch</name> | |||
<url>http://www.qos.ch</url> | <url>http://www.qos.ch</url> | |||
skipping to change at line 38 | skipping to change at line 38 | |||
</license> | </license> | |||
<license> | <license> | |||
<name>GNU Lesser General Public License</name> | <name>GNU Lesser General Public License</name> | |||
<url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url> | <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url> | |||
</license> | </license> | |||
</licenses> | </licenses> | |||
<scm> | <scm> | |||
<url>https://github.com/ceki/logback</url> | <url>https://github.com/ceki/logback</url> | |||
<connection>git@github.com:ceki/logback.git</connection> | <connection>scm:git@github.com:qos-ch/logback.git</connection> | |||
</scm> | </scm> | |||
<modules> | <modules> | |||
<module>logback-core</module> | <module>logback-core</module> | |||
<module>logback-classic</module> | <module>logback-classic</module> | |||
<module>logback-access</module> | <module>logback-access</module> | |||
<module>logback-site</module> | <module>logback-site</module> | |||
<module>logback-examples</module> | <module>logback-examples</module> | |||
</modules> | </modules> | |||
skipping to change at line 60 | skipping to change at line 60 | |||
<maven.compiler.source>1.6</maven.compiler.source> | <maven.compiler.source>1.6</maven.compiler.source> | |||
<maven.compiler.target>1.6</maven.compiler.target> | <maven.compiler.target>1.6</maven.compiler.target> | |||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | |||
<junit.version>4.10</junit.version> | <junit.version>4.10</junit.version> | |||
<javax.mail.version>1.4</javax.mail.version> | <javax.mail.version>1.4</javax.mail.version> | |||
<janino.version>3.0.6</janino.version> | <janino.version>3.0.6</janino.version> | |||
<groovy.version>2.4.0</groovy.version> | <groovy.version>2.4.0</groovy.version> | |||
<!-- slf4j.version property is used below, in | <!-- slf4j.version property is used below, in | |||
logback-classic/pom.xml and in setClasspath.cmd | logback-classic/pom.xml and in setClasspath.cmd | |||
--> | --> | |||
<slf4j.version>1.7.25</slf4j.version> | <slf4j.version>1.7.32</slf4j.version> | |||
<cal10n.version>0.8.1</cal10n.version> | <cal10n.version>0.8.1</cal10n.version> | |||
<consolePlugin.version>1.1.0</consolePlugin.version> | <consolePlugin.version>1.1.0</consolePlugin.version> | |||
<!--<tomcat.version>7.0.59</tomcat.version>--> | <!--<tomcat.version>7.0.59</tomcat.version>--> | |||
<tomcat.version>8.5.9</tomcat.version> | <tomcat.version>8.5.9</tomcat.version> | |||
<!--<jetty.version>7.5.1.v20110908</jetty.version>--> | <!--<jetty.version>7.5.1.v20110908</jetty.version>--> | |||
<jetty.version>8.2.0.v20160908</jetty.version> | <jetty.version>8.2.0.v20160908</jetty.version> | |||
<!--<jetty.version>9.2.9.v20150224</jetty.version>--> | <!--<jetty.version>9.2.9.v20150224</jetty.version>--> | |||
<jansi.version>1.9</jansi.version> | <jansi.version>1.9</jansi.version> | |||
<javadoc.plugin.version>2.10.4</javadoc.plugin.version> | <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> | |||
<cobertura.maven.plugin.version>2.7</cobertura.maven.plugin.version> | <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version> | |||
<maven-site-plugin.version>3.7.1</maven-site-plugin.version> | ||||
<maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version> | ||||
<maven-source-plugin.version>3.2.0</maven-source-plugin.version> | ||||
<maven-license-plugin.version>3.0</maven-license-plugin.version> | <maven-license-plugin.version>3.0</maven-license-plugin.version> | |||
<maven-jar-plugin.version>2.6</maven-jar-plugin.version> | ||||
<maven-jxr-plugin.version>3.1.1</maven-jxr-plugin.version> | ||||
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version> | ||||
<cobertura.maven.plugin.version>2.7</cobertura.maven.plugin.version> | ||||
</properties> | </properties> | |||
<developers> | <developers> | |||
<developer> | <developer> | |||
<id>ceki</id> | <id>ceki</id> | |||
<name>Ceki Gulcu</name> | <name>Ceki Gulcu</name> | |||
<email>ceki@qos.ch</email> | <email>ceki@qos.ch</email> | |||
</developer> | </developer> | |||
<developer> | <developer> | |||
skipping to change at line 141 | skipping to change at line 149 | |||
</dependency> | </dependency> | |||
<!-- end of dependencies duplicated from logback-bom/pom.xml --> | <!-- end of dependencies duplicated from logback-bom/pom.xml --> | |||
<dependency> | <dependency> | |||
<groupId>org.codehaus.janino</groupId> | <groupId>org.codehaus.janino</groupId> | |||
<artifactId>janino</artifactId> | <artifactId>janino</artifactId> | |||
<version>${janino.version}</version> | <version>${janino.version}</version> | |||
</dependency> | </dependency> | |||
<dependency> | <dependency> | |||
<groupId>org.codehaus.groovy</groupId> | <groupId>org.codehaus.groovy</groupId> | |||
<artifactId>groovy-all</artifactId> | <artifactId>groovy</artifactId> | |||
<version>${groovy.version}</version> | <version>${groovy.version}</version> | |||
</dependency> | </dependency> | |||
<dependency> | ||||
<groupId>org.codehaus.groovy</groupId> | ||||
<artifactId>groovy-test</artifactId> | ||||
<version>${groovy.version}</version> | ||||
</dependency> | ||||
<dependency> | <dependency> | |||
<groupId>org.fusesource.jansi</groupId> | <groupId>org.fusesource.jansi</groupId> | |||
<artifactId>jansi</artifactId> | <artifactId>jansi</artifactId> | |||
<version>${jansi.version}</version> | <version>${jansi.version}</version> | |||
</dependency> | </dependency> | |||
<dependency> | <dependency> | |||
<groupId>javax.mail</groupId> | <groupId>javax.mail</groupId> | |||
<artifactId>mail</artifactId> | <artifactId>mail</artifactId> | |||
<version>${javax.mail.version}</version> | <version>${javax.mail.version}</version> | |||
</dependency> | </dependency> | |||
skipping to change at line 234 | skipping to change at line 249 | |||
<pluginManagement> | <pluginManagement> | |||
<plugins> | <plugins> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-clean-plugin</artifactId> | <artifactId>maven-clean-plugin</artifactId> | |||
<version>3.0.0</version> | <version>3.0.0</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-compiler-plugin</artifactId> | <artifactId>maven-compiler-plugin</artifactId> | |||
<version>3.6.0</version> | <version>${maven-compiler-plugin.version}</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-deploy-plugin</artifactId> | <artifactId>maven-deploy-plugin</artifactId> | |||
<version>2.8.2</version> | <version>${maven-deploy-plugin.version}</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-install-plugin</artifactId> | <artifactId>maven-install-plugin</artifactId> | |||
<version>2.5.2</version> | <version>2.5.2</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-resources-plugin</artifactId> | <artifactId>maven-resources-plugin</artifactId> | |||
<version>3.0.1</version> | <version>3.0.1</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-site-plugin</artifactId> | <artifactId>maven-site-plugin</artifactId> | |||
<version>3.6</version> | <version>${maven-site-plugin.version}</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-surefire-plugin</artifactId> | <artifactId>maven-surefire-plugin</artifactId> | |||
<version>2.19.1</version> | <version>${maven-surefire-plugin.version}</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-jar-plugin</artifactId> | <artifactId>maven-jar-plugin</artifactId> | |||
<version>2.6</version> | <version>${maven-jar-plugin.version}</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-javadoc-plugin</artifactId> | <artifactId>maven-javadoc-plugin</artifactId> | |||
<version>${javadoc.plugin.version}</version> | <version>${maven-javadoc-plugin.version}</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-dependency-plugin</artifactId> | <artifactId>maven-dependency-plugin</artifactId> | |||
<version>2.10</version> | <version>2.10</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-release-plugin</artifactId> | <artifactId>maven-release-plugin</artifactId> | |||
<version>2.5.3</version> | <version>2.5.3</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-source-plugin</artifactId> | <artifactId>maven-source-plugin</artifactId> | |||
<version>3.0.1</version> | <version>${maven-source-plugin.version}</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.codehaus.mojo</groupId> | <groupId>org.codehaus.mojo</groupId> | |||
<artifactId>findbugs-maven-plugin</artifactId> | <artifactId>findbugs-maven-plugin</artifactId> | |||
<version>3.0.4</version> | <version>3.0.4</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.felix</groupId> | <groupId>org.apache.felix</groupId> | |||
<artifactId>maven-bundle-plugin</artifactId> | <artifactId>maven-bundle-plugin</artifactId> | |||
<version>2.5.4</version> | <version>2.5.4</version> | |||
skipping to change at line 366 | skipping to change at line 381 | |||
<!-- ================ site plugin ==================== --> | <!-- ================ site plugin ==================== --> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-site-plugin</artifactId> | <artifactId>maven-site-plugin</artifactId> | |||
<configuration> | <configuration> | |||
<reportPlugins> | <reportPlugins> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-jxr-plugin</artifactId> | <artifactId>maven-jxr-plugin</artifactId> | |||
<version>2.5</version> | <version>${maven-jxr-plugin.version}</version> | |||
<configuration> | <configuration> | |||
<aggregate>true</aggregate> | <aggregate>true</aggregate> | |||
<javadocDir>target/site/apidocs/</javadocDir> | <javadocDir>target/site/apidocs/</javadocDir> | |||
<linkJavadoc>true</linkJavadoc> | <linkJavadoc>true</linkJavadoc> | |||
</configuration> | </configuration> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-javadoc-plugin</artifactId> | <artifactId>maven-javadoc-plugin</artifactId> | |||
<version>2.10.4</version> | <version>${maven-javadoc-plugin.version}</version> | |||
<configuration> | <configuration> | |||
<aggregate>true</aggregate> | <aggregate>true</aggregate> | |||
<linksource>true</linksource> | <linksource>true</linksource> | |||
<additionalOptions> | ||||
<additionalOption>-Xdoclint:none</additionalOption> | ||||
<doclint>none</doclint> | ||||
</additionalOptions> | ||||
<links> | <links> | |||
<link> | <link> | |||
http://docs.oracle.com/javase/6/docs/api/ | http://docs.oracle.com/javase/6/docs/api/ | |||
</link> | </link> | |||
</links> | </links> | |||
<groups> | <groups> | |||
<group> | <group> | |||
<title>Logback Core</title> | <title>Logback Core</title> | |||
<packages>ch.qos.logback.core:ch.qos.logback.core.* | <packages>ch.qos.logback.core:ch.qos.logback.core.* | |||
</packages> | </packages> | |||
skipping to change at line 480 | skipping to change at line 499 | |||
</build> | </build> | |||
</profile> | </profile> | |||
<profile> | <profile> | |||
<id>javadocjar</id> | <id>javadocjar</id> | |||
<build> | <build> | |||
<plugins> | <plugins> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-javadoc-plugin</artifactId> | <artifactId>maven-javadoc-plugin</artifactId> | |||
<version>${javadoc.plugin.version}</version> | <version>${maven-javadoc-plugin.version}</version> | |||
<executions> | <executions> | |||
<execution> | <execution> | |||
<id>attach-javadocs</id> | <id>attach-javadocs</id> | |||
<goals> | <goals> | |||
<goal>jar</goal> | <goal>jar</goal> | |||
<goal>test-jar</goal> | <goal>test-jar</goal> | |||
</goals> | </goals> | |||
</execution> | </execution> | |||
</executions> | </executions> | |||
<configuration> | ||||
<additionalparam>-Xdoclint:none</additionalparam> | ||||
<doclint>none</doclint> | ||||
</configuration> | ||||
</plugin> | </plugin> | |||
</plugins> | </plugins> | |||
</build> | </build> | |||
</profile> | </profile> | |||
<profile> | <profile> | |||
<id>sign-artifacts</id> | <id>sign-artifacts</id> | |||
<build> | <build> | |||
<plugins> | <plugins> | |||
<plugin> | <plugin> | |||
End of changes. 19 change blocks. | ||||
16 lines changed or deleted | 39 lines changed or added |