You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2017/01/21 21:16:00 UTC
logging-log4j-scala git commit: Use logging-parent as new parent pom
Repository: logging-log4j-scala
Updated Branches:
refs/heads/logging-parent [created] 75ee3cd11
Use logging-parent as new parent pom
Clean up unnecessary build configurations (although there are probably
still more) specified by the parent pom.
This also copies over some implicit pom.xml configuration that was
relied upon from the old parent pom.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/commit/75ee3cd1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/75ee3cd1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/75ee3cd1
Branch: refs/heads/logging-parent
Commit: 75ee3cd115e5dfd83bd9b99593acdcc0e73bd44e
Parents: 9831ccc
Author: Matt Sicker <bo...@gmail.com>
Authored: Sat Jan 21 15:14:10 2017 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sat Jan 21 15:14:10 2017 -0600
----------------------------------------------------------------------
log4j-api-scala_2.10/pom.xml | 17 +--------
log4j-api-scala_2.11/pom.xml | 17 +--------
log4j-api-scala_2.12/pom.xml | 19 ++--------
pom.xml | 75 +++++++++++++++++++++++++++------------
4 files changed, 58 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/75ee3cd1/log4j-api-scala_2.10/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.10/pom.xml b/log4j-api-scala_2.10/pom.xml
index b009850..77e8ae6 100644
--- a/log4j-api-scala_2.10/pom.xml
+++ b/log4j-api-scala_2.10/pom.xml
@@ -100,21 +100,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
- <!-- Include the standard NOTICE and LICENSE -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -144,7 +129,7 @@
<artifactId>maven-pmd-plugin</artifactId>
<version>${pmd.plugin.version}</version>
<configuration>
- <targetJdk>${maven.compile.target}</targetJdk>
+ <targetJdk>${maven.compiler.target}</targetJdk>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/75ee3cd1/log4j-api-scala_2.11/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.11/pom.xml b/log4j-api-scala_2.11/pom.xml
index ae8b404..5220bdc 100644
--- a/log4j-api-scala_2.11/pom.xml
+++ b/log4j-api-scala_2.11/pom.xml
@@ -100,21 +100,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
- <!-- Include the standard NOTICE and LICENSE -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -144,7 +129,7 @@
<artifactId>maven-pmd-plugin</artifactId>
<version>${pmd.plugin.version}</version>
<configuration>
- <targetJdk>${maven.compile.target}</targetJdk>
+ <targetJdk>${maven.compiler.target}</targetJdk>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/75ee3cd1/log4j-api-scala_2.12/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.12/pom.xml b/log4j-api-scala_2.12/pom.xml
index 2e2fea6..156caeb 100644
--- a/log4j-api-scala_2.12/pom.xml
+++ b/log4j-api-scala_2.12/pom.xml
@@ -32,6 +32,8 @@
<projectDir>/scala_2.12</projectDir>
<scala.version>2.12.0</scala.version>
<scala.maven.plugin.version>3.2.2</scala.maven.plugin.version>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
@@ -100,21 +102,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
- <!-- Include the standard NOTICE and LICENSE -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -144,7 +131,7 @@
<artifactId>maven-pmd-plugin</artifactId>
<version>${pmd.plugin.version}</version>
<configuration>
- <targetJdk>${maven.compile.target}</targetJdk>
+ <targetJdk>${maven.compiler.target}</targetJdk>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/75ee3cd1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 72f4521..8b447ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,11 +18,12 @@
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>2.7.1-SNAPSHOT</version>
+ <groupId>org.apache.logging</groupId>
+ <artifactId>logging-parent</artifactId>
+ <version>1</version>
</parent>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-scala</artifactId>
<version>2.7.1-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -41,6 +42,9 @@
<properties>
<maven-site-plugin.version>3.6</maven-site-plugin.version>
<log4jParentDir>${basedir}</log4jParentDir>
+ <Log4jReleaseVersion>2.7</Log4jReleaseVersion>
+ <changes.plugin.version>2.12.1</changes.plugin.version>
+ <pmd.plugin.version>3.7</pmd.plugin.version>
</properties>
<dependencyManagement>
@@ -60,6 +64,36 @@
<artifactId>log4j-api-scala_2.12</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -79,10 +113,24 @@
<version>${maven-site-plugin.version}</version>
<configuration>
<locales>en</locales>
- <templateDirectory>${log4jParentDir}/src/site</templateDirectory>
- <template>site.vm</template>
+ <templateFile>${log4jParentDir}/src/site/site.vm</templateFile>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.2.0</version>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ <phase>process-classes</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -94,23 +142,6 @@
</build>
<distributionManagement>
- <repository>
- <id>apache.releases.https</id>
- <name>Apache Release Distribution Repository</name>
- <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots.https</id>
- <name>Apache Development Snapshot Repository</name>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </snapshotRepository>
- <site>
- <id>apache.website</id>
- <url>scp://people.apache.org/www/logging.apache.org/log4j/2.0</url>
- </site>
<downloadUrl>https://logging.apache.org/log4j/2.x/download.html</downloadUrl>
</distributionManagement>