Skip to content
Snippets Groups Projects
Commit 9d9c2e00 authored by Doug Reed's avatar Doug Reed
Browse files

Merge branch 'master' of git.doit.wisc.edu:myuw/my-root into sadBucky

parents b0d5ba8b 3f889958
No related branches found
No related tags found
1 merge request!16MUMMNG-4432 Replace bucky with generic image
Pipeline #28808 failed
Stage: test
    This commit is part of merge request !16. Comments created here will be created in the context of that merge request.
    Hide whitespace changes
    Inline Side-by-side
    .gitlab-ci.yml
    + 2
    − 2
    Edit View file @ 9d9c2e00
    job1:
    tags:
    - java7
    - java8
    script:
    - mvn package
    \ No newline at end of file
    - mvn clean package
    \ No newline at end of file
    myuw-error-valve/pom.xml
    + 1
    − 8
    Edit View file @ 9d9c2e00
    ......@@ -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>
    ......
    myuw-root-webapp/pom.xml
    + 0
    − 8
    Edit View file @ 9d9c2e00
    ......@@ -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>
    ......
    myuw-root-webapp/src/main/webapp/403.html
    + 2
    − 2
    Edit View file @ 9d9c2e00
    <!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">
    ......
    pom.xml
    + 7
    − 8
    Edit View file @ 9d9c2e00
    ......@@ -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>
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment