Skip to content

Commit

Permalink
Update for latest Jakarta requirements (#408)
Browse files Browse the repository at this point in the history
* Swtich to Jakarta EE parent pom (#398)

* A structure to test release staging

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* New structure for release testing

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* New structure to test releases on CI (#401)

* New structure for release testing

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Fix changes lost with merge

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Add -Xdoclint:none to avoid current javadoc errors

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Fix the javadoc errors

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* A structure to test release staging

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* New structure for release testing

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Fix changes lost with merge

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Add -Xdoclint:none to avoid current javadoc errors

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Fix the javadoc errors

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Update el version to 3.0.3 and interceptor version to 1.2.5 to match the Jakarta EE 8 staging releases

Signed-off-by: starksm64 <starksm64@gmail.com>

* Update to use Jakarta EE names

Signed-off-by: starksm64 <starksm64@gmail.com>

* Update to use Jakarta names

Signed-off-by: starksm64 <starksm64@gmail.com>

* Try overriding the nexus-staging-maven-plugin stating url

Signed-off-by: Scott M Stark <starksm64@gmail.com>

* Update the javadoc copyright footer
Update the developer related info

Signed-off-by: Scott M Stark <starksm64@gmail.com>
  • Loading branch information
starksm64 committed Aug 10, 2019
1 parent d0dc539 commit 0cd6afa
Show file tree
Hide file tree
Showing 2 changed files with 100 additions and 92 deletions.
120 changes: 28 additions & 92 deletions api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<packaging>jar</packaging>
<version>2.0.2</version>

<name>CDI APIs</name>
<description>APIs for CDI (Contexts and Dependency Injection for Java)</description>
<name>Jakarta CDI</name>
<description>APIs for Jakarta CDI (Contexts and Dependency Injection)</description>

<url>http://cdi-spec.org</url>
<licenses>
Expand All @@ -42,13 +42,13 @@
</licenses>

<issueManagement>
<system>JIRA</system>
<url>https://jira.jboss.org/browse/CDI</url>
<system>GitHub</system>
<url>https://github.com/eclipse-ee4j/cdi/issues</url>
</issueManagement>

<organization>
<name>JBoss by Red Hat, Inc.</name>
<url>https://jboss.org</url>
<name>Eclipse Foundation</name>
<url>https://jakarta.ee</url>
</organization>

<inceptionYear>2008</inceptionYear>
Expand Down Expand Up @@ -202,85 +202,6 @@
<developerConnection>scm:git:git@github.com:cdi-spec/cdi.git</developerConnection>
</scm>

<profiles>
<profile>
<id>jboss-public-repository</id>
<activation>
<property>
<name>jboss-public-repository</name>
<value>!false</value>
</property>
</activation>
<repositories>
<repository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>

<!--
This profile enables consuming artifacts from the ossrh staging
repository group.
-->
<profile>
<id>staging</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<repositories>
<repository>
<id>sonatype-nexus-staging</id>
<name>Sonatype Nexus Staging</name>
<url>https://oss.sonatype.org/content/repositories/staging</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>sonatype-nexus-staging</id>
<name>Sonatype Nexus Staging</name>
<url>https://oss.sonatype.org/content/repositories/staging</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>

<build>
<testResources>
<testResource>
Expand Down Expand Up @@ -360,15 +281,30 @@
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<extensions>true</extensions>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<!-- update this to the correct id! -->
<stagingProfileId>7edbe315063867</stagingProfileId>
<docfilessubdirs>true</docfilessubdirs>
<description>Jakarta Context Dependency Injection API</description>
<doctitle>Jakarta Context Dependency Injection API</doctitle>
<windowtitle>Jakarta Context Dependency Injection API</windowtitle>
<header><![CDATA[<br>Jakarta Context Dependency Injection ${project.version}]]>
</header>
<bottom><![CDATA[
Comments to: <a href="mailto:cdi-dev@eclipse.org">cdi-dev@eclipse.org</a>.<br>
Copyright &#169; 2019 Eclipse Foundation.<br>
Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
</bottom>
</configuration>

<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
72 changes: 72 additions & 0 deletions api/src/main/javadoc/doc-files/speclicense.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<html>
<head>
<title>Eclipse Foundation Specification License - v1.0</title>
</head>
<body>
<h1>Eclipse Foundation Specification License - v1.0</h1>
<p>By using and/or copying this document, or the Eclipse Foundation
document from which this statement is linked, you (the licensee) agree
that you have read, understood, and will comply with the following
terms and conditions:</p>

<p>Permission to copy, and distribute the contents of this document, or
the Eclipse Foundation document from which this statement is linked, in
any medium for any purpose and without fee or royalty is hereby
granted, provided that you include the following on ALL copies of the
document, or portions thereof, that you use:</p>

<ul>
<li> link or URL to the original Eclipse Foundation document.</li>
<li>All existing copyright notices, or if one does not exist, a notice
(hypertext is preferred, but a textual representation is permitted)
of the form: &quot;Copyright &copy; [$date-of-document]
&ldquo;Eclipse Foundation, Inc. &lt;&lt;url to this license&gt;&gt;
&quot;
</li>
</ul>

<p>Inclusion of the full text of this NOTICE must be provided. We
request that authorship attribution be provided in any software,
documents, or other items or products that you create pursuant to the
implementation of the contents of this document, or any portion
thereof.</p>

<p>No right to create modifications or derivatives of Eclipse Foundation
documents is granted pursuant to this license, except anyone may
prepare and distribute derivative works and portions of this document
in software that implements the specification, in supporting materials
accompanying such software, and in documentation of such software,
PROVIDED that all such works include the notice below. HOWEVER, the
publication of derivative works of this document for use as a technical
specification is expressly prohibited.</p>

<p>The notice is:</p>

<p>&quot;Copyright &copy; 2018 Eclipse Foundation. This software or
document includes material copied from or derived from [title and URI
of the Eclipse Foundation specification document].&quot;</p>

<h2>Disclaimers</h2>

<p>THIS DOCUMENT IS PROVIDED &quot;AS IS,&quot; AND THE COPYRIGHT
HOLDERS AND THE ECLIPSE FOUNDATION MAKE NO REPRESENTATIONS OR
WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE
SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS
WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR
OTHER RIGHTS.</p>

<p>THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION WILL NOT BE LIABLE
FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT
OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE
CONTENTS THEREOF.</p>

<p>The name and trademarks of the copyright holders or the Eclipse
Foundation may NOT be used in advertising or publicity pertaining to
this document or its contents without specific, written prior
permission. Title to copyright in this document will at all times
remain with copyright holders.</p>

</body>
</html>

0 comments on commit 0cd6afa

Please sign in to comment.