You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2019/01/22 09:32:10 UTC
[syncope] branch master updated: [SYNCOPE-1427] More fixes for JDK
11
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 79513e4 [SYNCOPE-1427] More fixes for JDK 11
79513e4 is described below
commit 79513e4463974d0a7e752da25976398fb07ace32
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Jan 22 10:31:59 2019 +0100
[SYNCOPE-1427] More fixes for JDK 11
---
appveyor.yml | 2 +-
.../apache/syncope/common/lib/to/package-info.java | 27 ----------------------
.../syncope/common/lib/types/package-info.java | 27 ----------------------
core/idrepo/rest-cxf/pom.xml | 4 ++--
core/persistence-jpa/pom.xml | 4 ++--
pom.xml | 26 ++++++++++++++-------
6 files changed, 23 insertions(+), 67 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index fac4cb2..9e1ef01 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -45,7 +45,7 @@ install:
build_script:
- mvn --show-version --quiet -T 1C -PskipTests,all --batch-mode
test_script:
- - cd fit\core_reference
+ - cd fit\core-reference
- mvn clean verify
cache:
- C:\maven\
diff --git a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/package-info.java b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/package-info.java
deleted file mode 100644
index 7467695..0000000
--- a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/package-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-@XmlSchema(
- namespace = SyncopeConstants.NS,
- xmlns = { @XmlNs(prefix = SyncopeConstants.NS_PREFIX,
- namespaceURI = SyncopeConstants.NS) })
-package org.apache.syncope.common.lib.to;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlSchema;
-import org.apache.syncope.common.lib.SyncopeConstants;
diff --git a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/types/package-info.java b/common/idm/lib/src/main/java/org/apache/syncope/common/lib/types/package-info.java
deleted file mode 100644
index 6d6cd5c..0000000
--- a/common/idm/lib/src/main/java/org/apache/syncope/common/lib/types/package-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-@XmlSchema(
- namespace = SyncopeConstants.NS,
- xmlns = { @XmlNs(prefix = SyncopeConstants.NS_PREFIX,
- namespaceURI = SyncopeConstants.NS) })
-package org.apache.syncope.common.lib.types;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlSchema;
-import org.apache.syncope.common.lib.SyncopeConstants;
diff --git a/core/idrepo/rest-cxf/pom.xml b/core/idrepo/rest-cxf/pom.xml
index 36d55c1..a092cd8 100644
--- a/core/idrepo/rest-cxf/pom.xml
+++ b/core/idrepo/rest-cxf/pom.xml
@@ -45,8 +45,8 @@ under the License.
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.1_spec</artifactId>
+ <groupId>javax.persistence</groupId>
+ <artifactId>javax.persistence-api</artifactId>
</dependency>
<dependency>
diff --git a/core/persistence-jpa/pom.xml b/core/persistence-jpa/pom.xml
index ba2f644..25e4ceb 100644
--- a/core/persistence-jpa/pom.xml
+++ b/core/persistence-jpa/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.1_spec</artifactId>
+ <groupId>javax.persistence</groupId>
+ <artifactId>javax.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>javax.el</groupId>
diff --git a/pom.xml b/pom.xml
index d1976cb..b3a145c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -553,9 +553,9 @@ under the License.
<version>2.0.1.Final</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.1_spec</artifactId>
- <version>1.0-alpha-1</version>
+ <groupId>javax.persistence</groupId>
+ <artifactId>javax.persistence-api</artifactId>
+ <version>2.2</version>
</dependency>
<dependency>
<groupId>javax.el</groupId>
@@ -851,6 +851,12 @@ under the License.
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${openjpa.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.uuid</groupId>
@@ -1626,7 +1632,7 @@ under the License.
<groupId>org.webjars.bower</groupId>
<artifactId>angular-translate-loader-partial</artifactId>
<version>${angular-translate-loader-partial.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>angular-translate-storage-cookie</artifactId>
@@ -1888,7 +1894,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
+ <version>3.1.0-SNAPSHOT</version>
</plugin>
<plugin>
@@ -2140,7 +2146,7 @@ under the License.
<configuration>
<rules>
<requireJavaVersion>
- <version>11</version>
+ <version>${targetJdk}</version>
</requireJavaVersion>
<requireMavenVersion>
<version>3.5.0</version>
@@ -2387,12 +2393,16 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
+ <version>3.1.0-SNAPSHOT</version>
<configuration>
- <destDir>apidocs/2.1</destDir>
+ <destDir>apidocs/3.0</destDir>
<isOffline>false</isOffline>
<detectLinks>true</detectLinks>
<detectJavaApiLink>true</detectJavaApiLink>
+ <dependencySourceExcludes>
+ <dependencySourceExclude>org.webjars:*</dependencySourceExclude>
+ <dependencySourceExclude>org.webjars.bower:*</dependencySourceExclude>
+ </dependencySourceExcludes>
<links>
<link>https://javaee.github.io/javaee-spec/javadocs/</link>
<link>http://www.slf4j.org/api/</link>