This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 5bd8502 [SYNCOPE-1427] Besides JDK 11, also switched to CXF
3.3.0-SNAPSHOT and OpenJPA 3.0.1-SNAPSHOT
5bd8502 is described below
commit 5bd85029d0ad879456ab2b2fcc548cba7f1ff1fd
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Mon Jan 21 17:32:29 2019 +0100
[SYNCOPE-1427] Besides JDK 11, also switched to CXF 3.3.0-SNAPSHOT and
OpenJPA 3.0.1-SNAPSHOT
---
.travis.yml | 6 +-
appveyor.yml | 23 +++--
.../syncope/client/enduser/pages/HomePage.java | 2 +-
.../client/enduser/resources/GroupResource.java | 5 +-
.../init/ClassPathScanImplementationLookup.java | 16 ++--
.../client/lib/batch/BatchClientProxyImpl.java | 2 +-
.../api/search/SearchCondConverter.java | 2 +-
.../persistence/api/search/SearchCondVisitor.java | 25 +++---
.../core/persistence/jpa/PersistenceContext.java | 46 ++++++----
.../jpa/openjpa/BooleanValueHandler.java | 2 +-
.../jpa/openjpa/LocaleValueHandler.java | 2 +-
core/provisioning-java/pom.xml | 4 +
.../provisioning/java/ProvisioningContext.java | 36 +++++---
.../core/starter/SyncopeCoreApplication.java | 2 +
core/upgrade/pom.xml | 5 ++
.../syncope/ext/oidcclient/agent/CodeConsumer.java | 2 +-
.../apache/syncope/ext/oidcclient/agent/Login.java | 2 +-
.../syncope/ext/oidcclient/agent/Logout.java | 2 +-
.../console/panels/OIDCSSOLoginFormPanel.java | 2 +-
.../ext/saml2lsp/agent/AbstractSAML2SPServlet.java | 2 +-
.../ext/saml2lsp/agent/AssertionConsumer.java | 2 +-
.../apache/syncope/ext/saml2lsp/agent/Login.java | 2 +-
.../apache/syncope/ext/saml2lsp/agent/Logout.java | 4 +-
.../console/panels/SAMLSSOLoginFormPanel.java | 2 +-
.../apache/syncope/core/logic/SAML2SPLogic.java | 8 +-
.../core/logic/saml2/SAML2ReaderWriter.java | 2 +-
fit/build-tools/pom.xml | 4 +
pom.xml | 100 +++++++++------------
28 files changed, 170 insertions(+), 142 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 10737a1..3a7bf33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,16 +16,16 @@
sudo: false
language: java
jdk:
- - openjdk10
+ - openjdk11
before_install:
- - echo 'MAVEN_OPTS="-Xmx2048M -Xss128M -XX:+CMSClassUnloadingEnabled
-XX:+UseConcMarkSweepGC -XX:+TieredCompilation -XX:TieredStopAtLevel=1"'
>~/.mavenrc
+ - echo 'MAVEN_OPTS="-Xmx2048M -Xss128M -XX:+CMSClassUnloadingEnabled
-XX:+TieredCompilation -XX:TieredStopAtLevel=1"' >~/.mavenrc
# default install is mvn install --quiet -DskipTests=true
install: travis_wait 30 mvn --show-version --quiet -T 1C -P all,skipTests
before_script:
- cd fit/core-reference
script:
# invoker.streamLogs: we cannot access to log files through Travis web ui,
so display everything in the console
- - travis_wait 120 mvn --show-version verify -Dinvoker.streamLogs=true
+ - mvn --show-version verify -Dinvoker.streamLogs=true
after_failure:
- cat target/log/*
- cat target/failsafe-reports/org.apache.syncope.fit.*-output.txt
diff --git a/appveyor.yml b/appveyor.yml
index 82c5d06..d7f98b0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -19,23 +19,34 @@ os: Windows Server 2012
init:
- git config --global core.autocrlf true
install:
- - cinst git
- - cinst patch
+ # Make unix-compatible patch.exe available to the build by copying it from
+ # Git\usr\bin (that we remove from PATH) to another directory and adding it
to
+ # PATH; the reason we copy it is that logic below removes
+ # C:\Program Files\Git\usr\bin from Path to avoid build issue resulting from
+ # sh.exe being on the path.
+ - cmd: mkdir "C:\Program Files\PatchFromGit"
+ - ps: copy "C:\Program Files\Git\usr\bin\patch.exe" "C:\Program
Files\PatchFromGit"
+ - ps: copy "C:\Program Files\Git\usr\bin\msys*.dll" "C:\Program
Files\PatchFromGit"
+ - cmd: SET PATH=C:\Program Files\PatchFromGit;%PATH%
+
- ps: |
Add-Type -AssemblyName System.IO.Compression.FileSystem
if (!(Test-Path -Path "C:\maven" )) {
(new-object
System.Net.WebClient).DownloadFile('https://www.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.zip',
'C:\maven-bin.zip')
[System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip",
"C:\maven")
}
- - cmd: SET PATH=C:\maven\apache-maven-3.5.4\bin;%JAVA_HOME%\bin;=%;
- - cmd: SET JAVA_HOME=C:\Program Files\Java\jdk1.8.0
+ - cmd: SET PATH=C:\maven\apache-maven-3.5.4\bin;%JAVA_HOME%\bin;%PATH%
+ - cmd: SET JAVA_HOME=C:\Program Files\Java\jdk11
- cmd: SET M2_HOME=C:\maven\apache-maven-3.5.4
- - cmd: SET MAVEN_OPTS=-Xmx4g
+ - cmd: SET MAVEN_OPTS="-Xmx2048M -Xss128M -XX:+CMSClassUnloadingEnabled
-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
- cmd: SET JAVA_OPTS=-Xmx4g
+
+ - echo %PATH%
build_script:
- mvn --show-version --quiet -T 1C -PskipTests,all --batch-mode
test_script:
- - mvn -T 1C clean install --batch-mode
+ - cd fit\core_reference
+ - mvn clean verify
cache:
- C:\maven\
- C:\Users\appveyor\.m2
diff --git
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/pages/HomePage.java
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/pages/HomePage.java
index 3adec28..e5e1632 100644
---
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/pages/HomePage.java
+++
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/pages/HomePage.java
@@ -48,7 +48,7 @@ public class HomePage extends WebPage {
private void appendMessage(final StringBuilder redirectUrl, final String
message) {
try {
- redirectUrl.append(URLEncoder.encode(message,
StandardCharsets.UTF_8.name()));
+ redirectUrl.append(URLEncoder.encode(message,
StandardCharsets.UTF_8));
} catch (Exception e) {
redirectUrl.append("Generic error");
}
diff --git
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/GroupResource.java
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/GroupResource.java
index 9001913..d48bd15 100644
---
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/GroupResource.java
+++
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/GroupResource.java
@@ -63,7 +63,7 @@ public class GroupResource extends BaseResource {
final GroupResponse groupResponse = new GroupResponse();
if (customTemplate.getWizard().getSteps().containsKey("groups")) {
String realm =
URLDecoder.decode(attributes.getParameters().get("realm").
- toString(SyncopeConstants.ROOT_REALM), "UTF-8");
+ toString(SyncopeConstants.ROOT_REALM),
StandardCharsets.UTF_8);
StringValue term = attributes.getParameters().get("term");
final int totGroups = SyncopeEnduserSession.get().
@@ -71,7 +71,8 @@ public class GroupResource extends BaseResource {
final List<GroupTO> groupTOs = SyncopeEnduserSession.get().
getService(SyncopeService.class).searchAssignableGroups(
realm,
- term.isNull() || term.isEmpty() ? null :
URLDecoder.decode(term.toString(), "UTF-8"),
+ term.isNull() || term.isEmpty()
+ ? null : URLDecoder.decode(term.toString(),
StandardCharsets.UTF_8),
1,
30).getResult();
groupResponse.setTotGroups(totGroups);
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/init/ClassPathScanImplementationLookup.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/init/ClassPathScanImplementationLookup.java
index e7b248f..71a6bb5 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/init/ClassPathScanImplementationLookup.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/init/ClassPathScanImplementationLookup.java
@@ -240,32 +240,38 @@ public class ClassPathScanImplementationLookup {
if (!clazz.equals(EmptyExternalResourceProvider.class)
&& !clazz.isInstance(resourceProvider)) {
- resourceProvider = (ExternalResourceProvider)
clazz.newInstance();
+ resourceProvider = (ExternalResourceProvider)
clazz.
+ getConstructor().newInstance();
}
} else if
(AnyWizardBuilderAdditionalSteps.class.isAssignableFrom(clazz)) {
if
(!clazz.equals(EmptyAnyWizardBuilderAdditionalSteps.class)
&&
!clazz.isInstance(anyWizardBuilderAdditionalSteps)) {
- anyWizardBuilderAdditionalSteps =
(AnyWizardBuilderAdditionalSteps) clazz.newInstance();
+ anyWizardBuilderAdditionalSteps =
(AnyWizardBuilderAdditionalSteps) clazz.
+ getConstructor().newInstance();
}
} else if (StatusProvider.class.isAssignableFrom(clazz)) {
if (!clazz.equals(EmptyStatusProvider.class)
&& !clazz.isInstance(statusProvider)) {
- statusProvider = (StatusProvider)
clazz.newInstance();
+ statusProvider = (StatusProvider) clazz.
+ getConstructor().newInstance();
}
} else if
(VirSchemaDetailsPanelProvider.class.isAssignableFrom(clazz)) {
if
(!clazz.equals(EmptyVirSchemaDetailsPanelProvider.class)
&&
!clazz.isInstance(virSchemaDetailsPanelProvider)) {
- virSchemaDetailsPanelProvider =
(VirSchemaDetailsPanelProvider) clazz.newInstance();
+ virSchemaDetailsPanelProvider =
(VirSchemaDetailsPanelProvider) clazz.
+ getConstructor().newInstance();
}
} else if
(AnyDirectoryPanelAditionalActionLinksProvider.class.isAssignableFrom(clazz)) {
if
(!clazz.equals(EmptyAnyDirectoryPanelAditionalActionLinksProvider.class)
&&
!clazz.isInstance(anyDirectoryPanelAditionalActionLinksProvider)) {
anyDirectoryPanelAditionalActionLinksProvider =
-
(AnyDirectoryPanelAditionalActionLinksProvider) clazz.newInstance();
+
(AnyDirectoryPanelAditionalActionLinksProvider) clazz.
+ getConstructor().newInstance();
+
}
}
}
diff --git
a/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/batch/BatchClientProxyImpl.java
b/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/batch/BatchClientProxyImpl.java
index 3e736e0..15819e0 100644
---
a/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/batch/BatchClientProxyImpl.java
+++
b/client/idrepo/lib/src/main/java/org/apache/syncope/client/lib/batch/BatchClientProxyImpl.java
@@ -70,7 +70,7 @@ public class BatchClientProxyImpl extends ClientProxyImpl {
bri.setHeaders((Map<String, List<Object>>)
message.get(Message.PROTOCOL_HEADERS));
BatchOfflineHTTPConduit conduit = (BatchOfflineHTTPConduit)
message.getExchange().getConduit(message);
-
bri.setContent(conduit.getOutputStream().toString(StandardCharsets.UTF_8.name()));
+
bri.setContent(conduit.getOutputStream().toString(StandardCharsets.UTF_8));
factory.add(bri);
return null;
diff --git
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondConverter.java
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondConverter.java
index 257ba7f..7c216b3 100644
---
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondConverter.java
+++
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondConverter.java
@@ -50,7 +50,7 @@ public final class SearchCondConverter {
if (realms != null && realms.length > 0) {
visitor.setRealm(realms[0]);
}
- SearchCondition<SearchBean> sc =
parser.parse(URLDecoder.decode(fiql, StandardCharsets.UTF_8.name()));
+ SearchCondition<SearchBean> sc =
parser.parse(URLDecoder.decode(fiql, StandardCharsets.UTF_8));
sc.accept(visitor);
return visitor.getQuery();
diff --git
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
index 7d01f8a..7a2411b 100644
---
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
+++
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
@@ -18,7 +18,6 @@
*/
package org.apache.syncope.core.persistence.api.search;
-import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -80,21 +79,17 @@ public class SearchCondVisitor extends
AbstractSearchConditionVisitor<SearchBean
String name = getRealPropertyName(sc.getStatement().getProperty());
Optional<SpecialAttr> specialAttrName = SpecialAttr.fromString(name);
- String value = null;
- try {
- value = SearchUtils.toSqlWildcardString(
- URLDecoder.decode(sc.getStatement().getValue().toString(),
StandardCharsets.UTF_8.name()), false).
- replaceAll("\\\\_", "_");
-
- // see SYNCOPE-1321
- if (TIMEZONE.matcher(value).matches()) {
- char[] valueAsArray = value.toCharArray();
- valueAsArray[valueAsArray.length - 5] = '+';
- value = new String(valueAsArray);
- }
- } catch (UnsupportedEncodingException e) {
- throw new IllegalArgumentException("While decoding " +
sc.getStatement().getValue(), e);
+ String value = SearchUtils.toSqlWildcardString(
+ URLDecoder.decode(sc.getStatement().getValue().toString(),
StandardCharsets.UTF_8), false).
+ replaceAll("\\\\_", "_");
+
+ // see SYNCOPE-1321
+ if (TIMEZONE.matcher(value).matches()) {
+ char[] valueAsArray = value.toCharArray();
+ valueAsArray[valueAsArray.length - 5] = '+';
+ value = new String(valueAsArray);
}
+
Optional<SpecialAttr> specialAttrValue = SpecialAttr.fromString(value);
AttributeCond attributeCond = createAttributeCond(name);
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/PersistenceContext.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/PersistenceContext.java
index d732fbd..34ead77 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/PersistenceContext.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/PersistenceContext.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.core.persistence.jpa;
+import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.Map;
import javax.persistence.ValidationMode;
@@ -102,65 +103,74 @@ public class PersistenceContext implements
EnvironmentAware {
@Bean
public EntityFactory entityFactory()
- throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
+ throws ClassNotFoundException, InstantiationException,
IllegalAccessException, NoSuchMethodException,
+ IllegalArgumentException, InvocationTargetException {
- return (EntityFactory)
Class.forName(env.getProperty("entity.factory")).newInstance();
+ return (EntityFactory)
Class.forName(env.getProperty("entity.factory")).getConstructor().newInstance();
}
@Bean
public PlainSchemaDAO plainSchemaDAO()
- throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
+ throws ClassNotFoundException, InstantiationException,
IllegalAccessException, NoSuchMethodException,
+ IllegalArgumentException, InvocationTargetException {
- return (PlainSchemaDAO)
Class.forName(env.getProperty("plainSchema.dao")).newInstance();
+ return (PlainSchemaDAO)
Class.forName(env.getProperty("plainSchema.dao")).getConstructor().newInstance();
}
@Bean
public PlainAttrDAO plainAttrDAO()
- throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
+ throws ClassNotFoundException, InstantiationException,
IllegalAccessException, NoSuchMethodException,
+ IllegalArgumentException, InvocationTargetException {
- return (PlainAttrDAO)
Class.forName(env.getProperty("plainAttr.dao")).newInstance();
+ return (PlainAttrDAO)
Class.forName(env.getProperty("plainAttr.dao")).getConstructor().newInstance();
}
@Bean
public PlainAttrValueDAO plainAttrValueDAO()
- throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
+ throws ClassNotFoundException, InstantiationException,
IllegalAccessException, NoSuchMethodException,
+ IllegalArgumentException, InvocationTargetException {
- return (PlainAttrValueDAO)
Class.forName(env.getProperty("plainAttrValue.dao")).newInstance();
+ return (PlainAttrValueDAO)
Class.forName(env.getProperty("plainAttrValue.dao")).getConstructor().newInstance();
}
@Bean
public AnySearchDAO anySearchDAO()
- throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
+ throws ClassNotFoundException, InstantiationException,
IllegalAccessException, NoSuchMethodException,
+ IllegalArgumentException, InvocationTargetException {
- return (AnySearchDAO)
Class.forName(env.getProperty("any.search.dao")).newInstance();
+ return (AnySearchDAO)
Class.forName(env.getProperty("any.search.dao")).getConstructor().newInstance();
}
@Bean
public UserDAO userDAO()
- throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
+ throws ClassNotFoundException, InstantiationException,
IllegalAccessException, NoSuchMethodException,
+ IllegalArgumentException, InvocationTargetException {
- return (UserDAO)
Class.forName(env.getProperty("user.dao")).newInstance();
+ return (UserDAO)
Class.forName(env.getProperty("user.dao")).getConstructor().newInstance();
}
@Bean
public GroupDAO groupDAO()
- throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
+ throws ClassNotFoundException, InstantiationException,
IllegalAccessException, NoSuchMethodException,
+ IllegalArgumentException, InvocationTargetException {
- return (GroupDAO)
Class.forName(env.getProperty("group.dao")).newInstance();
+ return (GroupDAO)
Class.forName(env.getProperty("group.dao")).getConstructor().newInstance();
}
@Bean
public AnyObjectDAO anyObjectDAO()
- throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
+ throws ClassNotFoundException, InstantiationException,
IllegalAccessException, NoSuchMethodException,
+ IllegalArgumentException, InvocationTargetException {
- return (AnyObjectDAO)
Class.forName(env.getProperty("anyObject.dao")).newInstance();
+ return (AnyObjectDAO)
Class.forName(env.getProperty("anyObject.dao")).getConstructor().newInstance();
}
@Bean
public ConfDAO confDAO()
- throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
+ throws ClassNotFoundException, InstantiationException,
IllegalAccessException, NoSuchMethodException,
+ IllegalArgumentException, InvocationTargetException {
- return (ConfDAO)
Class.forName(env.getProperty("conf.dao")).newInstance();
+ return (ConfDAO)
Class.forName(env.getProperty("conf.dao")).getConstructor().newInstance();
}
@Bean
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/openjpa/BooleanValueHandler.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/openjpa/BooleanValueHandler.java
index ab0f319..61dcfbd 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/openjpa/BooleanValueHandler.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/openjpa/BooleanValueHandler.java
@@ -41,7 +41,7 @@ public class BooleanValueHandler extends AbstractValueHandler
{
/**
* {@inheritDoc}
*
- * @deprecated
+ * @Deprecated
*/
@Override
public Column[] map(final ValueMapping vm, final String name, final
ColumnIO io, final boolean adapt) {
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/openjpa/LocaleValueHandler.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/openjpa/LocaleValueHandler.java
index a96ca2a..42cba53 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/openjpa/LocaleValueHandler.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/openjpa/LocaleValueHandler.java
@@ -42,7 +42,7 @@ public class LocaleValueHandler extends AbstractValueHandler {
/**
* {@inheritDoc}
*
- * @deprecated
+ * @Deprecated
*/
@Override
public Column[] map(final ValueMapping vm, final String name, final
ColumnIO io, final boolean adapt) {
diff --git a/core/provisioning-java/pom.xml b/core/provisioning-java/pom.xml
index c4c04a3..14cd84e 100644
--- a/core/provisioning-java/pom.xml
+++ b/core/provisioning-java/pom.xml
@@ -73,6 +73,10 @@ under the License.
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-bsf</artifactId>
</dependency>
<dependency>
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ProvisioningContext.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ProvisioningContext.java
index c4de243..5fde51d 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ProvisioningContext.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ProvisioningContext.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.core.provisioning.java;
+import java.lang.reflect.InvocationTargetException;
import org.apache.syncope.core.provisioning.api.AnyObjectProvisioningManager;
import org.apache.syncope.core.provisioning.api.AuditManager;
import org.apache.syncope.core.provisioning.api.GroupProvisioningManager;
@@ -53,57 +54,64 @@ public class ProvisioningContext implements
EnvironmentAware {
@Bean
public PropagationTaskExecutor propagationTaskExecutor()
- throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
+ throws ClassNotFoundException, InstantiationException,
IllegalAccessException, NoSuchMethodException,
+ IllegalArgumentException, InvocationTargetException {
return (PropagationTaskExecutor)
Class.forName(env.getProperty("propagationTaskExecutor")).
- newInstance();
+ getConstructor().newInstance();
}
@Bean
public UserProvisioningManager userProvisioningManager()
- throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
+ throws ClassNotFoundException, InstantiationException,
IllegalAccessException, NoSuchMethodException,
+ IllegalArgumentException, InvocationTargetException {
return (UserProvisioningManager)
Class.forName(env.getProperty("userProvisioningManager")).
- newInstance();
+ getConstructor().newInstance();
}
@Bean
public GroupProvisioningManager groupProvisioningManager()
- throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
+ throws ClassNotFoundException, InstantiationException,
IllegalAccessException, NoSuchMethodException,
+ IllegalArgumentException, InvocationTargetException {
return (GroupProvisioningManager)
Class.forName(env.getProperty("groupProvisioningManager")).
- newInstance();
+ getConstructor().newInstance();
}
@Bean
public AnyObjectProvisioningManager anyObjectProvisioningManager()
- throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
+ throws ClassNotFoundException, InstantiationException,
IllegalAccessException, NoSuchMethodException,
+ IllegalArgumentException, InvocationTargetException {
return (AnyObjectProvisioningManager)
Class.forName(env.getProperty("anyObjectProvisioningManager")).
- newInstance();
+ getConstructor().newInstance();
}
@Bean
public VirAttrCache virAttrCache()
- throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
+ throws ClassNotFoundException, InstantiationException,
IllegalAccessException, NoSuchMethodException,
+ IllegalArgumentException, InvocationTargetException {
return (VirAttrCache) Class.forName(env.getProperty("virAttrCache")).
- newInstance();
+ getConstructor().newInstance();
}
@Bean
public NotificationManager notificationManager()
- throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
+ throws ClassNotFoundException, InstantiationException,
IllegalAccessException, NoSuchMethodException,
+ IllegalArgumentException, InvocationTargetException {
return (NotificationManager)
Class.forName(env.getProperty("notificationManager")).
- newInstance();
+ getConstructor().newInstance();
}
@Bean
public AuditManager auditManager()
- throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
+ throws ClassNotFoundException, InstantiationException,
IllegalAccessException, NoSuchMethodException,
+ IllegalArgumentException, InvocationTargetException {
return (AuditManager) Class.forName(env.getProperty("auditManager")).
- newInstance();
+ getConstructor().newInstance();
}
}
diff --git
a/core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreApplication.java
b/core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreApplication.java
index 9350203..2bd489b 100644
---
a/core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreApplication.java
+++
b/core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreApplication.java
@@ -19,6 +19,7 @@
package org.apache.syncope.core.starter;
import java.io.IOException;
+import
org.apache.cxf.spring.boot.autoconfigure.openapi.OpenApiAutoConfiguration;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -38,6 +39,7 @@ import
org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableAutoConfiguration(exclude = {
ErrorMvcAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class,
+ OpenApiAutoConfiguration.class,
DataSourceAutoConfiguration.class,
DataSourceTransactionManagerAutoConfiguration.class,
JdbcTemplateAutoConfiguration.class,
diff --git a/core/upgrade/pom.xml b/core/upgrade/pom.xml
index a7380a3..0935f8c 100644
--- a/core/upgrade/pom.xml
+++ b/core/upgrade/pom.xml
@@ -50,6 +50,11 @@ under the License.
<!-- TEST -->
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
diff --git
a/ext/oidcclient/agent/src/main/java/org/apache/syncope/ext/oidcclient/agent/CodeConsumer.java
b/ext/oidcclient/agent/src/main/java/org/apache/syncope/ext/oidcclient/agent/CodeConsumer.java
index b9fbbe0..5a90215 100644
---
a/ext/oidcclient/agent/src/main/java/org/apache/syncope/ext/oidcclient/agent/CodeConsumer.java
+++
b/ext/oidcclient/agent/src/main/java/org/apache/syncope/ext/oidcclient/agent/CodeConsumer.java
@@ -105,7 +105,7 @@ public class CodeConsumer extends HttpServlet {
e.printStackTrace(response.getWriter());
} else {
response.sendRedirect(errorURL + "?errorMessage="
- + URLEncoder.encode(e.getMessage(),
StandardCharsets.UTF_8.name()));
+ + URLEncoder.encode(e.getMessage(),
StandardCharsets.UTF_8));
}
}
}
diff --git
a/ext/oidcclient/agent/src/main/java/org/apache/syncope/ext/oidcclient/agent/Login.java
b/ext/oidcclient/agent/src/main/java/org/apache/syncope/ext/oidcclient/agent/Login.java
index ebe3b0f..ceea8d5 100644
---
a/ext/oidcclient/agent/src/main/java/org/apache/syncope/ext/oidcclient/agent/Login.java
+++
b/ext/oidcclient/agent/src/main/java/org/apache/syncope/ext/oidcclient/agent/Login.java
@@ -80,7 +80,7 @@ public class Login extends HttpServlet {
e.printStackTrace(response.getWriter());
} else {
response.sendRedirect(errorURL + "?errorMessage="
- + URLEncoder.encode(e.getMessage(),
StandardCharsets.UTF_8.name()));
+ + URLEncoder.encode(e.getMessage(),
StandardCharsets.UTF_8));
}
}
}
diff --git
a/ext/oidcclient/agent/src/main/java/org/apache/syncope/ext/oidcclient/agent/Logout.java
b/ext/oidcclient/agent/src/main/java/org/apache/syncope/ext/oidcclient/agent/Logout.java
index a0cb4b6..d948b30 100644
---
a/ext/oidcclient/agent/src/main/java/org/apache/syncope/ext/oidcclient/agent/Logout.java
+++
b/ext/oidcclient/agent/src/main/java/org/apache/syncope/ext/oidcclient/agent/Logout.java
@@ -57,7 +57,7 @@ public class Logout extends HttpServlet {
e.printStackTrace(response.getWriter());
} else {
response.sendRedirect(errorURL + "?errorMessage="
- + URLEncoder.encode(e.getMessage(),
StandardCharsets.UTF_8.name()));
+ + URLEncoder.encode(e.getMessage(),
StandardCharsets.UTF_8));
}
}
}
diff --git
a/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/panels/OIDCSSOLoginFormPanel.java
b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/panels/OIDCSSOLoginFormPanel.java
index 5b108e5..c29c07a 100644
---
a/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/panels/OIDCSSOLoginFormPanel.java
+++
b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/panels/OIDCSSOLoginFormPanel.java
@@ -93,7 +93,7 @@ public class OIDCSSOLoginFormPanel extends SSOLoginFormPanel {
RequestCycle.get().scheduleRequestHandlerAfterCurrent(new
RedirectRequestHandler(
UrlUtils.rewriteToContextRelative("oidcclient/login?op="
+ URLEncoder.encode(
- model.getObject().getName(),
StandardCharsets.UTF_8.name()),
+ model.getObject().getName(),
StandardCharsets.UTF_8),
RequestCycle.get())));
} catch (Exception e) {
LOG.error("Could not redirect to the selected OP {}",
model.getObject().getName(), e);
diff --git
a/ext/saml2sp/agent/src/main/java/org/apache/syncope/ext/saml2lsp/agent/AbstractSAML2SPServlet.java
b/ext/saml2sp/agent/src/main/java/org/apache/syncope/ext/saml2lsp/agent/AbstractSAML2SPServlet.java
index 574d91e..d625eb6 100644
---
a/ext/saml2sp/agent/src/main/java/org/apache/syncope/ext/saml2lsp/agent/AbstractSAML2SPServlet.java
+++
b/ext/saml2sp/agent/src/main/java/org/apache/syncope/ext/saml2lsp/agent/AbstractSAML2SPServlet.java
@@ -87,7 +87,7 @@ public abstract class AbstractSAML2SPServlet extends
HttpServlet {
String samlResponse = params.getFirst(SSOConstants.SAML_RESPONSE);
if (StringUtils.isNotBlank(samlResponse)) {
- samlResponse = URLDecoder.decode(samlResponse,
StandardCharsets.UTF_8.name());
+ samlResponse = URLDecoder.decode(samlResponse,
StandardCharsets.UTF_8);
LOG.debug("Received SAML Response: {}", samlResponse);
}
diff --git
a/ext/saml2sp/agent/src/main/java/org/apache/syncope/ext/saml2lsp/agent/AssertionConsumer.java
b/ext/saml2sp/agent/src/main/java/org/apache/syncope/ext/saml2lsp/agent/AssertionConsumer.java
index 106b8cc..1520368 100644
---
a/ext/saml2sp/agent/src/main/java/org/apache/syncope/ext/saml2lsp/agent/AssertionConsumer.java
+++
b/ext/saml2sp/agent/src/main/java/org/apache/syncope/ext/saml2lsp/agent/AssertionConsumer.java
@@ -91,7 +91,7 @@ public class AssertionConsumer extends AbstractSAML2SPServlet
{
e.printStackTrace(response.getWriter());
} else {
response.sendRedirect(errorURL + "?errorMessage="
- + URLEncoder.encode(e.getMessage(),
StandardCharsets.UTF_8.name()));
+ + URLEncoder.encode(e.getMessage(),
StandardCharsets.UTF_8));
}
}
}
diff --git
a/ext/saml2sp/agent/src/main/java/org/apache/syncope/ext/saml2lsp/agent/Login.java
b/ext/saml2sp/agent/src/main/java/org/apache/syncope/ext/saml2lsp/agent/Login.java
index f8dc573..2c0eb6c 100644
---
a/ext/saml2sp/agent/src/main/java/org/apache/syncope/ext/saml2lsp/agent/Login.java
+++
b/ext/saml2sp/agent/src/main/java/org/apache/syncope/ext/saml2lsp/agent/Login.java
@@ -57,7 +57,7 @@ public class Login extends AbstractSAML2SPServlet {
e.printStackTrace(response.getWriter());
} else {
response.sendRedirect(errorURL + "?errorMessage="
- + URLEncoder.encode(e.getMessage(),
StandardCharsets.UTF_8.name()));
+ + URLEncoder.encode(e.getMessage(),
StandardCharsets.UTF_8));
}
}
}
diff --git
a/ext/saml2sp/agent/src/main/java/org/apache/syncope/ext/saml2lsp/agent/Logout.java
b/ext/saml2sp/agent/src/main/java/org/apache/syncope/ext/saml2lsp/agent/Logout.java
index d1381f8..324a0ee 100644
---
a/ext/saml2sp/agent/src/main/java/org/apache/syncope/ext/saml2lsp/agent/Logout.java
+++
b/ext/saml2sp/agent/src/main/java/org/apache/syncope/ext/saml2lsp/agent/Logout.java
@@ -70,7 +70,7 @@ public class Logout extends AbstractSAML2SPServlet {
e.printStackTrace(response.getWriter());
} else {
response.sendRedirect(errorURL + "?errorMessage="
- + URLEncoder.encode(e.getMessage(),
StandardCharsets.UTF_8.name()));
+ + URLEncoder.encode(e.getMessage(),
StandardCharsets.UTF_8));
}
}
}
@@ -106,7 +106,7 @@ public class Logout extends AbstractSAML2SPServlet {
e.printStackTrace(response.getWriter());
} else {
response.sendRedirect(errorURL + "?errorMessage="
- + URLEncoder.encode(e.getMessage(),
StandardCharsets.UTF_8.name()));
+ + URLEncoder.encode(e.getMessage(),
StandardCharsets.UTF_8));
}
}
} else { // process REDIRECT binding logout response
diff --git
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAMLSSOLoginFormPanel.java
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAMLSSOLoginFormPanel.java
index 8bd7a1e..16ba28c 100644
---
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAMLSSOLoginFormPanel.java
+++
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAMLSSOLoginFormPanel.java
@@ -84,7 +84,7 @@ public class SAMLSSOLoginFormPanel extends SSOLoginFormPanel {
RequestCycle.get().scheduleRequestHandlerAfterCurrent(new
RedirectRequestHandler(
UrlUtils.rewriteToContextRelative("saml2sp/login?idp="
+ URLEncoder.encode(
-
model.getObject().getEntityID(), StandardCharsets.UTF_8.name()),
+
model.getObject().getEntityID(), StandardCharsets.UTF_8),
RequestCycle.get())));
} catch (Exception e) {
LOG.error("Could not redirect to the selected IdP {}",
model.getObject().getEntityID(), e);
diff --git
a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
index e8880c4..c3592ff 100644
---
a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
+++
b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/SAML2SPLogic.java
@@ -332,13 +332,13 @@ public class SAML2SPLogic extends
AbstractSAML2Logic<EntityTO> {
// 4. sign and encode AuthnRequest
switch (idp.getBindingType()) {
case REDIRECT:
-
requestTO.setRelayState(URLEncoder.encode(relayState.getLeft(),
StandardCharsets.UTF_8.name()));
+
requestTO.setRelayState(URLEncoder.encode(relayState.getLeft(),
StandardCharsets.UTF_8));
requestTO.setContent(URLEncoder.encode(
- saml2rw.encode(authnRequest, true),
StandardCharsets.UTF_8.name()));
-
requestTO.setSignAlg(URLEncoder.encode(saml2rw.getSigAlgo(),
StandardCharsets.UTF_8.name()));
+ saml2rw.encode(authnRequest, true),
StandardCharsets.UTF_8));
+
requestTO.setSignAlg(URLEncoder.encode(saml2rw.getSigAlgo(),
StandardCharsets.UTF_8));
requestTO.setSignature(URLEncoder.encode(
saml2rw.sign(requestTO.getContent(),
requestTO.getRelayState()),
- StandardCharsets.UTF_8.name()));
+ StandardCharsets.UTF_8));
break;
case POST:
diff --git
a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ReaderWriter.java
b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ReaderWriter.java
index 09ae7be..7ed0faa 100644
---
a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ReaderWriter.java
+++
b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ReaderWriter.java
@@ -197,7 +197,7 @@ public class SAML2ReaderWriter {
String requestToSign =
SSOConstants.SAML_REQUEST + "=" + request + "&"
+ SSOConstants.RELAY_STATE + "=" + relayState + "&"
- + SSOConstants.SIG_ALG + "=" + URLEncoder.encode(sigAlgo,
StandardCharsets.UTF_8.name());
+ + SSOConstants.SIG_ALG + "=" + URLEncoder.encode(sigAlgo,
StandardCharsets.UTF_8);
signature.update(requestToSign.getBytes(StandardCharsets.UTF_8));
return Base64.getEncoder().encodeToString(signature.sign());
}
diff --git a/fit/build-tools/pom.xml b/fit/build-tools/pom.xml
index 67cbed0..261414e 100644
--- a/fit/build-tools/pom.xml
+++ b/fit/build-tools/pom.xml
@@ -169,6 +169,10 @@ under the License.
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-bsf</artifactId>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 058e109..9847010 100644
--- a/pom.xml
+++ b/pom.xml
@@ -389,7 +389,7 @@ under the License.
<connid.scimv11.version>1.0.1</connid.scimv11.version>
<connid.servicenow.version>1.0.0</connid.servicenow.version>
- <cxf.version>3.2.7</cxf.version>
+ <cxf.version>3.3.0-SNAPSHOT</cxf.version>
<jackson.version>2.9.8</jackson.version>
@@ -397,7 +397,7 @@ under the License.
<spring-security.version>5.1.3.RELEASE</spring-security.version>
<spring-boot.version>2.1.2.RELEASE</spring-boot.version>
- <openjpa.version>3.0.0</openjpa.version>
+ <openjpa.version>3.0.1-SNAPSHOT</openjpa.version>
<hikaricp.version>3.3.0</hikaricp.version>
<hibernate-validator.version>6.0.13.Final</hibernate-validator.version>
@@ -534,7 +534,7 @@ under the License.
<secretKey>1abcdefghilmnopqrstuvz2!</secretKey>
<jwsKey>ZW7pRixehFuNUtnY5Se47IemgMryTzazPPJ9CGX5LTCmsOJpOgHAQEuPQeV9A28f</jwsKey>
- <targetJdk>1.8</targetJdk>
+ <targetJdk>11</targetJdk>
<rootpom.basedir>${basedir}</rootpom.basedir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -543,6 +543,11 @@ under the License.
<dependencies>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ <dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
@@ -1166,6 +1171,17 @@ under the License.
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-templates</artifactId>
<version>${groovy.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-xml</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-xml</artifactId>
+ <version>${groovy.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -1843,8 +1859,7 @@ under the License.
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
- <source>${targetJdk}</source>
- <target>${targetJdk}</target>
+ <release>${targetJdk}</release>
<useIncrementalCompilation>false</useIncrementalCompilation>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
@@ -2124,8 +2139,11 @@ under the License.
</goals>
<configuration>
<rules>
+ <requireJavaVersion>
+ <version>11</version>
+ </requireJavaVersion>
<requireMavenVersion>
- <version>3.0</version>
+ <version>3.5.0</version>
</requireMavenVersion>
</rules>
</configuration>
@@ -2172,14 +2190,16 @@ under the License.
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.5</version>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>1.6.2</version>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.5.8</version>
+ <version>${groovy.version}</version>
+ <scope>runtime</scope>
+ <type>pom</type>
</dependency>
</dependencies>
<executions>
@@ -2189,7 +2209,8 @@ under the License.
<goal>execute</goal>
</goals>
<configuration>
- <source>
+ <scripts>
+ <script><![CDATA[
import java.util.Date
import java.text.MessageFormat
def year = MessageFormat.format("{0,date,yyyy}", new Date())
@@ -2201,7 +2222,8 @@ under the License.
if (!project.properties.containsKey('buildNumber'))
project.properties['buildNumber'] = ""
- </source>
+ ]]></script>
+ </scripts>
</configuration>
</execution>
</executions>
@@ -2371,10 +2393,10 @@ under the License.
<detectLinks>true</detectLinks>
<detectJavaApiLink>true</detectJavaApiLink>
<links>
- <link>http://docs.oracle.com/javaee/7/api/</link>
+ <link>https://javaee.github.io/javaee-spec/javadocs/</link>
<link>http://www.slf4j.org/api/</link>
<link>http://connid.tirasa.net/apidocs/1.4/</link>
- <link>http://cxf.apache.org/javadoc/latest-3.2.x/</link>
+ <link>http://cxf.apache.org/javadoc/latest/</link>
<link>http://fasterxml.github.io/jackson-core/javadoc/2.9/</link>
<link>http://fasterxml.github.io/jackson-databind/javadoc/2.9/</link>
<link>http://fasterxml.github.io/jackson-annotations/javadoc/2.9/</link>
@@ -2387,13 +2409,14 @@ under the License.
<link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
<link>https://commons.apache.org/proper/commons-io/javadocs/api-2.6/</link>
<link>https://commons.apache.org/proper/commons-jexl/apidocs/</link>
- <link>https://tika.apache.org/1.19/api/</link>
- <link>https://docs.spring.io/spring/docs/5.0.x/javadoc-api/</link>
-
<link>https://docs.spring.io/spring-security/site/docs/5.0.x/api/</link>
+ <link>https://tika.apache.org/1.20/api/</link>
+ <link>https://docs.spring.io/spring-boot/docs/current/api/</link>
+
<link>https://docs.spring.io/spring/docs/current/javadoc-api/</link>
+
<link>https://docs.spring.io/spring-security/site/docs/current/api/</link>
<link>http://www.flowable.org/docs/javadocs/</link>
<link>https://build.shibboleth.net/nexus/content/sites/site/java-opensaml/3.3.0/apidocs/</link>
<link>https://artifacts.elastic.co/javadoc/org/elasticsearch/elasticsearch/6.5.4/index.html</link>
- <link>http://docs.swagger.io/swagger-core/v2.0.5/apidocs/</link>
+ <link>http://docs.swagger.io/swagger-core/v2.0.6/apidocs/</link>
</links>
</configuration>
<reportSets>
@@ -2636,47 +2659,6 @@ under the License.
<module>docker</module>
</modules>
</profile>
-
- <profile>
- <id>java9-plus</id>
-
- <activation>
- <jdk>[9,)</jdk>
- </activation>
-
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.1</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>2.3.0.1</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.3.0.1</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.3.1</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- </dependency>
- </dependencies>
- </profile>
</profiles>
<modules>