Merge branch 'release/8.0-beta1'

bsorrentino · Feb 29, 2024 · 249a5ce · 249a5ce
2 parents b3b6e96 + 08e11cf
commit 249a5ce
Show file tree

Hide file tree

Showing 142 changed files with 1,465 additions and 854 deletions.
diff --git a/.github/workflows/deploy-pages.yaml b/.github/workflows/deploy-pages.yaml
@@ -26,8 +26,8 @@ jobs:
       - name: Deploy site to Github pages
         run: |
           mvn -B install --file pom.xml -s settings-template.xml
-          mvn -B --projects plugin-reporting site --file pom.xml -s settings-template.xml
-          cp -R core/target/site plugin-reporting/target/site/core
+          mvn -B --projects mojo site --file pom.xml -s settings-template.xml
+          cp -R core/target/site mojo/target/site/core
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
         with:

diff --git a/.github/workflows/deploy-snapshot.yaml b/.github/workflows/deploy-snapshot.yaml
@@ -22,10 +22,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: develop
-      - name: Set up JDK 9
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 9
+          java-version: 11
 
       - name: Build with Maven
         env:

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -17,10 +17,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: master
-      - name: Set up JDK 9
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 9
+          java-version: 11
       - name: GPG Setup
         env:
           GPG_KEY_BASE64: ${{ secrets.GPG_KEY_BASE64 }}

diff --git a/addon-scrollversions/pom.xml b/addon-scrollversions/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>maven-confluence-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>7.13</version>
+        <version>8.0-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,6 +28,13 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.16</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -42,6 +49,25 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgs>
+                        <arg>-Xlint:unchecked</arg>
+                        <arg>-Xlint:deprecation</arg>
+                    </compilerArgs>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.22</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+
+
         </plugins>
 
     </build>