[spring-extensions] branch main updated: GEN-266 - Seal as many jars as practical
Scott Cantor
cantor.2 at osu.edu
Thu Sep 17 15:50:12 UTC 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository spring-extensions.
View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=f4870b5f74f8f35eadde02e465b3c713dffdfc84
The following commit(s) were added to refs/heads/main by this push:
new f4870b5 GEN-266 - Seal as many jars as practical
f4870b5 is described below
commit f4870b5f74f8f35eadde02e465b3c713dffdfc84
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Sep 17 11:50:03 2020 -0400
GEN-266 - Seal as many jars as practical
https://issues.shibboleth.net/jira/browse/GEN-266
Seal spring-extensions.
Rehome apparently shared test classes.
---
pom.xml | 1 +
.../spring/resource/ConditionalResourceTest.java | 1 +
.../resource/FileBackedHTTPResourceTest.java | 1 +
.../ext/spring/resource/HTTPResourceTest.java | 1 +
.../MockApplicationContext.java | 4 +++-
.../{resource => testing}/ResourceTestHelper.java | 2 +-
.../ext/spring/testing/package-info.java | 22 ++++++++++++++++++++++
7 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index ef01104..4ce4608 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,6 +193,7 @@
<archive>
<manifestEntries>
<Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
+ <Sealed>true</Sealed>
</manifestEntries>
</archive>
</configuration>
diff --git a/src/test/java/net/shibboleth/ext/spring/resource/ConditionalResourceTest.java b/src/test/java/net/shibboleth/ext/spring/resource/ConditionalResourceTest.java
index 907d6e2..992ab33 100644
--- a/src/test/java/net/shibboleth/ext/spring/resource/ConditionalResourceTest.java
+++ b/src/test/java/net/shibboleth/ext/spring/resource/ConditionalResourceTest.java
@@ -19,6 +19,7 @@ package net.shibboleth.ext.spring.resource;
import java.io.IOException;
+import net.shibboleth.ext.spring.testing.ResourceTestHelper;
import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
diff --git a/src/test/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResourceTest.java b/src/test/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResourceTest.java
index c628657..7df97e6 100644
--- a/src/test/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResourceTest.java
+++ b/src/test/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResourceTest.java
@@ -21,6 +21,7 @@ import java.io.File;
import java.io.IOException;
import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
+import net.shibboleth.ext.spring.testing.ResourceTestHelper;
import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
diff --git a/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java b/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java
index 26c3992..1f62ade 100644
--- a/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java
+++ b/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java
@@ -36,6 +36,7 @@ import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import net.shibboleth.ext.spring.testing.ResourceTestHelper;
import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;
diff --git a/src/test/java/net/shibboleth/ext/spring/service/MockApplicationContext.java b/src/test/java/net/shibboleth/ext/spring/testing/MockApplicationContext.java
similarity index 98%
rename from src/test/java/net/shibboleth/ext/spring/service/MockApplicationContext.java
rename to src/test/java/net/shibboleth/ext/spring/testing/MockApplicationContext.java
index 5a69cb1..135fd84 100644
--- a/src/test/java/net/shibboleth/ext/spring/service/MockApplicationContext.java
+++ b/src/test/java/net/shibboleth/ext/spring/testing/MockApplicationContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.service;
+package net.shibboleth.ext.spring.testing;
import static org.testng.Assert.fail;
import java.io.IOException;
@@ -40,6 +40,8 @@ import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.io.ProtocolResolver;
import org.springframework.core.io.Resource;
+import net.shibboleth.ext.spring.service.AbstractServiceableComponent;
+
/**
* Placeholder, which can be set on test {@link AbstractServiceableComponent}s to stop the
* "must be null" test firing.
diff --git a/src/test/java/net/shibboleth/ext/spring/resource/ResourceTestHelper.java b/src/test/java/net/shibboleth/ext/spring/testing/ResourceTestHelper.java
similarity index 97%
rename from src/test/java/net/shibboleth/ext/spring/resource/ResourceTestHelper.java
rename to src/test/java/net/shibboleth/ext/spring/testing/ResourceTestHelper.java
index 7ac8e49..e02872c 100644
--- a/src/test/java/net/shibboleth/ext/spring/resource/ResourceTestHelper.java
+++ b/src/test/java/net/shibboleth/ext/spring/testing/ResourceTestHelper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.resource;
+package net.shibboleth.ext.spring.testing;
import java.io.IOException;
import java.io.InputStream;
diff --git a/src/test/java/net/shibboleth/ext/spring/testing/package-info.java b/src/test/java/net/shibboleth/ext/spring/testing/package-info.java
new file mode 100644
index 0000000..0b00301
--- /dev/null
+++ b/src/test/java/net/shibboleth/ext/spring/testing/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Shared test classes with other modules.
+ */
+
+package net.shibboleth.ext.spring.testing;
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list