Skip to content
This repository has been archived by the owner on Apr 23, 2024. It is now read-only.

Commit

Permalink
pom.xml clean up, lincence change
Browse files Browse the repository at this point in the history
  • Loading branch information
@ceki
ceki committed Dec 17, 2012
1 parent 47250b9 commit a77a721
Showing 1 changed file with 21 additions and 73 deletions.
94 changes: 21 additions & 73 deletions pom.xml
View file
Expand Up @@ -31,11 +31,14 @@
</description>
<inceptionYear>2012</inceptionYear>

<licenses>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
<distribution>repo</distribution>
<name>Eclipse Public License - v 1.0</name>
<url>http://www.eclipse.org/legal/epl-v10.html</url>
</license>
<license>
<name>GNU Lesser General Public License</name>
<url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url>
</license>
</licenses>

Expand All @@ -49,18 +52,18 @@
<url>https://github.com/qos-ch/logback-contrib/issues</url>
</issueManagement>

<distributionManagement>
<repository>
<id>logback-contrib.repository.releases</id>
<name>Logback Contrib Release Distribution Repository</name>
<url>${logback-extensions.repository.releases.url}</url>
</repository>
<snapshotRepository>
<id>logback-extensions.repository.snapshots</id>
<name>Logback Extensions Snapshot Distribution Repository</name>
<url>${logback-extensions.repository.snapshots.url}</url>
</snapshotRepository>
</distributionManagement>
<distributionManagement>
<!--<site>-->
<!--<id>pixie</id>-->
<!--<url>scp://pixie.qos.ch/var/www/logback.qos.ch/htdocs/</url>-->
<!--</site>-->

<repository>
<id>sonatype-nexus-staging</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>

</distributionManagement>

<developers>
<developer>
Expand Down Expand Up @@ -111,12 +114,6 @@

<dependencies>
<!-- Test Dependencies for _all_ children modules: -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
Expand Down Expand Up @@ -167,27 +164,6 @@
<version>${logback.version}</version>
</dependency>


<dependency>
<groupId>ch.qos.logback.extensions</groupId>
<artifactId>logback-ext-jackson</artifactId>
<!--suppress MavenModelInspection -->
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>ch.qos.logback.extensions</groupId>
<artifactId>logback-ext-json-classic</artifactId>
<!--suppress MavenModelInspection -->
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback.extensions</groupId>
<artifactId>logback-ext-json-core</artifactId>
<!--suppress MavenModelInspection -->
<version>${project.version}</version>
</dependency>

<!-- 3rd party dependencies: -->
<dependency>
<groupId>javax.servlet</groupId>
Expand Down Expand Up @@ -223,39 +199,11 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.5</source>

This comment has been minimized.

Sign in to view

Copy link
@trutzonline

trutzonline Dec 19, 2012

Hi @ceki, in java 1.5 the @@OverRide annotation on a method is invalid, if the method overides a interface method. We have many such situations and Eclipse shows me many errors. In Java 1.6. this strange behaviour is corrected. I want to change back to Java 1.6. OK?

This comment has been minimized.

Sign in to view

Copy link
@ceki

ceki Dec 19, 2012

Author Member

OK. Thanks for letting me know.
<target>1.5</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<!-- For unit tests: -->
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<version>1.4</version>
<configuration>
<providerSelection>1.7</providerSelection>
<source>src/main/groovy</source>
</configuration>
<dependencies>
<dependency>
<groupId>org.codehaus.gmaven.runtime</groupId>
<artifactId>gmaven-runtime-1.7</artifactId>
<version>1.3</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>

Expand Down

0 comments on commit a77a721

Please sign in to comment.