Uwe Plonus · Uwe Plonus · Uwe Plonus · abeef54c · abeef54c · abeef54c
8 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,6 @@ pom.xml.next
 release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
-/nb-configuration.xml
\ No newline at end of file
+/nb-configuration.xml
+.idea/
+public/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
+image: registry.sw4j.net/sw4j-net/jdk8-maven3:latest
+
+stages:
+  - build
+  - deploy
+
+variables:
+  MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode"
+
+build:
+  stage: build
+  script:
+    - mvn $MAVEN_CLI_OPTS clean install
+
+deploy:
+  stage: deploy
+  only:
+    refs:
+      - master@sw4j-org/api-sniffer
+    variables:
+      - $REPO_USER
+  script:
+    - mvn $MAVEN_CLI_OPTS deploy
+
+pages:
+  stage: deploy
+  only:
+    refs:
+      - master
+  script:
+    - mvn site post-site
+    - mv target/staging public
+  artifacts:
+    paths:
+      - public
--- a/.m2/settings.xml
+++ b/.m2/settings.xml
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                          https://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+  <profiles>
+    <profile>
+      <id>release</id>
+      <properties>
+        <gpg.executable>gpg2</gpg.executable>
+        <gpg.keyname>${env.CI_GPG_KEYNAME}</gpg.keyname>
+      </properties>
+    </profile>
+    <profile>
+      <id>standard</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <repositories>
+        <repository>
+          <id>ossrh-snapshots</id>
+          <name>http://central.sonatype.org Snapshots</name>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>always</updatePolicy>
+          </snapshots>
+          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+          <layout>default</layout>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>ossrh-snapshots</id>
+          <name>http://central.sonatype.org Snapshots</name>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>always</updatePolicy>
+          </snapshots>
+          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+
+  <servers>
+    <server>
+      <id>ossrh</id>
+      <username>${env.REPO_USER}</username>
+      <password>${env.REPO_PWD}</password>
+    </server>
+  </servers>
+
+</settings>
--- a/api-sample/base/src/site/markdown/index.md
+++ b/api-sample/base/src/site/markdown/index.md
+# Java API Sniffer - Base Samples
+
+This are samples for the Java library suite to create API descriptions.
--- a/api-sample/base/src/site/site_en.xml
+++ b/api-sample/base/src/site/site_en.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~     Java API Sniffer - Check and compare APIs
+  ~     Copyright (C) 2018 Uwe Plonus
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program 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 General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  ~
+  -->
+
+<project
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+    xmlns='http://maven.apache.org/DECORATION/1.6.0'
+    xsi:schemaLocation='http://maven.apache.org/DECORATION/1.6.0 https://maven.apache.org/xsd/decoration-1.6.0.xsd'
+    name="Java API Sniffer - Base Samples">
+
+  <skin>
+    <groupId>org.apache.maven.skins</groupId>
+    <artifactId>maven-fluido-skin</artifactId>
+    <version>1.4</version>
+  </skin>
+
+  <body>
+
+    <menu ref="parent"/>
+
+    <menu name="Documentation">
+      <item name="Introduction" href="index.html"/>
+    </menu>
+
+    <menu ref="modules"/>
+
+    <menu ref="reports"/>
+
+  </body>
+
+</project>
--- a/api-sample/src/site/markdown/index.md
+++ b/api-sample/src/site/markdown/index.md
+# Java API Sniffer - Samples
+
+This are samples for the Java library suite to create API descriptions.
--- a/api-sample/src/site/site_en.xml
+++ b/api-sample/src/site/site_en.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~     Java API Sniffer - Check and compare APIs
+  ~     Copyright (C) 2018 Uwe Plonus
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program 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 General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  ~
+  -->
+
+<project
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+    xmlns='http://maven.apache.org/DECORATION/1.6.0'
+    xsi:schemaLocation='http://maven.apache.org/DECORATION/1.6.0 https://maven.apache.org/xsd/decoration-1.6.0.xsd'
+    name="Java API Sniffer - Samples">
+
+  <skin>
+    <groupId>org.apache.maven.skins</groupId>
+    <artifactId>maven-fluido-skin</artifactId>
+    <version>1.4</version>
+  </skin>
+
+  <body>
+
+    <menu ref="parent"/>
+
+    <menu name="Documentation">
+      <item name="Introduction" href="index.html"/>
+    </menu>
+
+    <menu ref="modules"/>
+
+    <menu ref="reports"/>
+
+  </body>
+
+</project>
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@

  <description>A Java API Sniffer to create and check APIs.</description>

-  <url>https://sw4j-org.github.io/api-sniffer/</url>
+  <url>https://sw4j-org.pages.sw4j.net/api-sniffer/</url>

  <licenses>
    <license>
@@ -24,14 +24,14 @@

  <issueManagement>
    <system>GitHub</system>
-    <url>https://github.com/sw4j-org/api-sniffer/issues/</url>
+    <url>https://git.sw4j.net/sw4j-org/api-sniffer/issues/</url>
  </issueManagement>

  <developers>
    <developer>
      <id>uweplonus</id>
      <name>Uwe Plonus</name>
-      <url>https://github.com/uweplonus</url>
+      <url>https://git.sw4j.net/uweplonus</url>
    </developer>
  </developers>

@@ -154,23 +154,6 @@
          <releaseProfiles>release</releaseProfiles>
        </configuration>
      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-scm-publish-plugin</artifactId>
-        <configuration>
-          <scmBranch>gh-pages</scmBranch>
-          <skipCheckin>true</skipCheckin>
-        </configuration>
-        <executions>
-          <execution>
-            <id>scm-publish</id>
-            <phase>site-deploy</phase>
-            <goals>
-              <goal>publish-scm</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-site-plugin</artifactId>
@@ -182,13 +165,13 @@
            </goals>
          </execution>
          <execution>
-            <id>stage-for-scm-publish</id>
+            <id>stage-for-publish</id>
            <phase>post-site</phase>
            <goals>
              <goal>stage</goal>
            </goals>
            <configuration>
-              <skipDeploy>false</skipDeploy>
+              <skipDeploy>true</skipDeploy>
            </configuration>
          </execution>
        </executions>
@@ -210,7 +193,7 @@
        <configuration>
          <threshold>Low</threshold>
          <effort>Max</effort>
-          <includeFilterFile>https://github.com/sw4j-org/configuration/raw/master/findbugs.xml</includeFilterFile>
+          <includeFilterFile>https://git.sw4j.net/sw4j-org/quality-profile/raw/master/src/main/resources/org/sw4j/quality-profile/findbugs/findbugs-3.0.4.xml</includeFilterFile>
        </configuration>
      </plugin>
      <plugin>
@@ -244,7 +227,7 @@
          <artifactId>maven-checkstyle-plugin</artifactId>
          <version>${checkstyle-plugin-version}</version>
          <configuration>
-            <configLocation>https://github.com/sw4j-org/configuration/raw/master/checkstyle.xml</configLocation>
+            <configLocation>https://git.sw4j.net/sw4j-org/quality-profile/raw/master/src/main/resources/org/sw4j/quality-profile/checkstyle/checkstyle-6.19.xml</configLocation>
          </configuration>
          <dependencies>
            <dependency>
@@ -265,7 +248,7 @@
          <version>${pmd-plugin-version}</version>
          <configuration>
            <rulesets>
-              <ruleset>https://github.com/sw4j-org/configuration/raw/master/pmd.xml</ruleset>
+              <ruleset>https://git.sw4j.net/sw4j-org/quality-profile/raw/master/src/main/resources/org/sw4j/quality-profile/pmd/pmd-3.7.xml</ruleset>
            </rulesets>
          </configuration>
        </plugin>
@@ -394,7 +377,7 @@
        <artifactId>maven-pmd-plugin</artifactId>
        <version>${pmd-plugin-version}</version>
        <configuration>
-          <configLocation>https://github.com/sw4j-org/configuration/raw/master/pmd.xml</configLocation>
+          <configLocation>https://git.sw4j.net/sw4j-org/quality-profile/raw/master/src/main/resources/org/sw4j/quality-profile/pmd/pmd-3.7.xml</configLocation>
          <skipEmptyReport>false</skipEmptyReport>
        </configuration>
        <reportSets>
@@ -412,8 +395,8 @@
        <configuration>
          <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
          <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
-          <webAccessUrl>https://github.com/sw4j-org/api-sniffer</webAccessUrl>
-          <developerConnection>scm:git:ssh://git@github.com:sw4j-org/api-sniffer.git</developerConnection>
+          <webAccessUrl>https://git.sw4j.net/sw4j-org/api-sniffer</webAccessUrl>
+          <developerConnection>scm:git:ssh://git@git.sw4j.net:sw4j-org/api-sniffer.git</developerConnection>
        </configuration>
        <reportSets>
          <reportSet>
@@ -439,7 +422,7 @@
        <configuration>
          <threshold>Low</threshold>
          <effort>Max</effort>
-          <includeFilterFile>https://github.com/sw4j-org/configuration/raw/master/findbugs.xml</includeFilterFile>
+          <includeFilterFile>https://git.sw4j.net/sw4j-org/quality-profile/raw/master/src/main/resources/org/sw4j/quality-profile/findbugs/findbugs-3.0.4.xml</includeFilterFile>
        </configuration>
      </plugin>
      <plugin>
@@ -485,7 +468,7 @@
        <artifactId>versions-maven-plugin</artifactId>
        <version>${versions-plugin-version}</version>
        <configuration>
-          <rulesUri>https://github.com/sw4j-org/configuration/raw/master/maven-version-rules.xml</rulesUri>
+          <rulesUri>https://git.sw4j.net/sw4j-org/quality-profile/raw/master/src/main/resources/org/sw4j/quality-profile/versions/rules-2.5.xml</rulesUri>
        </configuration>
        <reportSets>
          <reportSet>
@@ -507,7 +490,7 @@
        <artifactId>dependency-check-maven</artifactId>
        <version>${dependency-check-plugin-version}</version>
        <configuration>
-          <suppressionFile>https://github.com/sw4j-org/configuration/raw/master/dependency-check-suppression.xml</suppressionFile>
+          <suppressionFile>https://git.sw4j.net/sw4j-org/quality-profile/raw/master/src/main/resources/org/sw4j/quality-profile/dependency-check/suppression.xml</suppressionFile>
        </configuration>
        <reportSets>
          <reportSet>
@@ -522,14 +505,14 @@
  </reporting>

  <scm>
-    <developerConnection>scm:git:ssh://git@github.com:sw4j-org/api-sniffer.git</developerConnection>
-    <url>https://github.com/sw4j-org/api-sniffer</url>
+    <developerConnection>scm:git:ssh://git@git.sw4j.net:sw4j-org/api-sniffer.git</developerConnection>
+    <url>https://git.sw4j.net/sw4j-org/api-sniffer</url>
  </scm>

  <distributionManagement>
    <site>
      <id>github</id>
-      <url>scm:git:https://github.com/sw4j-org/api-sniffer.git</url>
+      <url>https://sw4j-org.pages.sw4j.net/api-sniffer</url>
    </site>
  </distributionManagement>