Second (failed) attempt at producing state machine graphs

dCache · Dec 3, 2024 · c7a1878 · c7a1878
1 parent 922e8ec
commit c7a1878
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 31 deletions.
diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml
@@ -55,9 +55,9 @@
                             </pluginExecution>
                             <pluginExecution>
                                 <pluginExecutionFilter>
-                                    <groupId>org.codehaus.mojo</groupId>
+                                    <groupId>net.sf.smc</groupId>
                                     <artifactId>smc-maven-plugin</artifactId>
-                                    <versionRange>[1.0-alpha-1,)</versionRange>
+                                    <versionRange>[7.6.0,)</versionRange>
                                     <goals>
                                         <goal>smc</goal>
                                     </goals>

diff --git a/modules/dcache-nearline-spi/pom.xml b/modules/dcache-nearline-spi/pom.xml
@@ -66,9 +66,9 @@
                             </pluginExecution>
                             <pluginExecution>
                                 <pluginExecutionFilter>
-                                    <groupId>org.codehaus.mojo</groupId>
+                                    <groupId>net.sf.smc</groupId>
                                     <artifactId>smc-maven-plugin</artifactId>
-                                    <versionRange>[1.0-alpha-1,)</versionRange>
+                                    <versionRange>[7.6.0,)</versionRange>
                                     <goals>
                                         <goal>smc</goal>
                                     </goals>

diff --git a/modules/dcache-srm/pom.xml b/modules/dcache-srm/pom.xml
@@ -70,9 +70,9 @@
                             </pluginExecution>
                             <pluginExecution>
                                 <pluginExecutionFilter>
-                                    <groupId>org.codehaus.mojo</groupId>
+                                    <groupId>net.sf.smc</groupId>
                                     <artifactId>smc-maven-plugin</artifactId>
-                                    <versionRange>[1.0-alpha-1,)</versionRange>
+                                    <versionRange>[7.6.0,)</versionRange>
                                     <goals>
                                         <goal>smc</goal>
                                     </goals>

diff --git a/modules/dcache-vehicles/pom.xml b/modules/dcache-vehicles/pom.xml
@@ -79,9 +79,9 @@
                             </pluginExecution>
                             <pluginExecution>
                                 <pluginExecutionFilter>
-                                    <groupId>org.codehaus.mojo</groupId>
+                                    <groupId>net.sf.smc</groupId>
                                     <artifactId>smc-maven-plugin</artifactId>
-                                    <versionRange>[1.0-alpha-1,)</versionRange>
+                                    <versionRange>[7.6.0,)</versionRange>
                                     <goals>
                                         <goal>smc</goal>
                                     </goals>

diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml
@@ -288,7 +288,8 @@
 
     <dependency>
         <groupId>net.sf.smc</groupId>
-        <artifactId>statemap</artifactId>
+        <artifactId>library</artifactId>
+        <version>${version.smc}</version>
     </dependency>
 
     <dependency>
@@ -395,26 +396,22 @@
   <build>
       <plugins>
           <plugin>
-              <groupId>org.codehaus.mojo</groupId>
+              <groupId>net.sf.smc</groupId>
               <artifactId>smc-maven-plugin</artifactId>
-              <version>1.0-alpha-1</version>
+              <version>7.6.0</version>
               <configuration>
+                <targetLanguage>java7</targetLanguage>
                 <verbose>true</verbose>
               </configuration>
               <executions>
                   <execution>
+                      <id>src-build</id>
+                      <phase>generate-sources</phase>
                       <goals>
                           <goal>smc</goal>
                       </goals>
                   </execution>
               </executions>
-              <dependencies>
-                  <dependency>
-                      <groupId>net.sf.smc</groupId>
-                      <artifactId>smc</artifactId>
-                      <version>${version.smc}</version>
-                  </dependency>
-              </dependencies>
           </plugin>
 
           <plugin>
@@ -491,9 +488,9 @@
                             </pluginExecution>
                             <pluginExecution>
                                 <pluginExecutionFilter>
-                                    <groupId>org.codehaus.mojo</groupId>
+                                    <groupId>net.sf.smc</groupId>
                                     <artifactId>smc-maven-plugin</artifactId>
-                                    <versionRange>[1.0-alpha-1,)</versionRange>
+                                    <versionRange>[7.6.0,)</versionRange>
                                     <goals>
                                         <goal>smc</goal>
                                     </goals>
@@ -528,9 +525,9 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>org.codehaus.mojo</groupId>
+            <groupId>net.sf.smc</groupId>
             <artifactId>smc-maven-plugin</artifactId>
-            <version>1.0-alpha-1</version>
+            <version>7.6.0</version>
             <configuration>
               <targetLanguage>graph</targetLanguage>
               <glevel>2</glevel>
@@ -539,6 +536,7 @@
             <executions>
               <execution>
                 <id>smc-dot</id>
+                <phase>generate-sources</phase>
                 <goals>
                   <goal>smc</goal>
                 </goals>
@@ -556,6 +554,4 @@
       </build>
     </profile>
   </profiles>
-
 </project>
-
diff --git a/pom.xml b/pom.xml
@@ -65,7 +65,7 @@
         <version.spring>5.3.39</version.spring>
         <!-- Remember to sync aspectj version in dcache.properties -->
         <version.aspectj>1.9.21.2</version.aspectj>
-        <version.smc>6.6.0</version.smc>
+        <version.smc>7.6.0</version.smc>
         <version.xerces>2.12.0</version.xerces>
         <version.jetty>9.4.55.v20240627</version.jetty>
         <version.xrootd4j>4.6.0</version.xrootd4j>
@@ -625,12 +625,6 @@
                 <version>${version.aspectj}</version>
             </dependency>
 
-            <dependency>
-                <groupId>net.sf.smc</groupId>
-                <artifactId>statemap</artifactId>
-                <version>${version.smc}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.h2database</groupId>
                 <artifactId>h2</artifactId>