diff --git a/finish/pom.xml b/finish/pom.xml index 8c2b10e..2abf550 100755 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -39,7 +39,7 @@ org.eclipse.microprofile microprofile - 4.0.1 + 3.3 pom provided @@ -53,7 +53,7 @@ com.ibm.websphere.appserver.api com.ibm.websphere.appserver.api.passwordUtil - 1.0.51 + 1.0.39 provided @@ -61,7 +61,7 @@ com.ibm.websphere.appserver.api com.ibm.websphere.appserver.api.ssl - 1.4.51 + 1.3.39 provided @@ -70,20 +70,20 @@ org.mongodb mongo-java-driver - 3.12.8 + 3.12.3 org.apache.cxf cxf-rt-rs-client - 3.4.3 + 3.3.6 test org.apache.cxf cxf-rt-rs-extension-providers - 3.4.3 + 3.3.6 test @@ -95,7 +95,7 @@ org.junit.jupiter junit-jupiter - 5.7.1 + 5.6.2 test @@ -113,13 +113,13 @@ org.apache.maven.plugins maven-war-plugin - 3.3.1 + 3.2.3 io.openliberty.tools liberty-maven-plugin - 3.3.4 + 3.3.1 diff --git a/finish/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml index 1bc05ac..4eba470 100755 --- a/finish/src/main/liberty/config/server.xml +++ b/finish/src/main/liberty/config/server.xml @@ -8,14 +8,14 @@ ssl-1.0 - mpConfig-2.0 + mpConfig-1.4 passwordUtilities-1.0 beanValidation-2.0 jaxrs-2.1 - mpOpenAPI-2.0 + mpOpenAPI-1.1 diff --git a/finish/src/main/webapp/css/mongo.css b/finish/src/main/webapp/css/mongo.css index 8e06d28..1253891 100755 --- a/finish/src/main/webapp/css/mongo.css +++ b/finish/src/main/webapp/css/mongo.css @@ -10,105 +10,104 @@ *******************************************************************************/ @import url("https://fonts.googleapis.com/css?family=Asap:300,400,500"); + @font-face { - font-family: BunueloLight, sans-serif; - src: url("../fonts/BunueloCleanPro-Light.otf"); + font-family: BunueloLight; + src: url("../fonts/BunueloCleanPro-Light.otf"); } @font-face { - font-family: BunueloSemiBold, sans-serif; - src: url("../fonts/BunueloCleanPro-SemiBold.otf"); + font-family: BunueloSemiBold; + src: url("../fonts/BunueloCleanPro-SemiBold.otf"); } -body { - font-family: Asap, sans-serif; - font-size: 16px; - color: #24243b; - background-color: white; - margin: 0; + +body{ + font-family:Asap; + font-size: 16px; + color:#24243b; + background-color: white; + margin: 0px; } section { - padding-top: 55px; - padding-left: 8%; - padding-right: 8%; - letter-spacing: 0; - text-align: left; + padding-top: 55px; + padding-left: 8%; + padding-right: 8%; + letter-spacing:0; + text-align:left; } .line { - margin-right: 200px; - height: 1px; - background-color: #c8d3d3; + margin-right: 200px; + height: 1px; + background-color: #C8D3D3; } .headerImage { - background-image: url(../img/header_ufo.png); - background-repeat: no-repeat; - background-position: top 20px right 15px; - height: 103px; - margin-top: -94px; + background-image: url(../img/header_ufo.png); + background-repeat: no-repeat; + background-position: top 20px right 15px; + height: 103px; + margin-top: -94px; } p { - line-height: 22px; - margin-top: 0; + line-height: 22px; + margin-top: 0px; } - h1 { - font-family: BunueloSemiBold, sans-serif; - font-size: 40px; - font-weight: 400; - letter-spacing: 0; - text-align: left; + font-family:BunueloSemiBold; + font-size: 40px; + font-weight: 400; + letter-spacing:0; + text-align:left; } - h2 { - font-size: 24px; - font-weight: 400; + font-size: 24px; + font-weight: 400; } - h4 { - margin: 0; + margin: 0; } - a { - text-decoration: none; + text-decoration: none; } #appIntro { - background-image: linear-gradient(#141427 0%, #2c2e50 100%); - background-repeat: no-repeat; - padding-bottom: 0.5em; + background-image:linear-gradient(#141427 0%, #2c2e50 100%); + background-repeat: no-repeat; + padding-bottom: .5em; } #titleSection { - color: white; + color: white; } #appTitle { - font-family: BunueloLight, sans-serif; - font-size: 55px; + font-family:BunueloLight; + font-size:55px; } + button { - border-radius: 100px; - height: 44px; - color: #24253a; - text-align: center; - font-family: Asap, sans-serif; - cursor: pointer; - border: none; - font-weight: 500; - font-size: 16px; - background-color: #abd155; - transition: background-color 0.2s; - margin-top: 25px; - margin-bottom: 25px; + border-radius:100px; + height:44px; + color:#24253a; + text-align:center; + font-family: Asap; + cursor: pointer; + border: none; + font-weight: 500; + font-size:16px; + background-color:#abd155; + transition: background-color .2s; + margin-top: 25px; + margin-bottom: 25px; } button:hover { - background-color: #c7ee63; + background-color: #C7EE63; } .bodyFooter { @@ -118,15 +117,15 @@ button:hover { background-position: top 20px right 110px; margin-bottom: 40px; margin-top: 50px; - color: #3f4659; + color: #3F4659; } .bodyFooterLink { - font-family: Asap, sans-serif; + font-family: Asap; font-weight: 300; font-size: 14px; letter-spacing: 0; - border-bottom: solid 1px #c8d3d3; + border-bottom: solid 1px #C8D3D3; margin-top: 30px; margin-right: 130px; padding-bottom: 5px; @@ -135,100 +134,99 @@ button:hover { } .bodyFooterLink > a { - text-decoration: none; - padding: 10px; - color: #5e6b8d; + text-decoration: none; + padding: 10px; + color: #5E6B8D; } .deleteButton { - margin-top: 5px; - margin-bottom: 5px; - width: 100%; + margin-top: 5px; + margin-bottom: 5px; + width: 100%; } #licenseLink { text-align: left; } -#footerText { - margin-top: 4px; - margin-bottom: 4px; - font-size: 16px; +#footer_text { + margin-top: 4px; + margin-bottom: 4px; + font-size: 16px; } -#footerCopyright { +#footer_copyright { font-size: 11px; } .vFlexContainer { - display: flex; - flex-direction: column; + display: flex; + flex-direction: column; } .hFlexContainer { - display: flex; - flex-direction: row; + display: flex; + flex-direction: row; } .flexBox { - flex: 0 1 auto; + flex: 0 1 auto; } .flexSelfCenter { - align-self: center; + align-self: center; } -.textBox { - font-size: 10pt; - text-indent: 2pt; +.textBox { + font-size: 10pt; + text-indent: 2pt; } -#userCreation, -#userUpdate { - background-color: white; - margin: 0.5em; - padding: 0.5em; - border-radius: 7pt; - width: 13em; - height: 23em; - justify-content: space-between; +#userCreation, #userUpdate{ + background-color: white; + margin: 0.5em; + padding: .5em; + border-radius: 7pt; + width: 13em; + height: 23em; + justify-content: space-between; } -#docDisplay, -#userDisplay { - background-color: white; - margin: 0.5em; - padding: 0.5em; - border-radius: 7pt; - max-height: 23em; - overflow: auto; - display: none; - flex: 0 1 auto; - max-width: 30%; - border: 1px solid transparent; - padding-right: 20px; /* Scroll bar space */ +#docDisplay, #userDisplay { + background-color: white; + margin: 0.5em; + padding: .5em; + border-radius: 7pt; + max-height: 23em; + overflow: auto; + display: none; + flex: 0 1 auto; + max-width: 30%; + border: 1px solid transparent; + padding-right: 20px; /*Scroll bar space*/ } .inputLine { - margin: 0.75em 0; + margin: .75em 0; } #userBoxes { - flex-wrap: wrap; - justify-content: space-evenly; + flex-wrap: wrap; + justify-content: space-evenly; } -#usersContainer { - flex-wrap: wrap; +#usersContainer{ + flex-wrap: wrap; } .user { - background-color: rgb(184, 184, 184); - margin: 0.5em; - padding: 0.25em; - border-radius: 7pt; + background-color: rgb(184, 184, 184); + margin: .5em; + padding: .25em; + border-radius: 7pt; } .hidden { - display: none; + display: none; } + diff --git a/finish/src/main/webapp/index.html b/finish/src/main/webapp/index.html index 02cdf8d..619bb61 100755 --- a/finish/src/main/webapp/index.html +++ b/finish/src/main/webapp/index.html @@ -1,5 +1,5 @@ @@ -61,7 +61,7 @@ com.ibm.websphere.appserver.api com.ibm.websphere.appserver.api.ssl - 1.4.51 + 1.3.39 provided @@ -70,20 +70,20 @@ org.mongodb mongo-java-driver - 3.12.8 + 3.12.3 org.apache.cxf cxf-rt-rs-client - 3.4.3 + 3.3.6 test org.apache.cxf cxf-rt-rs-extension-providers - 3.4.3 + 3.3.6 test @@ -95,7 +95,7 @@ org.junit.jupiter junit-jupiter - 5.7.1 + 5.6.2 test @@ -113,13 +113,13 @@ org.apache.maven.plugins maven-war-plugin - 3.3.1 + 3.2.3 io.openliberty.tools liberty-maven-plugin - 3.3.4 + 3.3.1 diff --git a/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml index df70299..4724cd9 100755 --- a/start/src/main/liberty/config/server.xml +++ b/start/src/main/liberty/config/server.xml @@ -1,6 +1,6 @@ - mpConfig-2.0 + mpConfig-1.4 diff --git a/start/src/main/webapp/css/mongo.css b/start/src/main/webapp/css/mongo.css index 8e06d28..1253891 100755 --- a/start/src/main/webapp/css/mongo.css +++ b/start/src/main/webapp/css/mongo.css @@ -10,105 +10,104 @@ *******************************************************************************/ @import url("https://fonts.googleapis.com/css?family=Asap:300,400,500"); + @font-face { - font-family: BunueloLight, sans-serif; - src: url("../fonts/BunueloCleanPro-Light.otf"); + font-family: BunueloLight; + src: url("../fonts/BunueloCleanPro-Light.otf"); } @font-face { - font-family: BunueloSemiBold, sans-serif; - src: url("../fonts/BunueloCleanPro-SemiBold.otf"); + font-family: BunueloSemiBold; + src: url("../fonts/BunueloCleanPro-SemiBold.otf"); } -body { - font-family: Asap, sans-serif; - font-size: 16px; - color: #24243b; - background-color: white; - margin: 0; + +body{ + font-family:Asap; + font-size: 16px; + color:#24243b; + background-color: white; + margin: 0px; } section { - padding-top: 55px; - padding-left: 8%; - padding-right: 8%; - letter-spacing: 0; - text-align: left; + padding-top: 55px; + padding-left: 8%; + padding-right: 8%; + letter-spacing:0; + text-align:left; } .line { - margin-right: 200px; - height: 1px; - background-color: #c8d3d3; + margin-right: 200px; + height: 1px; + background-color: #C8D3D3; } .headerImage { - background-image: url(../img/header_ufo.png); - background-repeat: no-repeat; - background-position: top 20px right 15px; - height: 103px; - margin-top: -94px; + background-image: url(../img/header_ufo.png); + background-repeat: no-repeat; + background-position: top 20px right 15px; + height: 103px; + margin-top: -94px; } p { - line-height: 22px; - margin-top: 0; + line-height: 22px; + margin-top: 0px; } - h1 { - font-family: BunueloSemiBold, sans-serif; - font-size: 40px; - font-weight: 400; - letter-spacing: 0; - text-align: left; + font-family:BunueloSemiBold; + font-size: 40px; + font-weight: 400; + letter-spacing:0; + text-align:left; } - h2 { - font-size: 24px; - font-weight: 400; + font-size: 24px; + font-weight: 400; } - h4 { - margin: 0; + margin: 0; } - a { - text-decoration: none; + text-decoration: none; } #appIntro { - background-image: linear-gradient(#141427 0%, #2c2e50 100%); - background-repeat: no-repeat; - padding-bottom: 0.5em; + background-image:linear-gradient(#141427 0%, #2c2e50 100%); + background-repeat: no-repeat; + padding-bottom: .5em; } #titleSection { - color: white; + color: white; } #appTitle { - font-family: BunueloLight, sans-serif; - font-size: 55px; + font-family:BunueloLight; + font-size:55px; } + button { - border-radius: 100px; - height: 44px; - color: #24253a; - text-align: center; - font-family: Asap, sans-serif; - cursor: pointer; - border: none; - font-weight: 500; - font-size: 16px; - background-color: #abd155; - transition: background-color 0.2s; - margin-top: 25px; - margin-bottom: 25px; + border-radius:100px; + height:44px; + color:#24253a; + text-align:center; + font-family: Asap; + cursor: pointer; + border: none; + font-weight: 500; + font-size:16px; + background-color:#abd155; + transition: background-color .2s; + margin-top: 25px; + margin-bottom: 25px; } button:hover { - background-color: #c7ee63; + background-color: #C7EE63; } .bodyFooter { @@ -118,15 +117,15 @@ button:hover { background-position: top 20px right 110px; margin-bottom: 40px; margin-top: 50px; - color: #3f4659; + color: #3F4659; } .bodyFooterLink { - font-family: Asap, sans-serif; + font-family: Asap; font-weight: 300; font-size: 14px; letter-spacing: 0; - border-bottom: solid 1px #c8d3d3; + border-bottom: solid 1px #C8D3D3; margin-top: 30px; margin-right: 130px; padding-bottom: 5px; @@ -135,100 +134,99 @@ button:hover { } .bodyFooterLink > a { - text-decoration: none; - padding: 10px; - color: #5e6b8d; + text-decoration: none; + padding: 10px; + color: #5E6B8D; } .deleteButton { - margin-top: 5px; - margin-bottom: 5px; - width: 100%; + margin-top: 5px; + margin-bottom: 5px; + width: 100%; } #licenseLink { text-align: left; } -#footerText { - margin-top: 4px; - margin-bottom: 4px; - font-size: 16px; +#footer_text { + margin-top: 4px; + margin-bottom: 4px; + font-size: 16px; } -#footerCopyright { +#footer_copyright { font-size: 11px; } .vFlexContainer { - display: flex; - flex-direction: column; + display: flex; + flex-direction: column; } .hFlexContainer { - display: flex; - flex-direction: row; + display: flex; + flex-direction: row; } .flexBox { - flex: 0 1 auto; + flex: 0 1 auto; } .flexSelfCenter { - align-self: center; + align-self: center; } -.textBox { - font-size: 10pt; - text-indent: 2pt; +.textBox { + font-size: 10pt; + text-indent: 2pt; } -#userCreation, -#userUpdate { - background-color: white; - margin: 0.5em; - padding: 0.5em; - border-radius: 7pt; - width: 13em; - height: 23em; - justify-content: space-between; +#userCreation, #userUpdate{ + background-color: white; + margin: 0.5em; + padding: .5em; + border-radius: 7pt; + width: 13em; + height: 23em; + justify-content: space-between; } -#docDisplay, -#userDisplay { - background-color: white; - margin: 0.5em; - padding: 0.5em; - border-radius: 7pt; - max-height: 23em; - overflow: auto; - display: none; - flex: 0 1 auto; - max-width: 30%; - border: 1px solid transparent; - padding-right: 20px; /* Scroll bar space */ +#docDisplay, #userDisplay { + background-color: white; + margin: 0.5em; + padding: .5em; + border-radius: 7pt; + max-height: 23em; + overflow: auto; + display: none; + flex: 0 1 auto; + max-width: 30%; + border: 1px solid transparent; + padding-right: 20px; /*Scroll bar space*/ } .inputLine { - margin: 0.75em 0; + margin: .75em 0; } #userBoxes { - flex-wrap: wrap; - justify-content: space-evenly; + flex-wrap: wrap; + justify-content: space-evenly; } -#usersContainer { - flex-wrap: wrap; +#usersContainer{ + flex-wrap: wrap; } .user { - background-color: rgb(184, 184, 184); - margin: 0.5em; - padding: 0.25em; - border-radius: 7pt; + background-color: rgb(184, 184, 184); + margin: .5em; + padding: .25em; + border-radius: 7pt; } .hidden { - display: none; + display: none; } + diff --git a/start/src/main/webapp/index.html b/start/src/main/webapp/index.html index 02cdf8d..619bb61 100755 --- a/start/src/main/webapp/index.html +++ b/start/src/main/webapp/index.html @@ -1,5 +1,5 @@