Skip to content

Commit

Permalink
Integrate activation 2.1.2,
Browse files Browse the repository at this point in the history 
update build plugins,
update references to new repo location

Signed-off-by: Lukas Jungmann <[email protected]>
  • Loading branch information
@lukasj
lukasj committed Oct 13, 2023
1 parent 4c7ccf9 commit 7fa513d
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 48 deletions.
38 changes: 20 additions & 18 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand All @@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.7</version>
<version>1.0.8</version>
<relativePath/>
</parent>

Expand All @@ -30,14 +30,14 @@
<spotbugs.exclude>${project.basedir}/../etc/spotbugs-exclude.xml</spotbugs.exclude>
<spotbugs.skip>false</spotbugs.skip>
<spotbugs.threshold>Low</spotbugs.threshold>
<spotbugs.version>4.5.3.0</spotbugs.version>
<spotbugs.version>4.7.3.6</spotbugs.version>

<maven.compiler.release>11</maven.compiler.release>
<extension.name>jakarta.xml.soap</extension.name>
<spec.version>2.0</spec.version>
<new.spec.version>3.0</new.spec.version>
<non.final>false</non.final>
<activation.version>2.1.0</activation.version>
<activation.version>2.1.2</activation.version>
<legal.doc.source>${project.basedir}/..</legal.doc.source>
<vendor.name>Eclipse Foundation</vendor.name>
</properties>
Expand All @@ -47,12 +47,12 @@
<version>3.0.1-SNAPSHOT</version>
<description>Provides the API for creating and building SOAP messages.</description>
<name>Jakarta SOAP with Attachments API</name>
<url>https://github.com/eclipse-ee4j/saaj-api</url>
<url>https://github.com/jakartaee/saaj-api</url>

<scm>
<connection>scm:git:git://github.com/eclipse-ee4j/saaj-api.git</connection>
<developerConnection>scm:git:git:@github.com:eclipse-ee4j/saaj-api.git</developerConnection>
<url>https://github.com/eclipse-ee4j/saaj-api</url>
<connection>scm:git:git://github.com/jakartaee/saaj-api.git</connection>
<developerConnection>scm:git:git:@github.com:jakartaee/saaj-api.git</developerConnection>
<url>https://github.com/jakartaee/saaj-api</url>
<tag>HEAD</tag>
</scm>

Expand All @@ -77,7 +77,7 @@

<issueManagement>
<system>IssueTracker</system>
<url>https://github.com/eclipse-ee4j/saaj-api/issues</url>
<url>https://github.com/jakartaee/saaj-api/issues</url>
</issueManagement>

<mailingLists>
Expand Down Expand Up @@ -111,7 +111,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.glassfish.copyright</groupId>
Expand All @@ -121,14 +121,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.1.2</version>
<configuration>
<useModulePath>false</useModulePath>
<argLine>-Djava.security.manager=allow</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.9.0</version>
<version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.glassfish.build</groupId>
Expand All @@ -138,7 +140,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.4</version>
<version>5.1.9</version>
<configuration>
<instructions>
<_noextraheaders>true</_noextraheaders>
Expand All @@ -148,7 +150,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -158,7 +160,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
Expand All @@ -172,12 +174,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
<version>3.4.1</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down Expand Up @@ -440,7 +442,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.7</version>
<version>0.8.10</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
4 changes: 3 additions & 1 deletion api/src/main/java/jakarta/xml/soap/SAAJResult.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -109,6 +109,8 @@ public SAAJResult(SOAPElement rootNode) {


/**
* Gets the resulting Tree that was created under the specified root Node.
*
* @return the resulting Tree that was created under the specified root Node.
* @since 1.6, SAAJ 1.3
*/
Expand Down
4 changes: 3 additions & 1 deletion api/src/main/java/jakarta/xml/soap/SOAPException.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -66,6 +66,7 @@ public SOAPException(String reason) {
* @param cause a {@code Throwable} object that is to
* be embedded in this {@code SOAPException} object
*/
@SuppressWarnings({"this-escape"})
public SOAPException(String reason, Throwable cause) {
super(reason);
initCause(cause);
Expand All @@ -78,6 +79,7 @@ public SOAPException(String reason, Throwable cause) {
* @param cause a {@code Throwable} object that is to
* be embedded in this {@code SOAPException} object
*/
@SuppressWarnings({"this-escape"})
public SOAPException(Throwable cause) {
super(cause.toString());
initCause(cause);
Expand Down
38 changes: 10 additions & 28 deletions spec/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2017, 2023 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.7</version>
<version>1.0.8</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -34,8 +34,8 @@
<properties>
<site.output.dir>${project.build.directory}/staging</site.output.dir>
<maven.site.skip>true</maven.site.skip>
<asciidoctor.maven.plugin.version>2.2.2</asciidoctor.maven.plugin.version>
<asciidoctorj.pdf.version>1.6.2</asciidoctorj.pdf.version>
<asciidoctor.maven.plugin.version>2.2.4</asciidoctor.maven.plugin.version>
<asciidoctorj.pdf.version>2.3.9</asciidoctorj.pdf.version>
<spec.name>jakarta-${project.artifactId}-${project.version}</spec.name>
<!-- status: DRAFT, BETA, etc., or blank for final -->
<status>DRAFT</status>
Expand All @@ -44,15 +44,15 @@
</properties>

<scm>
<connection>scm:git:git:@github.com:eclipse-ee4j/saaj-api.git</connection>
<developerConnection>scm:git:git:@github.com:eclipse-ee4j/saaj-api.git</developerConnection>
<url>https://github.com/eclipse-ee4j/saaj-api</url>
<connection>scm:git:git:@github.com:jakartaee/saaj-api.git</connection>
<developerConnection>scm:git:git:@github.com:jakartaee/saaj-api.git</developerConnection>
<url>https://github.com/jakartaee/saaj-api</url>
<tag>HEAD</tag>
</scm>

<distributionManagement>
<site>
<url>scm:git:[email protected]:eclipse-ee4j/saaj-api.git</url>
<url>scm:git:[email protected]:jakartaee/saaj-api.git</url>
</site>
</distributionManagement>

Expand All @@ -62,7 +62,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
<version>3.4.1</version>
<executions>
<execution>
<id>enforce-versions</id>
Expand Down Expand Up @@ -145,7 +145,6 @@
</executions>
<configuration>
<sourceDocumentName>${project.artifactId}.adoc</sourceDocumentName>
<sourceHighlighter>coderay</sourceHighlighter>
<attributes>
<revnumber>${project.version}</revnumber>
<revremark>${status}</revremark>
Expand All @@ -154,31 +153,14 @@
</configuration>

</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
<useReleaseProfile>false</useReleaseProfile>
<arguments>${release.arguments}</arguments>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.9.4</version>
</dependency>
</dependencies>
</plugin>

<!--
This is the rule that builds the zip file for download.
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<version>3.6.0</version>
<inherited>false</inherited>
<executions>
<execution>
Expand Down

0 comments on commit 7fa513d

Please sign in to comment.