You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by mm...@apache.org on 2020/03/03 10:45:12 UTC
[syncope] 01/04: minor fixes
This is an automated email from the ASF dual-hosted git repository.
mmoayyed pushed a commit to branch SYNCOPE-1545
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 52c22f307e87a2ac288f1e4a55d410732004efb8
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Tue Mar 3 13:38:29 2020 +0330
minor fixes
---
pom.xml | 35 +++++++++++-----------
wa/pom.xml | 13 ++------
.../apache/syncope/wa/SyncopeWAApplication.java | 2 --
3 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4d3fcde..e37e57e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1435,12 +1435,6 @@ under the License.
<groupId>org.apereo.cas</groupId>
<artifactId>cas-server-core-api-configuration-model</artifactId>
<version>${cas.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.1-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apereo.cas</groupId>
@@ -1544,6 +1538,11 @@ under the License.
</dependency>
<dependency>
<groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-jdbc</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
<artifactId>cas-server-support-reports</artifactId>
<version>${cas.version}</version>
</dependency>
@@ -1604,16 +1603,6 @@ under the License.
<artifactId>cas-server-webapp-config</artifactId>
<version>${cas.version}</version>
</dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-webapp-init</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-webapp-resources</artifactId>
- <version>${cas.version}</version>
- </dependency>
<!-- /CAS -->
<!-- Wicket -->
@@ -2050,8 +2039,14 @@ under the License.
</snapshots>
</repository>
<repository>
- <id>jitpack.io</id>
- <url>https://jitpack.io</url>
+ <id>shibboleth-releases</id>
+ <url>https://build.shibboleth.net/nexus/content/repositories/releases</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
</repositories>
@@ -2550,6 +2545,10 @@ under the License.
</goals>
<phase>none</phase>
</execution>
+ <execution>
+ <id>process-resource-bundles</id>
+ <phase>none</phase>
+ </execution>
</executions>
</plugin>
<!-- Put NOTICE and LICENSE files in all artifacts and javadocs -->
diff --git a/wa/pom.xml b/wa/pom.xml
index aa8216d..9c4d4de 100644
--- a/wa/pom.xml
+++ b/wa/pom.xml
@@ -37,8 +37,7 @@ under the License.
<guava.version>28.2-jre</guava.version>
<opensaml.version>3.4.5</opensaml.version>
<bootstrap.version>4.4.1</bootstrap.version>
- <bootstrap-select.version>1.13.11</bootstrap-select.version>
- <slf4j.version>1.8.0-beta4</slf4j.version>
+ <slf4j.version>2.0.0-alpha1</slf4j.version>
<rootpom.basedir>${basedir}/..</rootpom.basedir>
</properties>
@@ -174,15 +173,6 @@ under the License.
<artifactId>cas-server-webapp-config</artifactId>
</dependency>
<dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-webapp-init</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-webapp-resources</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
@@ -309,4 +299,5 @@ under the License.
</build>
</profile>
</profiles>
+
</project>
diff --git a/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java b/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java
index ee7d058..40b87ae 100644
--- a/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java
+++ b/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java
@@ -22,7 +22,6 @@ import org.apache.commons.lang.StringUtils;
import org.apereo.cas.configuration.CasConfigurationProperties;
import org.apereo.cas.util.AsciiArtUtils;
import org.apereo.cas.util.DateTimeUtils;
-import org.apereo.cas.web.CasWebApplicationContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -73,7 +72,6 @@ public class SyncopeWAApplication extends SpringBootServletInitializer {
public static void main(final String[] args) {
new SpringApplicationBuilder(SyncopeWAApplication.class).
- contextClass(CasWebApplicationContext.class).
run(args);
}