Skip to content
This repository was archived by the owner on May 11, 2021. It is now read-only.

Update pom and copying #1

Closed
wants to merge 5 commits into from
Closed

Update pom and copying #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4b54530
doc(copying): Update the GPL-2.0 according to upstream
definite Feb 8, 2016
7effbef
update(pom): Update dependencies, and depreciated oss-parent
definite Feb 8, 2016
97d2f2b
fix(PR 1): Update according to comments
definite Feb 9, 2016
fb20e06
Update COPYING.txt as suggested from fedora-legal
definite Feb 9, 2016
c0bfec2
fix(pom.xml): revert the license link
definite Feb 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions COPYING.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,11 +325,11 @@ License instead of this License.

"CLASSPATH" EXCEPTION TO THE GPL
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We seem to be missing the Classpath exception.


Certain source files distributed by Sun Microsystems, Inc. are subject to
the following clarification and special exception to the GPL, but only where
Sun has expressly included in the particular source file's header the words
"Sun designates this particular file as subject to the "Classpath" exception
as provided by Sun in the LICENSE file that accompanied this code."
Certain source files distributed by Oracle America and/or its affiliates are
subject to the following clarification and special exception to the GPL, but
only where Oracle has expressly included in the particular source file's header
the words "Oracle designates this particular file as subject to the "Classpath"
exception as provided by Oracle in the LICENSE file that accompanied this code."

Linking this library statically or dynamically with other modules is making
a combined work based on this library. Thus, the terms and conditions of
Expand Down
188 changes: 139 additions & 49 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<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">
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>
<groupId>org.fedorahosted.openprops</groupId>
<artifactId>openprops</artifactId>
<packaging>jar</packaging>
Expand All @@ -13,68 +9,162 @@
<url>https://fedorahosted.org/openprops</url>
<description>${project.name} is a tiny Java library which reads and writes .properties files using the same code as java.util.Properties from the OpenJDK, but enhanced so that it preserves the order of entries within the file, and it also preserves comments in the file. This means that a Properties editor or a file converter written to use OpenProps won't have to lose comments or mess up the order of entries.</description>

<issueManagement>
<system>Trac</system>
<url>https://fedorahosted.org/openprops</url>
</issueManagement>
<issueManagement>
<system>GitHub</system>
<url>https://github.com/zanata/openprops/issues</url>
</issueManagement>

<licenses>
<license>
<name>GNU General Public License, version 2, with the Classpath Exception</name>
<url>http://openjdk.java.net/legal/gplv2+ce.html</url>
<distribution>repo</distribution>
</license>
<license>
<name>GNU General Public License, version 2, with the Classpath Exception</name>
<url>http://openjdk.java.net/legal/gplv2+ce.html</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:git:git@github.com:zanata/openprops.git</connection>
<developerConnection>scm:git:git@github.com:zanata/openprops.git</developerConnection>
<url>git@github.com:zanata/openprops.git</url>
</scm>

<developers>
<!-- in alphabetical order (by id field) -->
<developer>
<id>sflaniga@redhat.com</id>
<name>Sean Flanigan</name>
<email>sflaniga@redhat.com</email>
<organization>Red Hat</organization>
<organizationUrl>http://www.redhat.com/</organizationUrl>
<timezone>10</timezone>
</developer>
</developers>
<developers>
<!-- in alphabetical order (by id field) -->
<developer>
<id>sflaniga@redhat.com</id>
<name>Sean Flanigan</name>
<email>sflaniga@redhat.com</email>
<organization>Red Hat</organization>
<organizationUrl>http://www.redhat.com/</organizationUrl>
<timezone>10</timezone>
</developer>
</developers>
<contributors>
<!-- in alphabetical order (by email field) -->
<contributor>
<name>Ding-Yi Chen</name>
<email>dchen@redhat.com</email>
<organization>Red Hat</organization>
<organizationUrl>http://www.redhat.com/</organizationUrl>
<roles>
<role>packager</role>
<role>tester</role>
</roles>
<timezone>10</timezone>
</contributor>
</contributors>

<properties>
<!--
Version of java compiler used for building. (Specified as major.minor,
as used by javac -source and -target).
-->
<required.java>1.6</required.java>
<!--
Version of Java used for runtime (major.minor) and for bytecode
generation. Should correspond with animal.sniffer.signature.
-->
<required.jvm>1.6</required.jvm>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<useAgent>true</useAgent>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<optimize>true</optimize>
</configuration>
</plugin>
</plugins>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<useAgent>true</useAgent>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>${required.java}</source>
<target>${required.java}</target>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<optimize>true</optimize>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<!-- Deploy sources to OSSRH -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Deploy javadocs to OSSRH -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Deploy sign artifacts for OSSRH -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
<configuration>
<useAgent>true</useAgent>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-staging</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
</project>