Skip to content

Commit 67c0eb2

Browse files
committed
Merge remote-tracking branch 'maximthomas/update-jdk-11' into release/16.0.0-SNAPSHOT
2 parents 078255d + 9e79f96 commit 67c0eb2

File tree

16 files changed

+139
-15
lines changed

16 files changed

+139
-15
lines changed

transform-jakarta/activemq-client/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
</parent>
2626

2727
<artifactId>activemq-client</artifactId>
28-
<version>${activemq.version}</version>
28+
<version>5.16.8</version>
29+
<name>${project.groupId}.${project.artifactId}</name>
30+
<description>${project.groupId}:${project.artifactId}</description>
2931

3032
<properties>
3133
<transformer.artifact.groupId>org.apache.activemq</transformer.artifact.groupId>

transform-jakarta/cc/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,13 @@
2525
</parent>
2626
<artifactId>cc</artifactId>
2727
<version>2008-08-08</version>
28+
<name>${project.groupId}.${project.artifactId}</name>
29+
<description>${project.groupId}:${project.artifactId}</description>
2830

2931
<properties>
3032
<transformer.artifact.groupId>org.openidentityplatform.external.com.sun.web.ui</transformer.artifact.groupId>
33+
<transformer.source.artifact.groupId>${project.groupId}</transformer.source.artifact.groupId>
34+
<transformer.javadoc.artifact.groupId>${project.groupId}</transformer.javadoc.artifact.groupId>
3135
</properties>
3236

3337
<build>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/**
2+
* The contents of this file are subject to the terms of the Common Development and
3+
* Distribution License (the License). You may not use this file except in compliance with the
4+
* License.
5+
*
6+
* You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
7+
* specific language governing permission and limitations under the License.
8+
*
9+
* When distributing Covered Software, include this CDDL Header Notice in each file and include
10+
* the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
11+
* Header, with the fields enclosed by brackets [] replaced by your own identifying
12+
* information: "Portions copyright [year] [name of copyright owner]".
13+
*
14+
* Copyright 2025 3A Systems LLC.
15+
*/
16+
17+
package org.openidentityplatfrom.openam.stub;
18+
19+
public class Dummy {
20+
}

transform-jakarta/jato-shaded/pom.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@
2424
<version>16.0.0-SNAPSHOT</version>
2525
</parent>
2626

27+
<artifactId>jato-shaded</artifactId>
28+
<version>2005-05-04</version>
29+
<name>${project.groupId}.${project.artifactId}</name>
30+
<description>${project.groupId}:${project.artifactId}</description>
31+
2732
<properties>
2833
<transformer.artifact.groupId>org.openidentityplatform.external.com.iplanet.jato</transformer.artifact.groupId>
2934
</properties>
3035

31-
<artifactId>jato-shaded</artifactId>
32-
<version>2005-05-04</version>
33-
<packaging>jar</packaging>
3436
<build>
3537
<plugins>
3638
<plugin>

transform-jakarta/jaxrpc-parent/jaxrpc-impl/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
</parent>
2626

2727
<artifactId>jaxrpc-impl</artifactId>
28-
<version>${jaxrpc-impl.version}</version>
28+
<version>1.1.3_01</version>
29+
<name>${project.groupId}.${project.artifactId}</name>
30+
<description>${project.groupId}:${project.artifactId}</description>
2931

3032
<build>
3133
<plugins>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/**
2+
* The contents of this file are subject to the terms of the Common Development and
3+
* Distribution License (the License). You may not use this file except in compliance with the
4+
* License.
5+
*
6+
* You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
7+
* specific language governing permission and limitations under the License.
8+
*
9+
* When distributing Covered Software, include this CDDL Header Notice in each file and include
10+
* the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
11+
* Header, with the fields enclosed by brackets [] replaced by your own identifying
12+
* information: "Portions copyright [year] [name of copyright owner]".
13+
*
14+
* Copyright 2025 3A Systems LLC.
15+
*/
16+
17+
package org.openidentityplatfrom.openam.stub;
18+
19+
public class Dummy {
20+
}

transform-jakarta/jaxrpc-parent/jaxrpc-spi/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
</parent>
2626

2727
<artifactId>jaxrpc-spi</artifactId>
28-
<version>${jaxrpc-spi.version}</version>
28+
<version>1.1.3_01</version>
29+
<name>${project.groupId}.${project.artifactId}</name>
30+
<description>${project.groupId}:${project.artifactId}</description>
2931

3032
<build>
3133
<plugins>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/**
2+
* The contents of this file are subject to the terms of the Common Development and
3+
* Distribution License (the License). You may not use this file except in compliance with the
4+
* License.
5+
*
6+
* You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
7+
* specific language governing permission and limitations under the License.
8+
*
9+
* When distributing Covered Software, include this CDDL Header Notice in each file and include
10+
* the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
11+
* Header, with the fields enclosed by brackets [] replaced by your own identifying
12+
* information: "Portions copyright [year] [name of copyright owner]".
13+
*
14+
* Copyright 2025 3A Systems LLC.
15+
*/
16+
17+
package org.openidentityplatfrom.openam.stub;
18+
19+
public class Dummy {
20+
}

transform-jakarta/jaxrpc-parent/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,12 @@
2525
</parent>
2626
<packaging>pom</packaging>
2727
<artifactId>jaxrpc-parent</artifactId>
28+
<name>${project.groupId}.${project.artifactId}</name>
29+
<description>${project.groupId}:${project.artifactId}</description>
2830
<properties>
2931
<transformer.artifact.groupId>com.sun.xml.rpc</transformer.artifact.groupId>
32+
<transformer.source.artifact.groupId>${project.groupId}</transformer.source.artifact.groupId>
33+
<transformer.javadoc.artifact.groupId>${project.groupId}</transformer.javadoc.artifact.groupId>
3034
</properties>
3135

3236
<modules>

transform-jakarta/pom.xml

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
<groupId>org.openidentityplatform.openam.jakarta</groupId>
2727
<artifactId>transform-jakarta</artifactId>
2828
<packaging>pom</packaging>
29+
30+
<name>${project.groupId}.${project.artifactId}</name>
31+
<description>${project.groupId}:${project.artifactId}</description>
32+
2933
<modules>
3034
<module>jaxrpc-parent</module>
3135
<module>restlet-parent-jakarta</module>
@@ -35,6 +39,8 @@
3539
</modules>
3640
<properties>
3741
<transformer.artifact.groupId>${project.groupId}</transformer.artifact.groupId>
42+
<transformer.source.artifact.groupId>${transformer.artifact.groupId}</transformer.source.artifact.groupId>
43+
<transformer.javadoc.artifact.groupId>${transformer.artifact.groupId}</transformer.javadoc.artifact.groupId>
3844
</properties>
3945
<build>
4046
<pluginManagement>
@@ -66,7 +72,7 @@
6672
<extensions>true</extensions>
6773
<executions>
6874
<execution>
69-
<id>transform-jakarta</id>
75+
<id>default-jar</id>
7076
<goals>
7177
<goal>jar</goal>
7278
</goals>
@@ -79,7 +85,7 @@
7985
</configuration>
8086
</execution>
8187
<execution>
82-
<id>default-jar</id>
88+
<id>transform-jakarta</id>
8389
<goals>
8490
<goal>jar</goal>
8591
</goals>
@@ -95,6 +101,36 @@
95101
<classifier/>
96102
</configuration>
97103
</execution>
104+
<execution>
105+
<id>javadoc-jar</id>
106+
<goals>
107+
<goal>jar</goal>
108+
</goals>
109+
<configuration>
110+
<skip>${maven.javadoc.skip}</skip>
111+
<artifact>
112+
<groupId>${transformer.javadoc.artifact.groupId}</groupId>
113+
<artifactId>${project.artifactId}</artifactId>
114+
<version>${project.version}</version>>
115+
<classifier>javadoc</classifier>
116+
</artifact>
117+
</configuration>
118+
</execution>
119+
<execution>
120+
<id>source-jar</id>
121+
<goals>
122+
<goal>jar</goal>
123+
</goals>
124+
<configuration>
125+
<skip>${maven.source.skip}</skip>
126+
<artifact>
127+
<groupId>${transformer.source.artifact.groupId}</groupId>
128+
<artifactId>${project.artifactId}</artifactId>
129+
<version>${project.version}</version>
130+
<classifier>sources</classifier>
131+
</artifact>
132+
</configuration>
133+
</execution>
98134
</executions>
99135
</plugin>
100136
<plugin>

0 commit comments

Comments
 (0)