Address code review comments

TIER · Feb 26, 2021 · a5de3e0 · a5de3e0
1 parent ecae2ee
commit a5de3e0
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 17 deletions.
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'war'
     id 'org.springframework.boot' version '2.4.2'
     id 'com.gorylenko.gradle-git-properties' version '1.4.21'
-    id 'io.franzbecker.gradle-lombok' version '1.13'
+    id 'io.freefair.lombok' version '5.3.0'
     id 'com.palantir.docker' version '0.20.1'
     id 'com.palantir.docker-run' version '0.20.1'
 }
@@ -109,11 +109,7 @@ springBoot {
     buildInfo()
 }
 
-lombok {
-    version = "1.18.8"
-    //TODO: get new sha256
-    sha256 = ""
-}
+generateLombokConfig.enabled = false
 
 dependencies {
     // opensaml deps

diff --git a/...eth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy b/...eth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy
@@ -18,7 +18,6 @@ import org.springframework.http.HttpMethod
 import org.springframework.http.MediaType
 import org.springframework.test.annotation.DirtiesContext
 import org.springframework.test.context.ActiveProfiles
-import spock.lang.Ignore
 import spock.lang.Specification
 
 /**

diff --git a/...2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/...2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy
@@ -44,11 +44,9 @@ import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorReposit
 import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.domain.EntityScan
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories
 import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.TestPropertySource
 import org.springframework.transaction.PlatformTransactionManager
 import spock.lang.Specification
 

diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
@@ -4,7 +4,7 @@
 # Logging Configuration
 #logging.config=classpath:log4j2.xml
 
-#logging.level.org.springframework.security=DEBUG
+#logging.level.org.springframework.security=INFO
 logging.level.org.springframework=INFO
 logging.level.edu.internet2.tier.shibboleth.admin.ui=INFO
 

diff --git a/...c/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EmailServiceImplTests.groovy b/...c/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/EmailServiceImplTests.groovy
@@ -10,7 +10,6 @@ import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.domain.EntityScan
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.core.env.Environment
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories
@@ -22,8 +21,12 @@ import spock.lang.Specification
 /**
  * @author Bill Smith (wsmith@unicon.net)
  */
-@Ignore
-// TODO: fix
+@SpringBootTest
+//@DataJpaTest
+@ContextConfiguration(classes=[CoreShibUiConfiguration, EmailConfiguration, TestConfiguration, InternationalizationConfiguration, SearchConfiguration, DevConfig])
+@EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"])
+@EntityScan("edu.internet2.tier.shibboleth.admin.ui")
+@ActiveProfiles(["no-auth", "dev"])
 class EmailServiceImplTests extends Specification {
 
     @Autowired

diff --git a/beacon/build.gradle b/beacon/build.gradle
diff --git a/beacon/gradle.properties b/beacon/gradle.properties
@@ -0,0 +1,2 @@
+group=edu.internet2.tap.beacon
+version=1.0.0-SNAPSHOT