move to annotations, use a prefix javacc. for all properties (#16)

* move to annotations, use a prefix javacc. for all properties Signed-off-by: Olivier Lamy <olamy@apache.org> * bump version to 3.0.0-SNAPSHOT Signed-off-by: Olivier Lamy <olamy@apache.org>
mojohaus · Jul 20, 2022 · 6468062 · 6468062
1 parent 50a2498
commit 6468062
Show file tree

Hide file tree

Showing 22 changed files with 422 additions and 426 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -23,5 +23,3 @@ jobs:
   build:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
-    with:
-      ff-site-run: false
diff --git a/pom.xml b/pom.xml
@@ -29,11 +29,11 @@ under the License.
   </parent>
 
   <artifactId>javacc-maven-plugin</artifactId>
-  <version>2.7-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
   <name>JavaCC Maven Plugin</name>
-  <description>Maven 2 Plugin for processing JavaCC grammar files.</description>
+  <description>Maven 3 Plugin for processing JavaCC grammar files.</description>
   <url>http://mojo.codehaus.org/javacc-maven-plugin/</url>
   <inceptionYear>2005</inceptionYear>
   <licenses>
@@ -48,6 +48,11 @@ under the License.
     <maven>2.0.6</maven>
   </prerequisites>
 
+  <properties>
+    <sitePluginVersion>${maven-site-plugin.version}</sitePluginVersion>
+    <skipTests>false</skipTests>
+  </properties>
+
   <scm>
     <connection>scm:git:https://github.com/mojohaus/javacc-maven-plugin.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/mojohaus/javacc-maven-plugin.git</developerConnection>
@@ -58,25 +63,22 @@ under the License.
     <url>http://jira.codehaus.org/browse/MJAVACC</url>
   </issueManagement>
 
-  <properties>
-    <sitePluginVersion>3.11</sitePluginVersion>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0.4</version>
+      <version>3.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>2.0.4</version>
+      <artifactId>maven-model</artifactId>
+      <version>3.0</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.0.4</version>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <version>3.4</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>net.java.dev.javacc</groupId>
@@ -127,43 +129,30 @@ under the License.
     </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>run-its</id>
-      <activation>
-        <property>
-          <name>maven.test.skip</name>
-          <value>!true</value>
-        </property>
-      </activation>
-      <properties>
-        <sitePluginVersion>3.3</sitePluginVersion>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-invoker-plugin</artifactId>
-            <configuration>
-              <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-              <postBuildHookScript>verify.bsh</postBuildHookScript>
-              <settingsFile>src/it/settings.xml</settingsFile>
-              <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-              <debug>true</debug>
-            </configuration>
-            <executions>
-              <execution>
-                <id>integration-test</id>
-                <goals>
-                  <goal>install</goal>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-invoker-plugin</artifactId>
+        <configuration>
+          <skipInvocation>${skipTests}</skipInvocation>
+          <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+          <postBuildHookScript>verify.bsh</postBuildHookScript>
+          <settingsFile>src/it/settings.xml</settingsFile>
+          <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+          <debug>true</debug>
+        </configuration>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>install</goal>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/src/it/explicit-parameter-values/pom.xml b/src/it/explicit-parameter-values/pom.xml
@@ -127,7 +127,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>@maven-project-info-reports-plugin.version@</version>
         <reportSets>
           <reportSet/>
         </reportSets>

diff --git a/src/it/jjdoc-absent-source-directory/pom.xml b/src/it/jjdoc-absent-source-directory/pom.xml
@@ -36,7 +36,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>@maven-project-info-reports-plugin.version@</version>
         <reportSets>
           <reportSet/>
         </reportSets>

diff --git a/src/it/jjdoc-basic-site/pom.xml b/src/it/jjdoc-basic-site/pom.xml
@@ -40,7 +40,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>@maven-project-info-reports-plugin.version@</version>
         <reportSets>
           <reportSet/>
         </reportSets>

diff --git a/src/it/jjdoc-default-source-roots/pom.xml b/src/it/jjdoc-default-source-roots/pom.xml
@@ -61,7 +61,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>@maven-project-info-reports-plugin.version@</version>
         <reportSets>
           <reportSet/>
         </reportSets>

diff --git a/src/it/jjdoc-path-with-spaces/pom.xml b/src/it/jjdoc-path-with-spaces/pom.xml
@@ -54,7 +54,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>3.4.0</version>
+        <version>@maven-project-info-reports-plugin.version@</version>
         <reportSets>
           <reportSet/>
         </reportSets>

diff --git a/src/it/jjdoc-reactor-build/pom.xml b/src/it/jjdoc-reactor-build/pom.xml
@@ -43,7 +43,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>@maven-project-info-reports-plugin.version@</version>
         <reportSets>
           <reportSet/>
         </reportSets>