[java-plugin-storage-jdbc] 02/02: JJDBC-7 Version stuck at 1.0.0

Rod Widdowson rdw at steadingsoftware.com
Sat Jun 25 13:36:33 UTC 2022


This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-plugin-storage-jdbc.

View the commit online:
http://git.shibboleth.net/view/?p=java-plugin-storage-jdbc.git;a=commit;h=06a7f1842a66d5fcd2337b9b2ae471813dd96b66

commit 06a7f1842a66d5fcd2337b9b2ae471813dd96b66
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jun 25 14:18:25 2022 +0100

    JJDBC-7 Version stuck at 1.0.0
    
    https://shibboleth.atlassian.net/browse/JJDBC-7
    
    Remove api jar - it contributes nothing now.
---
 jdbc-storage-api/.checkstyle                       | 12 -----
 jdbc-storage-api/pom.xml                           | 57 ----------------------
 .../shibboleth/plugin/storage/jdbc/Version.java    | 48 ------------------
 pom.xml                                            |  2 -
 4 files changed, 119 deletions(-)

diff --git a/jdbc-storage-api/.checkstyle b/jdbc-storage-api/.checkstyle
deleted file mode 100644
index 53cd043..0000000
--- a/jdbc-storage-api/.checkstyle
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
-  <local-check-config name="Shibboleth Checkstyle" location="/jdbc-storage-parent/checkstyle.xml" type="project" description="">
-    <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
-    <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
-    <additional-data name="protect-config-file" value="false"/>
-  </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
-    <file-match-pattern match-pattern="src/main/java/.*\.java$." include-pattern="true"/>
-  </fileset>
-</fileset-config>
diff --git a/jdbc-storage-api/pom.xml b/jdbc-storage-api/pom.xml
deleted file mode 100644
index 166783d..0000000
--- a/jdbc-storage-api/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>net.shibboleth.plugin.storage.jdbc</groupId>
-        <artifactId>jdbc-storage-parent</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>jdbc-storage-api</artifactId>
-    <packaging>jar</packaging>
-    <name>Shibboleth :: Plugins :: jdbc-storage API</name>
-    <description>JDBC storage plugin API.</description>
-
-    <properties>
-        <checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
-        <automatic.module.name>net.shibboleth.plugin.storage.jdbc.api</automatic.module.name>
-    </properties>
-
-    <dependencies>
-        <!-- Provided dependencies -->
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <index>true</index>
-                        <manifestEntries>
-                            <Main-Class>net.shibboleth.plugin.storage.jdbc.Version</Main-Class>
-                        </manifestEntries>
-                        <manifestSections>
-                            <manifestSection>
-                                <name>org/example/com/jdbc-storage/</name>
-                                <manifestEntries>
-                                    <Implementation-Title>${project.artifactId}</Implementation-Title>
-                                    <Implementation-Version>${project.version}</Implementation-Version>
-                                    <Implementation-Vendor>FINISH</Implementation-Vendor>
-                                </manifestEntries>
-                            </manifestSection>
-                        </manifestSections>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/jdbc-storage-api/src/main/java/net/shibboleth/plugin/storage/jdbc/Version.java b/jdbc-storage-api/src/main/java/net/shibboleth/plugin/storage/jdbc/Version.java
deleted file mode 100644
index 15b6f28..0000000
--- a/jdbc-storage-api/src/main/java/net/shibboleth/plugin/storage/jdbc/Version.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package net.shibboleth.plugin.storage.jdbc;
-
-import javax.annotation.Nullable;
-
-/** Class for getting and printing the version of the plugin. */
-public final class Version {
-
-    /** Plugin version. */
-    @Nullable private static final String VERSION = Version.class.getPackage().getImplementationVersion();
-
-    /** Constructor. */
-    private Version() {
-    }
-
-    /**
-     * Main entry point to program.
-     * 
-     * @param args command line arguments
-     */
-    public static void main(final String[] args) {
-        System.out.println(VERSION);
-    }
-
-    /**
-     * Get the version of the Plugin.
-     * 
-     * @return the version
-     */
-    @Nullable public static String getVersion() {
-        return VERSION;
-    }
-}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 834d47c..a529a61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,8 +110,6 @@
     </build>
     <modules>
         <module>jdbc-storage-impl</module>
-        <module>jdbc-storage-api</module>
-        <!-- All DIST modules must come after the -api and -impl modules -->
         <module>jdbc-storage-dist</module>
     </modules>
 </project>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list