Merge pull request deegree#1642 from gritGmbH/enhancement/remove-org-…

…reflections-3.6

Remove org.reflections dependency [3.6]

deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/JsfCoreModuleInfoProvider.java

@@ -0,0 +1,35 @@
+/*----------------------------------------------------------------------------
+ This file is part of deegree
+ Copyright (C) 2001-2024 by:
+ - Department of Geography, University of Bonn -
+ and
+ - lat/lon GmbH -
+ and
+ - grit GmbH -
+ and others
+
+ This library is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 2.1 of the License, or (at your option)
+ any later version.
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ details.
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ Contact information:
+
+ e-mail: [email protected]
+ website: http://www.deegree.org/
+----------------------------------------------------------------------------*/
+
+package org.deegree.client.core;
+
+import org.deegree.moduleinfo.ModuleInfoProvider;
+
+public class JsfCoreModuleInfoProvider implements ModuleInfoProvider {
+
+}

deegree-client/deegree-jsf-core/src/main/resources/META-INF/services/org.deegree.moduleinfo.ModuleInfoProvider

@@ -0,0 +1 @@
+org.deegree.client.core.JsfCoreModuleInfoProvider

deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/WpsWebclientModuleInfoProvider.java

@@ -0,0 +1,35 @@
+/*----------------------------------------------------------------------------
+ This file is part of deegree
+ Copyright (C) 2001-2024 by:
+ - Department of Geography, University of Bonn -
+ and
+ - lat/lon GmbH -
+ and
+ - grit GmbH -
+ and others
+
+ This library is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 2.1 of the License, or (at your option)
+ any later version.
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ details.
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ Contact information:
+
+ e-mail: [email protected]
+ website: http://www.deegree.org/
+----------------------------------------------------------------------------*/
+
+package org.deegree.wpsclient;
+
+import org.deegree.moduleinfo.ModuleInfoProvider;
+
+public class WpsWebclientModuleInfoProvider implements ModuleInfoProvider {
+
+}

deegree-client/deegree-wps-webclient/src/main/resources/META-INF/services/org.deegree.moduleinfo.ModuleInfoProvider

@@ -0,0 +1 @@
+org.deegree.wpsclient.WpsWebclientModuleInfoProvider

deegree-client/deegree-wpsprinter-webclient/src/main/java/org/deegree/client/wpsprinter/WpsprinterWebclientModuleInfoProvider.java

@@ -0,0 +1,35 @@
+/*----------------------------------------------------------------------------
+ This file is part of deegree
+ Copyright (C) 2001-2024 by:
+ - Department of Geography, University of Bonn -
+ and
+ - lat/lon GmbH -
+ and
+ - grit GmbH -
+ and others
+
+ This library is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 2.1 of the License, or (at your option)
+ any later version.
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ details.
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ Contact information:
+
+ e-mail: [email protected]
+ website: http://www.deegree.org/
+----------------------------------------------------------------------------*/
+
+package org.deegree.client.wpsprinter;
+
+import org.deegree.moduleinfo.ModuleInfoProvider;
+
+public class WpsprinterWebclientModuleInfoProvider implements ModuleInfoProvider {
+
+}

deegree-client/deegree-wpsprinter-webclient/src/main/resources/META-INF/services/org.deegree.moduleinfo.ModuleInfoProvider

@@ -0,0 +1 @@
+org.deegree.client.wpsprinter.WpsprinterWebclientModuleInfoProvider

deegree-core/deegree-connectionprovider-datasource/src/main/java/org/deegree/db/datasource/ConnectionsproviderDatasourceModuleInfoProvider.java

@@ -0,0 +1,35 @@
+/*----------------------------------------------------------------------------
+ This file is part of deegree
+ Copyright (C) 2001-2024 by:
+ - Department of Geography, University of Bonn -
+ and
+ - lat/lon GmbH -
+ and
+ - grit GmbH -
+ and others
+
+ This library is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 2.1 of the License, or (at your option)
+ any later version.
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ details.
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ Contact information:
+
+ e-mail: [email protected]
+ website: http://www.deegree.org/
+----------------------------------------------------------------------------*/
+
+package org.deegree.db.datasource;
+
+import org.deegree.moduleinfo.ModuleInfoProvider;
+
+public class ConnectionsproviderDatasourceModuleInfoProvider implements ModuleInfoProvider {
+
+}

deegree-core/deegree-connectionprovider-datasource/src/main/resources/META-INF/services/org.deegree.moduleinfo.ModuleInfoProvider

@@ -0,0 +1 @@
+org.deegree.db.datasource.ConnectionsproviderDatasourceModuleInfoProvider

deegree-core/deegree-core-3d/src/main/java/org/deegree/rendering/r3d/CoreR3DModuleInfoProvider.java

@@ -0,0 +1,35 @@
+/*----------------------------------------------------------------------------
+ This file is part of deegree
+ Copyright (C) 2001-2024 by:
+ - Department of Geography, University of Bonn -
+ and
+ - lat/lon GmbH -
+ and
+ - grit GmbH -
+ and others
+
+ This library is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 2.1 of the License, or (at your option)
+ any later version.
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ details.
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ Contact information:
+
+ e-mail: [email protected]
+ website: http://www.deegree.org/
+----------------------------------------------------------------------------*/
+
+package org.deegree.rendering.r3d;
+
+import org.deegree.moduleinfo.ModuleInfoProvider;
+
+public class CoreR3DModuleInfoProvider implements ModuleInfoProvider {
+
+}

deegree-core/deegree-core-3d/src/main/resources/META-INF/services/org.deegree.moduleinfo.ModuleInfoProvider

@@ -0,0 +1 @@
+org.deegree.rendering.r3d.CoreR3DModuleInfoProvider

deegree-core/deegree-core-annotations/pom.xml

@@ -30,5 +30,14 @@
     </plugins>
   </build>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.deegree</groupId>
+      <artifactId>deegree-core-moduleinfo</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
 </project>
 

deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/annotations/AnnotationsModuleInfoProvider.java

@@ -0,0 +1,35 @@
+/*----------------------------------------------------------------------------
+ This file is part of deegree
+ Copyright (C) 2001-2024 by:
+ - Department of Geography, University of Bonn -
+ and
+ - lat/lon GmbH -
+ and
+ - grit GmbH -
+ and others
+
+ This library is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 2.1 of the License, or (at your option)
+ any later version.
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ details.
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ Contact information:
+
+ e-mail: [email protected]
+ website: http://www.deegree.org/
+----------------------------------------------------------------------------*/
+
+package org.deegree.commons.annotations;
+
+import org.deegree.moduleinfo.ModuleInfoProvider;
+
+public class AnnotationsModuleInfoProvider implements ModuleInfoProvider {
+
+}

deegree-core/deegree-core-annotations/src/main/java/org/deegree/commons/annotations/Tool.java

@@ -45,17 +45,15 @@
 
 /**
  * The <code>Tool</code> annotation can be used to define a class with a main method as a
- * tool. Such a tool should supply a short description (as well as a main method of
- * course).
+ * tool. Such a tool must provide a non-args constructor, has to implement
+ * {@link org.deegree.commons.utils.ToolboxRegistration} and should supply a short
+ * description (as well as a main method of course).
  *
  * @author <a href="mailto:[email protected]">Rutger Bezema</a>
- * @deprecated This annotation is deprecated as of version 3.4 of deegree.
- *
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Target(ElementType.TYPE)
-@Deprecated
 public @interface Tool {
 
 	/**

deegree-core/deegree-core-annotations/src/main/resources/META-INF/services/org.deegree.moduleinfo.ModuleInfoProvider

@@ -0,0 +1 @@
+org.deegree.commons.annotations.AnnotationsModuleInfoProvider

deegree-core/deegree-core-base/src/main/java/org/deegree/base/BaseModuleInfoProvider.java

@@ -0,0 +1,7 @@
+package org.deegree.base;
+
+import org.deegree.moduleinfo.ModuleInfoProvider;
+
+public class BaseModuleInfoProvider implements ModuleInfoProvider {
+
+}

deegree-core/deegree-core-base/src/main/java/org/deegree/base/CoreBaseModuleInfoProvider.java

@@ -0,0 +1,35 @@
+/*----------------------------------------------------------------------------
+ This file is part of deegree
+ Copyright (C) 2001-2024 by:
+ - Department of Geography, University of Bonn -
+ and
+ - lat/lon GmbH -
+ and
+ - grit GmbH -
+ and others
+
+ This library is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 2.1 of the License, or (at your option)
+ any later version.
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ details.
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ Contact information:
+
+ e-mail: [email protected]
+ website: http://www.deegree.org/
+----------------------------------------------------------------------------*/
+
+package org.deegree.base;
+
+import org.deegree.moduleinfo.ModuleInfoProvider;
+
+public class CoreBaseModuleInfoProvider implements ModuleInfoProvider {
+
+}

deegree-core/deegree-core-base/src/main/resources/META-INF/services/org.deegree.moduleinfo.ModuleInfoProvider

@@ -0,0 +1 @@
+org.deegree.base.CoreBaseModuleInfoProvider

deegree-core/deegree-core-commons/pom.xml

@@ -25,6 +25,11 @@
   </build>
 
   <dependencies>
+    <dependency>
+      <groupId>org.deegree</groupId>
+      <artifactId>deegree-core-moduleinfo</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>jakarta.xml.bind</groupId>
       <artifactId>jakarta.xml.bind-api</artifactId>
@@ -99,10 +104,6 @@
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.reflections</groupId>
-      <artifactId>reflections</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>

deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/CoreCommonsModuleInfoProvider.java

@@ -0,0 +1,35 @@
+/*----------------------------------------------------------------------------
+ This file is part of deegree
+ Copyright (C) 2001-2024 by:
+ - Department of Geography, University of Bonn -
+ and
+ - lat/lon GmbH -
+ and
+ - grit GmbH -
+ and others
+
+ This library is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 2.1 of the License, or (at your option)
+ any later version.
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ details.
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ Contact information:
+
+ e-mail: [email protected]
+ website: http://www.deegree.org/
+----------------------------------------------------------------------------*/
+
+package org.deegree.commons;
+
+import org.deegree.moduleinfo.ModuleInfoProvider;
+
+public class CoreCommonsModuleInfoProvider implements ModuleInfoProvider {
+
+}