Skip to content

Commit

Permalink
moving to oss.sonatype repo, indentation changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@ceki
ceki committed May 8, 2012
1 parent f880d89 commit d8b43cb
Show file tree
Hide file tree
Showing 17 changed files with 497 additions and 489 deletions.
6 changes: 2 additions & 4 deletions jcl-over-slf4j/pom.xml
View file
Expand Up @@ -12,11 +12,9 @@
<artifactId>jcl-over-slf4j</artifactId>
<packaging>jar</packaging>
<name>JCL 1.1.1 implemented over SLF4J</name>

<description>JCL 1.1.1 implemented over SLF4J</description>
<url>http://www.slf4j.org</url>
<description>
JCL 1.1.1 implementation over SLF4J
</description>


<dependencies>
<!--
Expand Down
4 changes: 1 addition & 3 deletions jul-to-slf4j/pom.xml
View file
Expand Up @@ -16,11 +16,9 @@

<packaging>jar</packaging>
<name>JUL to SLF4J bridge</name>
<description>JUL to SLF4J bridge</description>

<url>http://www.slf4j.org</url>
<description>
JUL to SLF4J bridge
</description>

<dependencies>
<dependency>
Expand Down
9 changes: 1 addition & 8 deletions log4j-over-slf4j/pom.xml
View file
Expand Up @@ -14,17 +14,10 @@
<artifactId>log4j-over-slf4j</artifactId>
<packaging>jar</packaging>
<name>Log4j Implemented Over SLF4J</name>
<description>Log4j implemented over SLF4J</description>

<url>http://www.slf4j.org</url>

<description>
<!--
Never _never_ let Eclipse's auto format function add
a line return in the description.
The generated jar will contain a corrupt MANIFEST file.
-->
Log4j implemented over SLF4J
</description>
<licenses>
<license>
<name>Apache Software Licenses</name>
Expand Down
49 changes: 39 additions & 10 deletions pom.xml
View file
Expand Up @@ -11,7 +11,7 @@

<packaging>pom</packaging>
<name>SLF4J</name>

<description>Top SLF4J project pom.xml file</description>
<url>http://www.slf4j.org</url>

<organization>
Expand All @@ -28,13 +28,25 @@
</license>
</licenses>

<scm>
<url>https://github.com/ceki/slf4j</url>
<connection>git@github.com:ceki/slf4j.git</connection>
</scm>

<properties>
<slf4j.api.minimum.compatible.version>1.6.0
</slf4j.api.minimum.compatible.version>
<cal10n.version>0.7.4</cal10n.version>
<log4j.version>1.2.16</log4j.version>
</properties>

<developers>
<developer>
<id>ceki</id>
<name>Ceki Gulcu</name>
<email>ceki@qos.ch</email>
</developer>
</developers>

<modules>
<module>slf4j-api</module>
Expand Down Expand Up @@ -373,6 +385,28 @@
</pluginRepositories>
</profile>

<profile>
<id>sign-artifacts</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

</profiles>

<pluginRepositories>
Expand All @@ -389,22 +423,17 @@
</pluginRepository>
</pluginRepositories>

<scm>
<connection>scm:svn:http://svn.slf4j.org/repos/slf4j/trunk</connection>
<developerConnection>scm:svn:https://svn.slf4j.org/repos/slf4j/trunk
</developerConnection>
<url>http://svn.slf4j.org/viewvc/slf4j/trunk/</url>
</scm>

<distributionManagement>
<site>
<id>pixie</id>
<url>scp://pixie.qos.ch/var/www/www.slf4j.org/htdocs/</url>
</site>

<repository>
<id>pixie</id>
<url>scp://pixie.qos.ch/var/mvnrepo/</url>
<!--<id>pixie</id>-->
<!--<url>scp://pixie.qos.ch/var/mvnrepo/</url>-->
<id>sonatype-nexus-staging</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>

</distributionManagement>
Expand Down
2 changes: 1 addition & 1 deletion slf4j-api/pom.xml
View file
Expand Up @@ -14,9 +14,9 @@
<artifactId>slf4j-api</artifactId>
<packaging>jar</packaging>
<name>SLF4J API Module</name>
<description>The slf4j API</description>

<url>http://www.slf4j.org</url>
<description>The slf4j API</description>

<dependencies>

Expand Down
2 changes: 1 addition & 1 deletion slf4j-ext/pom.xml
View file
Expand Up @@ -14,9 +14,9 @@
<artifactId>slf4j-ext</artifactId>
<packaging>jar</packaging>
<name>SLF4J Extensions Module</name>
<description>Extensions to the SLF4J API</description>

<url>http://www.slf4j.org</url>
<description>Extensions to the SLF4J API</description>

<dependencies>
<dependency>
Expand Down
4 changes: 1 addition & 3 deletions slf4j-jcl/pom.xml
View file
Expand Up @@ -12,12 +12,10 @@
<artifactId>slf4j-jcl</artifactId>
<packaging>jar</packaging>
<name>SLF4J JCL Binding</name>
<description>SLF4J JCL Binding</description>

<url>http://www.slf4j.org</url>

<description>
The slf4j jcl binding
</description>

<dependencies>
<dependency>
Expand Down
64 changes: 31 additions & 33 deletions slf4j-jdk14/pom.xml
View file
@@ -1,32 +1,30 @@
<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">
<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">

<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.5-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.5-SNAPSHOT</version>
</parent>

<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<modelVersion>4.0.0</modelVersion>

<packaging>jar</packaging>
<name>SLF4J JDK14 Binding</name>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>

<packaging>jar</packaging>
<name>SLF4J JDK14 Binding</name>
<description>SLF4J JDK14 Binding</description>
<url>http://www.slf4j.org</url>

<url>http://www.slf4j.org</url>
<description>
The slf4j JDK14 binding
</description>

<dependencies>
<dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -38,19 +36,19 @@
</dependencies>

<build>
<plugins>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.4</source>
<target>1.4</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.4</source>
<target>1.4</target>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
Expand All @@ -61,7 +59,7 @@
</manifestEntries>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
81 changes: 39 additions & 42 deletions slf4j-log4j12/pom.xml
View file
@@ -1,55 +1,52 @@
<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">

<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.5-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>

<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<packaging>jar</packaging>
<name>SLF4J LOG4J-12 Binding</name>

<url>http://www.slf4j.org</url>

<description>
The slf4j log4j-12 binding
</description>

<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">

<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.6.5-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>

<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<packaging>jar</packaging>
<name>SLF4J LOG4J-12 Binding</name>
<description>SLF4J LOG4J-12 Binding</description>
<url>http://www.slf4j.org</url>


<dependencies>
<dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
</plugins>
</build>

Expand Down

0 comments on commit d8b43cb

Please sign in to comment.