diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77e055cae375dd50a201cf84d3545b256faaae27..1841c855665ad3704de3969d5363294be53e80ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ job1: tags: - - java7 + - java8 script: - - mvn package \ No newline at end of file + - mvn clean package \ No newline at end of file diff --git a/myuw-error-valve/pom.xml b/myuw-error-valve/pom.xml index d432a1c85dad21db0124776cfd9564140fc2b194..309513fcc6615588b6e15cc96fb5c6d45c74ccfd 100644 --- a/myuw-error-valve/pom.xml +++ b/myuw-error-valve/pom.xml @@ -10,7 +10,7 @@ <artifactId>myuw-error-valve</artifactId> <packaging>jar</packaging> <name>MyUW ROOT lib</name> - + <dependencies> <dependency> <groupId>org.apache.tomcat</groupId> @@ -20,13 +20,6 @@ </dependency> </dependencies> - <repositories> - <repository> - <id>code.doit-uw-releases</id> - <url>https://code.doit.wisc.edu/maven/content/repositories/uw-releases/</url> - </repository> - </repositories> - <build> <finalName>myuw-error-valve</finalName> <resources> diff --git a/myuw-root-webapp/pom.xml b/myuw-root-webapp/pom.xml index 530f7170c3c990d1a9db2cd966114fcaae632a37..4c0abaec9527e26977bc50c361a4b21ab3118902 100644 --- a/myuw-root-webapp/pom.xml +++ b/myuw-root-webapp/pom.xml @@ -10,14 +10,6 @@ <artifactId>ROOT</artifactId> <packaging>war</packaging> <name>MyUW ROOT webapp</name> - <url>git@git.doit.wisc.edu:myuw/my-root.git</url> - - <repositories> - <repository> - <id>code.doit-uw-releases</id> - <url>https://code.doit.wisc.edu/maven/content/repositories/uw-releases/</url> - </repository> - </repositories> <build> <finalName>ROOT</finalName> diff --git a/myuw-root-webapp/src/main/webapp/403.html b/myuw-root-webapp/src/main/webapp/403.html index c5abe06e57daa776fce816b25489e295e31fc402..54d66b4ad69888a4803d84fcb857f57ece1f0b1d 100644 --- a/myuw-root-webapp/src/main/webapp/403.html +++ b/myuw-root-webapp/src/main/webapp/403.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <title>MyUW Page Not Found</title> + <title>Access Denied</title> <!-- MATERIAL DESIGN LITE STYLES --> <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> <link rel="stylesheet" href="https://code.getmdl.io/1.1.3/material.indigo-pink.min.css"> @@ -20,7 +20,7 @@ <img src="/main_logo_w_all.png" class="crest"> </div> <!-- Title --> - <span class="mdl-layout-title outage-title">Page Not Found</span> + <span class="mdl-layout-title outage-title">Access Denied</span> </div> </header> <main class="mdl-layout__content"> diff --git a/pom.xml b/pom.xml index f93b3562624895382d71c1b2610d42e3b6385f5a..ffac1dc101ab0b0e280a081d933eb82d98384acb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <packaging>pom</packaging> <version>1.1.8-SNAPSHOT</version> <name>MyUW ROOT parent</name> - <url>git@git.doit.wisc.edu:myuw/my-root.git</url> + <url>https://git.doit.wisc.edu/myuw/my-root</url> <scm> <connection>scm:git:git@git.doit.wisc.edu:myuw/my-root.git</connection> @@ -21,15 +21,14 @@ </modules> <distributionManagement> - <snapshotRepository> - <id>code.doit-uw-snapshots</id> - <url>https://code.doit.wisc.edu/maven/content/repositories/public-snapshots/</url> - </snapshotRepository> <repository> - <id>code.doit-uw-releases</id> - <url>https://code.doit.wisc.edu/maven/content/repositories/public-releases/</url> + <id>myuw-public-releases</id> + <url>https://artifacts.doit.wisc.edu/artifactory/myuw-public-releases/</url> </repository> - + <snapshotRepository> + <id>myuw-public-snapshots</id> + <url>https://artifacts.doit.wisc.edu/artifactory/myuw-public-snapshots/</url> + </snapshotRepository> </distributionManagement> <build>