fixup! fixup! fixup! Fixes #18311: Changes to rudder package command …

…to improve plugin management Fixes #18311: Changes to rudder package command to improve plugin management
Normation · Oct 21, 2020 · 927eb9a · 927eb9a
1 parent 1cdffa8
commit 927eb9a
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 27 deletions.
diff --git a/webapp/sources/ldap-inventory/inventory-api/pom.xml b/webapp/sources/ldap-inventory/inventory-api/pom.xml
@@ -34,7 +34,7 @@ along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
   <parent>
     <groupId>com.normation.inventory</groupId>
     <artifactId>inventory-parent</artifactId>
-    <version>6.1.6-SNAPSHOT</version>
+    <version>6.2.0~alpha1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>inventory-api</artifactId>

diff --git a/...ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/Software.scala b/...ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/Software.scala
@@ -55,7 +55,5 @@ final case class Software(
   version : Option[Version] = None,
   editor : Option[SoftwareEditor] = None,
   releaseDate : Option[DateTime] = None,
-  license : Option[License] = None,
-  sourceName :Option[String] = None,
-  sourceVersion :Option[Version] = None
+  license : Option[License] = None
 )
diff --git a/...entory-api/src/main/scala/com/normation/inventory/services/provisioning/ReportSaver.scala b/...entory-api/src/main/scala/com/normation/inventory/services/provisioning/ReportSaver.scala
@@ -130,7 +130,7 @@ trait PipelinedReportSaver[R] extends ReportSaver[R] with Loggable {
        */
       postPostCommitReport <- ZIO.foldLeft(postCommitPipeline)(commitedChange) { (currentChanges, postCommit) =>
         postCommit(postPreCommitReport, currentChanges).chainError(s"Error in postCommit pipeline with processor '${postCommit.name}'. The commit was done, we may be in a inconsistent state.")
-        }
+      }
 
       t3 <- UIO(System.currentTimeMillis)
       _  <- InventoryProcessingLogger.timing.trace(s"Post commit report: ${t3-t2} ms")

diff --git a/webapp/sources/ldap-inventory/inventory-fusion/pom.xml b/webapp/sources/ldap-inventory/inventory-fusion/pom.xml
@@ -35,7 +35,7 @@ along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
   <parent>
     <groupId>com.normation.inventory</groupId>
     <artifactId>inventory-parent</artifactId>
-    <version>6.1.6-SNAPSHOT</version>
+    <version>6.2.0~alpha1-SNAPSHOT</version>
   </parent>
 
   <artifactId>inventory-fusion</artifactId>

diff --git a/...src/main/scala/com/normation/inventory/provisioning/fusion/FusionReportUnmarshaller.scala b/...src/main/scala/com/normation/inventory/provisioning/fusion/FusionReportUnmarshaller.scala
@@ -906,8 +906,6 @@ class FusionReportUnmarshaller(
       , version = optText(s\"VERSION").map(x => new Version(x) )
       , description = optText(s\"COMMENTS")
       , editor = optText(s\"PUBLISHER").map(e => new SoftwareEditor(e))
-      , sourceName = optText(s\"SOURCE_NAME")
-      , sourceVersion = optText(s\"SOURCE_VERSION").map(x => new Version(x) )
     )
 
   /**

diff --git a/webapp/sources/ldap-inventory/inventory-provisioning-core/pom.xml b/webapp/sources/ldap-inventory/inventory-provisioning-core/pom.xml
@@ -35,7 +35,7 @@ along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
   <parent>
     <groupId>com.normation.inventory</groupId>
     <artifactId>inventory-parent</artifactId>
-    <version>6.1.6-SNAPSHOT</version>
+    <version>6.2.0~alpha1-SNAPSHOT</version>
   </parent>
 
   <artifactId>inventory-provisioning-core</artifactId>

diff --git a/webapp/sources/ldap-inventory/inventory-repository/pom.xml b/webapp/sources/ldap-inventory/inventory-repository/pom.xml
@@ -34,7 +34,7 @@ along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
   <parent>
     <groupId>com.normation.inventory</groupId>
     <artifactId>inventory-parent</artifactId>
-    <version>6.1.6-SNAPSHOT</version>
+    <version>6.2.0~alpha1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>inventory-repository</artifactId>

diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/main/resources/ldap/inventory.schema b/webapp/sources/ldap-inventory/inventory-repository/src/main/resources/ldap/inventory.schema
@@ -819,21 +819,6 @@ attributetype ( InventoryAttributes:400.57
   SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
 
-attributetype ( InventoryAttributes:400.58
-  NAME 'sourceName'
-  DESC 'Name of the source package (used on debian like systems)'
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
-
-
-attributetype ( InventoryAttributes:400.59
-  NAME 'sourceVersion'
-  DESC 'Version of the source package, used on debian like systems, for ex: v3.0.34-pre4'
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
-
 #######################################################
 ################  Object Classes ######################
 #######################################################
@@ -963,7 +948,7 @@ objectclass ( InventoryObjectClasses:7
   STRUCTURAL
   MUST ( biosName )
   MAY ( releaseDate $ editor $ softwareVersion $ licenseExpirationDate $
-        licenseName $ licenseProductId $ licenseProductKey $ sourceName $ sourceVersion) )
+        licenseName $ licenseProductId $ licenseProductKey ) )
 
 objectclass ( InventoryObjectClasses:8
   NAME 'controllerPhysicalElement'

diff --git a/webapp/sources/ldap-inventory/pom.xml b/webapp/sources/ldap-inventory/pom.xml
@@ -40,7 +40,7 @@ along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
   <parent>
     <groupId>com.normation</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>6.1.6-SNAPSHOT</version>
+    <version>6.2.0~alpha1-SNAPSHOT</version>
   </parent>
 
   <description>