Skip to content

Commit f11ef81

Browse files
pavelhoralpavelhoral
authored
Merge pull request #54 from orchitech/fix/startup
Fix setup
2 parents 3a02017 + 6074e30 commit f11ef81

File tree

18 files changed

+29
-71
lines changed

18 files changed

+29
-71
lines changed

‎openam-core/src/main/java/org/forgerock/openam/cts/api/tokens/Token.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
* the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
1313
* Header, with the fields enclosed by brackets [] replaced by your own identifying
1414
* information: "Portions copyright [year] [name of copyright owner]".
15+
*
16+
* Portions copyright 2022 Wren Security
1517
*/
1618
package org.forgerock.openam.cts.api.tokens;
1719

@@ -382,11 +384,7 @@ public String toString() {
382384
} else if (field.equals(CoreTokenField.BLOB)) {
383385
value = Long.toString(getBlob().length) + " bytes";
384386
} else {
385-
value = String.valueOf(getAttribute(field));
386-
}
387-
388-
if (value == null) {
389-
value = "[null]";
387+
value = String.valueOf((Object) getAttribute(field));
390388
}
391389

392390
r += MessageFormat.format(format, field.toString(), value);

‎openam-distribution/openam-distribution-ssoadmintools/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<setupArtifactIDs>
3636
opendj-server,forgerock-util,json,xmlsec,openam-core,
3737
openam-entitlements,openam-shared,openam-dtd-schema,openam-license-manager-cli,openam-license-core,
38-
openam-audit-context,guice-core,wrensec-guava-base,wrensec-guava-collect,
38+
openam-audit-context,wrensec-guice-core,wrensec-guava-base,wrensec-guava-collect,
3939
guice,guice-assistedinject,commons-lang,commons-collections,org.apache.servicemix.bundles.javax-inject,
4040
slf4j-api,slf4j-nop,opendj-core,opendj-grizzly,i18n-core,openam-ldap-utils,grizzly-framework,
4141
forgerock-audit-core,openam-audit-configuration,i18n-slf4j,

‎openam-schema/openam-idsvcs-schema/pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* information: "Portions copyright [year] [name of copyright owner]".
1414
*
1515
* Copyright 2011-2016 ForgeRock AS.
16+
* Portions Copyright 2022 Wren Security
1617
-->
1718
<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">
1819
<modelVersion>4.0.0</modelVersion>
@@ -116,11 +117,6 @@
116117
<artifactId>jaxb1-impl</artifactId>
117118
</dependency>
118119

119-
<dependency>
120-
<groupId>com.sun.xml.bind</groupId>
121-
<artifactId>jaxb-libs</artifactId>
122-
</dependency>
123-
124120
<dependency>
125121
<groupId>javax.xml</groupId>
126122
<artifactId>jaxrpc-api</artifactId>

‎openam-schema/openam-jaxrpc-schema/pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* information: "Portions copyright [year] [name of copyright owner]".
1414
*
1515
* Copyright 2011-2016 ForgeRock AS.
16+
* Portions Copyright 2022 Wren Security
1617
-->
1718
<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">
1819
<modelVersion>4.0.0</modelVersion>
@@ -129,11 +130,6 @@
129130
<artifactId>jaxb1-impl</artifactId>
130131
</dependency>
131132

132-
<dependency>
133-
<groupId>com.sun.xml.bind</groupId>
134-
<artifactId>jaxb-libs</artifactId>
135-
</dependency>
136-
137133
<dependency>
138134
<groupId>javax.xml</groupId>
139135
<artifactId>jaxrpc-api</artifactId>

‎openam-schema/openam-liberty-schema/pom.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* information: "Portions copyright [year] [name of copyright owner]".
1414
*
1515
* Copyright 2011-2016 ForgeRock AS.
16+
* Portions Copyright 2022 Wren Security
1617
-->
1718
<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">
1819
<modelVersion>4.0.0</modelVersion>
@@ -89,12 +90,7 @@
8990

9091
<dependency>
9192
<groupId>com.sun.xml.bind</groupId>
92-
<artifactId>jaxb-libs</artifactId>
93-
</dependency>
94-
95-
<dependency>
96-
<groupId>com.sun.xml.bind</groupId>
97-
<artifactId>jaxb-xjc</artifactId>
93+
<artifactId>jaxb-impl</artifactId>
9894
</dependency>
9995

10096
<dependency>

‎openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/federation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandlerImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.xml.sax.helpers.LocatorImpl;
2727

2828
import com.sun.xml.bind.JAXBAssertionError;
29-
import com.sun.xml.bind.unmarshaller.Messages;
3029
import com.sun.xml.bind.unmarshaller.Tracer;
3130
import com.sun.xml.bind.util.AttributesImpl;
3231

@@ -112,7 +111,7 @@ public void startElement( String uri, String local, String qname, Attributes att
112111
// the SAXParserFactory.setNamespaceAware(true). When this happens, you see
113112
// the namespace URI is reported as empty whereas you expect something else.
114113
throw new SAXParseException(
115-
Messages.format( Messages.UNEXPECTED_ROOT_ELEMENT2,
114+
String.format("unexpected root element (uri:\"%s\", local:\"%s\"). Expected elements are %s",
116115
uri, local, computeExpectedRootElements() ),
117116
getLocator() );
118117
}

‎openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/ModifyTypeImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ public void setNotChangedSince(java.util.Calendar value) {
337337

338338
public boolean isOverrideAllowed() {
339339
if (!has_OverrideAllowed) {
340-
return javax.xml.bind.DatatypeConverter.parseBoolean(com.sun.xml.bind.DatatypeConverterImpl.installHook("false"));
340+
return false;
341341
} else {
342342
return _OverrideAllowed;
343343
}

‎openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/idpp/jaxb/impl/QueryTypeImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ public void setSelect(java.lang.String value) {
345345

346346
public boolean isIncludeCommonAttributes() {
347347
if (!has_IncludeCommonAttributes) {
348-
return javax.xml.bind.DatatypeConverter.parseBoolean(com.sun.xml.bind.DatatypeConverterImpl.installHook("false"));
348+
return false;
349349
} else {
350350
return _IncludeCommonAttributes;
351351
}

‎openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/SelectTypeImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public java.util.List getItem() {
3636

3737
public boolean isMultiple() {
3838
if (!has_Multiple) {
39-
return javax.xml.bind.DatatypeConverter.parseBoolean(com.sun.xml.bind.DatatypeConverterImpl.installHook("false"));
39+
return false;
4040
} else {
4141
return _Multiple;
4242
}

‎openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/interaction/jaxb/impl/UserInteractionHeaderTypeImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void setMustUnderstand(boolean value) {
3939

4040
public boolean isRedirect() {
4141
if (!has_Redirect) {
42-
return javax.xml.bind.DatatypeConverter.parseBoolean(com.sun.xml.bind.DatatypeConverterImpl.installHook("false"));
42+
return false;
4343
} else {
4444
return _Redirect;
4545
}

‎openam-schema/openam-liberty-schema/src/main/java/com/sun/identity/liberty/ws/meta/jaxb/impl/SPDescriptorTypeImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ public void setValue(java.lang.String value) {
282282

283283
public boolean isIsDefault() {
284284
if (!has_IsDefault) {
285-
return javax.xml.bind.DatatypeConverter.parseBoolean(com.sun.xml.bind.DatatypeConverterImpl.installHook("false"));
285+
return false;
286286
} else {
287287
return _IsDefault;
288288
}

‎openam-schema/openam-saml2-schema/pom.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* information: "Portions copyright [year] [name of copyright owner]".
1414
*
1515
* Copyright 2011-2016 ForgeRock AS.
16+
* Portions Copyright 2022 Wren Security
1617
-->
1718
<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">
1819
<modelVersion>4.0.0</modelVersion>
@@ -83,12 +84,7 @@
8384

8485
<dependency>
8586
<groupId>com.sun.xml.bind</groupId>
86-
<artifactId>jaxb-libs</artifactId>
87-
</dependency>
88-
89-
<dependency>
90-
<groupId>com.sun.xml.bind</groupId>
91-
<artifactId>jaxb-xjc</artifactId>
87+
<artifactId>jaxb-impl</artifactId>
9288
</dependency>
9389
</dependencies>
9490
</project>

‎openam-schema/openam-saml2-schema/src/main/java/com/sun/identity/saml2/jaxb/assertion/impl/runtime/SAXUnmarshallerHandlerImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.xml.sax.helpers.LocatorImpl;
2727

2828
import com.sun.xml.bind.JAXBAssertionError;
29-
import com.sun.xml.bind.unmarshaller.Messages;
3029
import com.sun.xml.bind.unmarshaller.Tracer;
3130
import com.sun.xml.bind.util.AttributesImpl;
3231

@@ -112,7 +111,7 @@ public void startElement( String uri, String local, String qname, Attributes att
112111
// the SAXParserFactory.setNamespaceAware(true). When this happens, you see
113112
// the namespace URI is reported as empty whereas you expect something else.
114113
throw new SAXParseException(
115-
Messages.format( Messages.UNEXPECTED_ROOT_ELEMENT2,
114+
String.format("unexpected root element (uri:\"%s\", local:\"%s\"). Expected elements are %s",
116115
uri, local, computeExpectedRootElements() ),
117116
getLocator() );
118117
}

‎openam-schema/openam-wsfederation-schema/pom.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* information: "Portions copyright [year] [name of copyright owner]".
1414
*
1515
* Copyright 2011-2016 ForgeRock AS.
16+
* Portions Copyright 2022 Wren Security
1617
-->
1718
<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">
1819
<modelVersion>4.0.0</modelVersion>
@@ -72,12 +73,7 @@
7273

7374
<dependency>
7475
<groupId>com.sun.xml.bind</groupId>
75-
<artifactId>jaxb-libs</artifactId>
76-
</dependency>
77-
78-
<dependency>
79-
<groupId>com.sun.xml.bind</groupId>
80-
<artifactId>jaxb-xjc</artifactId>
76+
<artifactId>jaxb-impl</artifactId>
8177
</dependency>
8278
</dependencies>
8379
</project>

‎openam-schema/openam-wsfederation-schema/src/main/java/com/sun/identity/wsfederation/jaxb/entityconfig/impl/runtime/SAXUnmarshallerHandlerImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.xml.sax.helpers.LocatorImpl;
2727

2828
import com.sun.xml.bind.JAXBAssertionError;
29-
import com.sun.xml.bind.unmarshaller.Messages;
3029
import com.sun.xml.bind.unmarshaller.Tracer;
3130
import com.sun.xml.bind.util.AttributesImpl;
3231

@@ -112,7 +111,7 @@ public void startElement( String uri, String local, String qname, Attributes att
112111
// the SAXParserFactory.setNamespaceAware(true). When this happens, you see
113112
// the namespace URI is reported as empty whereas you expect something else.
114113
throw new SAXParseException(
115-
Messages.format( Messages.UNEXPECTED_ROOT_ELEMENT2,
114+
String.format("unexpected root element (uri:\"%s\", local:\"%s\"). Expected elements are %s",
116115
uri, local, computeExpectedRootElements() ),
117116
getLocator() );
118117
}

‎openam-schema/openam-xacml3-schema/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* information: "Portions copyright [year] [name of copyright owner]".
1414
*
1515
* Copyright 2011-2016 ForgeRock AS.
16+
* Portions Copyright 2022 Wren Security
1617
-->
1718
<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">
1819
<modelVersion>4.0.0</modelVersion>
@@ -72,11 +73,4 @@
7273
</build>
7374
</profile>
7475
</profiles>
75-
76-
<dependencies>
77-
<dependency>
78-
<groupId>com.sun.xml.bind</groupId>
79-
<artifactId>jaxb-libs</artifactId>
80-
</dependency>
81-
</dependencies>
8276
</project>

‎openam-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<plugins>
3737
<plugin>
3838
<groupId>org.codehaus.cargo</groupId>
39-
<artifactId>cargo-maven2-plugin</artifactId>
39+
<artifactId>cargo-maven3-plugin</artifactId>
4040
<extensions>true</extensions>
4141
<executions>
4242
<execution>

‎pom.xml

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<properties>
9393
<wrensec-commons.version>22.4.0</wrensec-commons.version>
9494
<wrensec-guava.version>18.0.5</wrensec-guava.version>
95-
<pgpVerifyKeysVersion>1.7.2</pgpVerifyKeysVersion>
95+
<pgpVerifyKeysVersion>1.7.3</pgpVerifyKeysVersion>
9696

9797
<!-- **************************************************************** -->
9898
<maven.build.timestamp.format>yyyy-MMM-dd HH:mm:ss</maven.build.timestamp.format>
@@ -142,8 +142,9 @@
142142
<geoip.version>2.0.0</geoip.version>
143143
<groovy.version>2.4.6</groovy.version>
144144
<groovy-sandbox.version>1.6</groovy-sandbox.version>
145-
<jaxb.version>1.0.6</jaxb.version>
146-
<jaxb1.version>2.0.2</jaxb1.version>
145+
<jaxb-api.version>2.3.1</jaxb-api.version>
146+
<jaxb.version>2.3.7</jaxb.version>
147+
<jaxb1.version>2.2.5-1</jaxb1.version>
147148
<jaxrpc-api.version>1.1</jaxrpc-api.version>
148149
<jaxrpc-impl.version>1.1.4_01-wren1</jaxrpc-impl.version>
149150
<jaxrpc-spi.version>1.1.4_01-wren1</jaxrpc-spi.version>
@@ -1311,7 +1312,7 @@
13111312
<dependency>
13121313
<groupId>javax.xml.bind</groupId>
13131314
<artifactId>jaxb-api</artifactId>
1314-
<version>${jaxb.version}</version>
1315+
<version>${jaxb-api.version}</version>
13151316
</dependency>
13161317

13171318
<dependency>
@@ -1326,18 +1327,6 @@
13261327
<version>${jaxb.version}</version>
13271328
</dependency>
13281329

1329-
<dependency>
1330-
<groupId>com.sun.xml.bind</groupId>
1331-
<artifactId>jaxb-libs</artifactId>
1332-
<version>${jaxb.version}</version>
1333-
</dependency>
1334-
1335-
<dependency>
1336-
<groupId>com.sun.xml.bind</groupId>
1337-
<artifactId>jaxb-xjc</artifactId>
1338-
<version>${jaxb.version}</version>
1339-
</dependency>
1340-
13411330
<dependency>
13421331
<groupId>javax.xml</groupId>
13431332
<artifactId>jaxrpc-api</artifactId>
@@ -2310,8 +2299,8 @@
23102299
</plugin>
23112300
<plugin>
23122301
<groupId>org.codehaus.cargo</groupId>
2313-
<artifactId>cargo-maven2-plugin</artifactId>
2314-
<version>1.4.3</version>
2302+
<artifactId>cargo-maven3-plugin</artifactId>
2303+
<version>1.9.13</version>
23152304
</plugin>
23162305
<plugin>
23172306
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)