Skip to content

Commit

Permalink
Use of SPDX license identifier in POM and Manifest. Closes #151.
Browse files Browse the repository at this point in the history
  • Loading branch information
joehni committed Jun 11, 2019
1 parent 9069fcb commit 4252ed9
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
@@ -1,7 +1,7 @@
(BSD Style License)

Copyright (c) 2003-2006, Joe Walnes
Copyright (c) 2006-2015, XStream Committers
Copyright (c) 2006-2019, XStream Committers
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
6 changes: 5 additions & 1 deletion pom.xml
Expand Up @@ -223,7 +223,7 @@

<licenses>
<license>
<name>BSD style</name>
<name>BSD-3-Clause</name>
<url>http://x-stream.github.io/license.html</url>
<distribution>repo</distribution>
</license>
Expand Down Expand Up @@ -646,6 +646,7 @@
</manifest>
<manifestEntries>
<Specification-Version>${project.info.majorVersion}.${project.info.minorVersion}</Specification-Version>
<Bundle-License>BSD-3-Clause</Bundle-License>
<Automatic-Module-Name>${jar.module.name}</Automatic-Module-Name>
<X-Compile-Source>${version.java.source}</X-Compile-Source>
<X-Compile-Target>${version.java.target}</X-Compile-Target>
Expand Down Expand Up @@ -682,6 +683,7 @@
</manifest>
<manifestEntries>
<Specification-Version>${project.info.majorVersion}.${project.info.minorVersion}</Specification-Version>
<Bundle-License>BSD-3-Clause</Bundle-License>
</manifestEntries>
</archive>
</configuration>
Expand Down Expand Up @@ -739,6 +741,7 @@
<Bundle-SymbolicName>${project.artifactId}.sources</Bundle-SymbolicName>
<Bundle-Vendor>${project.organization.name} Sources</Bundle-Vendor>
<Bundle-Version>${project.info.osgiVersion} Sources</Bundle-Version>
<Bundle-License>BSD-3-Clause</Bundle-License>
<Eclipse-SourceBundle>${project.artifactId};version=${project.info.osgiVersion}</Eclipse-SourceBundle>
<X-Compile-Source>${version.java.source}</X-Compile-Source>
<X-Compile-Target>${version.java.target}</X-Compile-Target>
Expand Down Expand Up @@ -805,6 +808,7 @@
<instructions>
<_nouses>true</_nouses>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-License>BSD-3-Clause</Bundle-License>
<Specification-Version>${project.info.majorVersion}.${project.info.minorVersion}</Specification-Version><!-- FELIX-3392 -->
</instructions>
<archive>
Expand Down
1 change: 1 addition & 0 deletions xstream-distribution/src/content/changes.html
Expand Up @@ -98,6 +98,7 @@ <h2>Minor changes</h2>
<ul>
<li>XmlFriendlyNameCoder supports now XML parsers implementing only 4th edition of XML 1.0 specification.</li>
<li>Fix support of CDATA events in StAX.</li>
<li>GHI:#151: Use of SPDX license identifier in POM and Manifest.</li>
</ul>

<h1 id="1.4.11.1">1.4.11.1</h1>
Expand Down
1 change: 1 addition & 0 deletions xstream/pom.xml
Expand Up @@ -191,6 +191,7 @@
<manifestEntries>
<Specification-Title>${project.name} Test</Specification-Title>
<Implementation-Title>${project.name} Test</Implementation-Title>
<Bundle-License>BSD-3-Clause</Bundle-License>
</manifestEntries>
</archive>
</configuration>
Expand Down

0 comments on commit 4252ed9

Please sign in to comment.