Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
chasegawa committed Nov 30, 2023
2 parents fb5608a + 68cfe9c commit 2ce50cb
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
3 changes: 1 addition & 2 deletions Versioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,4 @@ Examples of version:
* `2.0.0` - Major GA release of 2.0.0 line
* `2.0.1` - Patch release of 2.0.x line
* `2.1.0` - First minor feature release of 2.x line


* `2.0.0-BETA` - Pre-release version
6 changes: 3 additions & 3 deletions backend/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ bootWar {
}
dependsOn 'copyApplicationYAML'
archiveName = "${baseName}-${version}.war"
duplicatesStrategy(DuplicatesStrategy.INCLUDE)
duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
}

springBoot {
Expand Down Expand Up @@ -363,7 +363,7 @@ task enversTest(type: Test) {
classpath = sourceSets.enversTest.runtimeClasspath
systemProperties = System.properties
systemProperties['user.dir'] = workingDir
processEnversTestResources.duplicatesStrategy(DuplicatesStrategy.INCLUDE)
processEnversTestResources.duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
useJUnitPlatform()
}

Expand Down Expand Up @@ -486,7 +486,7 @@ docker {
files tasks.bootWar.outputs
files 'src/main/docker-files/loader.properties'
buildArgs(['JAR_FILE': "shibui-${version}.war"])
copySpec.duplicatesStrategy(DuplicatesStrategy.INCLUDE)
copySpec.duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
}

tasks.dockerRun.dependsOn tasks.docker
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class EntitiesControllerTests extends AbstractBaseDataJpaTest {
</md:EntityDescriptor>
'''
when:
def result = mockMvc.perform(get('/api/entities/http%3A%2F%2Ftest.scaldingspoon.org%2Ftest1').header('Accept', 'application/xml'))
def result = mockMvc.perform(get('/entities/http%3A%2F%2Ftest.scaldingspoon.org%2Ftest1').header('Accept', 'application/xml'))

then:
result.andExpect(status().isOk())
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name=shibui
group=edu.internet2.tier.shibboleth.admin.ui
version=2.0.0-BETA
version=2.0.0-BETA-R2

### library versions ###
## As of 2-23-23
Expand Down Expand Up @@ -42,7 +42,7 @@ i2.github.owner=TIER
i2.github.repo=shib-idp-ui
i2.github.apiEndpoint=https://github.internet2.edu/api/v3
i2.git.remote=i2
i2.git.branch=2.0.0-BETA
i2.git.branch=master

# set app
use.release.app.yml=false
Expand Down

0 comments on commit 2ce50cb

Please sign in to comment.