FIX OSS release requirements (#32)

vharseko · web-flow · commit 8b3105f35dfd · 2024-05-20T11:41:29.000+03:00
diff --git a/OpenICF-csvfile-connector/pom.xml b/OpenICF-csvfile-connector/pom.xml
@@ -35,24 +35,6 @@
         <framework.compatibilityVersion>1.5</framework.compatibilityVersion>
         <framework.releaseVersion>2.0</framework.releaseVersion>
     </properties>
-    <repositories>
-        <repository>
-            <id>forgerock-staging-repository</id>
-            <name>ForgeRock Release Repository</name>
-            <url>http://maven.forgerock.org/repo/releases</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>forgerock-snapshots-repository</id>
-            <name>ForgeRock Snapshot Repository</name>
-            <url>http://maven.forgerock.org/repo/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.openidentityplatform.openicf.framework</groupId>
diff --git a/OpenICF-databasetable-connector/pom.xml b/OpenICF-databasetable-connector/pom.xml
@@ -42,8 +42,6 @@
         <framework.compatibilityVersion>1.5</framework.compatibilityVersion>
         <framework.releaseVersion>2.0</framework.releaseVersion>
     </properties>
-    <repositories>
-     </repositories>
     <dependencies>
         <dependency>
             <groupId>org.openidentityplatform.openicf.framework</groupId>
diff --git a/OpenICF-dbcommon/pom.xml b/OpenICF-dbcommon/pom.xml
@@ -36,8 +36,6 @@
     <name>OpenICF Database Common</name>
     <description>This is a generic bundle that contains many of the utilities needed for any sort of database connector, such as query builders, connection wrappers, and other SQL utilities.</description>
 
-    <repositories>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.openidentityplatform.openicf.framework</groupId>
diff --git a/OpenICF-java-framework/bundles-parent/pom.xml b/OpenICF-java-framework/bundles-parent/pom.xml
@@ -38,12 +38,6 @@
         connector bundle and common reporting for connectors.
         This is not multi module project, it does not aggregate the connectors, it is just common parent.
     </description>
-    <distributionManagement>
-        <site>
-            <id>forgerock.org</id>
-            <url>${siteDistributionURL}/connectors/</url>
-        </site>
-    </distributionManagement>
     <!-- mvn help:effective-pom
          mvn archetype:create-from-project
          mvn help:active-profiles
@@ -201,14 +195,6 @@
                         </stagingSiteURL>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-scm-plugin</artifactId>
-                    <configuration>
-                        <tag>${project.version}</tag>
-                        <message>[ForgeRock Connector Release] ${project.name}</message>
-                    </configuration>
-                </plugin>
 
 
                 <!--<plugins>-->
diff --git a/OpenICF-java-framework/connector-framework-contract/src/it/basic-connector/pom.xml b/OpenICF-java-framework/connector-framework-contract/src/it/basic-connector/pom.xml
@@ -40,46 +40,13 @@
     <packaging>bundle</packaging>
     <name>Basic Connector</name>
     <description>Connector for Basic</description>
-    <url>https://openicf.forgerock.org/connectors/basic-connector</url>
-    <issueManagement>
-        <system>jira</system>
-        <url>https://bugster.forgerock.org/jira/browse/OPENICF/component/10191</url>
-    </issueManagement>
-    <ciManagement>
-        <system>jenkins</system>
-        <url>http://builds.forgerock.org/job/OpenICF Java - Basic Connector</url>
-    </ciManagement>
-    <scm>
-        <connection>scm:svn:https://svn.forgerock.org/openicf/trunk/connectors/java/basic-connector</connection>
-        <developerConnection>scm:svn:https://svn.forgerock.org/openicf/trunk/connectors/java/basic-connector
-        </developerConnection>
-        <url>http://sources.forgerock.org/browse/openicf/trunk/connectors/java/basic-connector</url>
-    </scm>
     <properties>
         <connectorPackage>org.forgerock.openicf.connectors.basic</connectorPackage>
         <connectorClass>BasicConnector</connectorClass>
         <jira.componentIds>10191</jira.componentIds>
         <jira.versionPrefix>${project.artifactId}</jira.versionPrefix>
         <jira.fixVersionIds>0</jira.fixVersionIds>
     </properties>
-    <repositories>
-        <repository>
-            <id>forgerock-staging-repository</id>
-            <name>ForgeRock Release Repository</name>
-            <url>http://maven.forgerock.org/repo/releases</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>forgerock-snapshots-repository</id>
-            <name>ForgeRock Snapshot Repository</name>
-            <url>http://maven.forgerock.org/repo/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
     <build>
         <plugins>
             <plugin>
diff --git a/OpenICF-java-framework/pom.xml b/OpenICF-java-framework/pom.xml
@@ -38,33 +38,6 @@
         Connectors provide a consistent generic layer between applications and target resources.
     </description>
     <inceptionYear>2010</inceptionYear>
-    <url>http://openicf.forgerock.org/</url>
-    <licenses>
-        <license>
-            <name>CDDL-1.0</name>
-            <url>http://opensource.org/licenses/CDDL-1.0</url>
-            <comments>Common Development and Distribution License (CDDL) 1.0.
-                This license applies to OpenICF source code as indicated in the
-                sources.
-            </comments>
-            <distribution>repo</distribution>
-        </license>
-        <license>
-            <name>CC BY-NC-ND 3.0</name>
-            <url>http://creativecommons.org/licenses/by-nc-nd/3.0/</url>
-            <comments>Creative Commons Attribution-NonCommercial-NoDerivs 3.0
-                Unported. This license applies to the site content, and to the
-                documentation as indicated in the documentation source code.
-            </comments>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-<!--     <scm> -->
-<!--         <connection>scm:git:ssh://git@stash.forgerock.org:7999/openicf/java-framework.git</connection> -->
-<!--         <developerConnection>scm:git:ssh://git@stash.forgerock.org:7999/openicf/java-framework.git</developerConnection> -->
-<!--         <url>http://stash.forgerock.org/projects/OPENICF/repos/java-framework/browse</url> -->
-<!--       <tag>1.5.2.0</tag> -->
-<!--   </scm> -->
 
     <properties>
         <!-- maven-compiler-plugin -->
@@ -179,10 +152,6 @@
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-source-plugin</artifactId>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
diff --git a/OpenICF-kerberos-connector/pom.xml b/OpenICF-kerberos-connector/pom.xml
@@ -39,8 +39,6 @@
         </openicf.osgi.import.defaults>
         <openicf.osgi.embed />
     </properties>
-    <repositories>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.openidentityplatform.openicf.connectors</groupId>
diff --git a/OpenICF-ldap-connector/pom.xml b/OpenICF-ldap-connector/pom.xml
@@ -35,7 +35,6 @@
     <packaging>bundle</packaging>
     <name>OpenICF Generic JNDI based LDAP Connector</name>
     <description>Connector for Sun DSEE and OpenDJ and Generic LDAP</description>
-    <url>http://openicf.forgerock.org/connectors/ldap-connector/</url>
     <properties>
         <connectorPackage>org.identityconnectors.ldap</connectorPackage>
         <connectorClass>LdapConnector</connectorClass>
diff --git a/OpenICF-maven-plugin/pom.xml b/OpenICF-maven-plugin/pom.xml
@@ -37,8 +37,6 @@
         OpenICF Connector build helper plugin
     </description>
     <inceptionYear>2012</inceptionYear>
-    <repositories>
-    </repositories>
     <properties>
         <mavenVersion>3.8.1</mavenVersion>
         <mavenFilteringVersion>1.1</mavenFilteringVersion>
diff --git a/OpenICF-maven-plugin/src/it/docbook-connector/pom.xml b/OpenICF-maven-plugin/src/it/docbook-connector/pom.xml
@@ -50,24 +50,6 @@
         <framework.releaseVersion>@framework.releaseVersion@</framework.releaseVersion>
         <projectVersion>@frameworkVersion@</projectVersion>
     </properties>
-    <repositories>
-<!--         <repository> -->
-<!--             <id>forgerock-staging-repository</id> -->
-<!--             <name>ForgeRock Release Repository</name> -->
-<!--             <url>http://maven.forgerock.org/repo/releases</url> -->
-<!--             <snapshots> -->
-<!--                 <enabled>false</enabled> -->
-<!--             </snapshots> -->
-<!--         </repository> -->
-<!--         <repository> -->
-<!--             <id>forgerock-snapshots-repository</id> -->
-<!--             <name>ForgeRock Snapshot Repository</name> -->
-<!--             <url>http://maven.forgerock.org/repo/snapshots</url> -->
-<!--             <releases> -->
-<!--                 <enabled>false</enabled> -->
-<!--             </releases> -->
-<!--         </repository> -->
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.openidentityplatform.openicf.framework</groupId>
diff --git a/OpenICF-maven-plugin/src/main/java/org/forgerock/openicf/maven/ReducePomMojo.java b/OpenICF-maven-plugin/src/main/java/org/forgerock/openicf/maven/ReducePomMojo.java
@@ -111,9 +111,9 @@ public void execute() throws MojoExecutionException {
                 if (removeSet == null || removeSet.contains("distributionManagement")) {
                     model.setDistributionManagement(null);
                 }
-                if (removeSet == null || removeSet.contains("parent")) {
+                /*if (removeSet == null || removeSet.contains("parent")) {
                     model.setParent(null);
-                }
+                }*/
                 if (removeSet == null || removeSet.contains("profiles")) {
                     model.setProfiles(null);
                 }
diff --git a/OpenICF-xml-connector/pom.xml b/OpenICF-xml-connector/pom.xml
@@ -44,8 +44,6 @@
         <framework.compatibilityVersion>1.5</framework.compatibilityVersion>
         <framework.releaseVersion>2.0</framework.releaseVersion>
     </properties>
-    <repositories>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.openidentityplatform.openicf.framework</groupId>
diff --git a/pom.xml b/pom.xml
@@ -269,7 +269,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.11.0</version>
+                    <version>3.13.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -279,18 +279,6 @@
                         <argLine>${java.surefire.options}</argLine>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>3.2.0</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>jar</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
@@ -304,6 +292,18 @@
             </plugins>
         </pluginManagement>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.3.1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
