pdfbox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From le...@apache.org
Subject [2/3] pdfbox-jbig2 git commit: removed license-maven-plugin, added rat-plugin, adjust some config values
Date Mon, 16 Oct 2017 20:30:55 GMT
removed license-maven-plugin, added rat-plugin, adjust some config values


Project: http://git-wip-us.apache.org/repos/asf/pdfbox-jbig2/repo
Commit: http://git-wip-us.apache.org/repos/asf/pdfbox-jbig2/commit/a25ed66b
Tree: http://git-wip-us.apache.org/repos/asf/pdfbox-jbig2/tree/a25ed66b
Diff: http://git-wip-us.apache.org/repos/asf/pdfbox-jbig2/diff/a25ed66b

Branch: refs/heads/master
Commit: a25ed66b1f22112a75417f8876969e26cfb5c652
Parents: 2037094
Author: Andreas Lehmkühler <andreas@lehmi.de>
Authored: Mon Oct 16 22:25:28 2017 +0200
Committer: Andreas Lehmkühler <andreas@lehmi.de>
Committed: Mon Oct 16 22:25:28 2017 +0200

----------------------------------------------------------------------
 LICENSE-HEADER.txt                              |  14 --
 pom.xml                                         | 157 ++++++++-----------
 .../license-maven-plugin/additionalHeaders.xml  |  31 ----
 3 files changed, 68 insertions(+), 134 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/pdfbox-jbig2/blob/a25ed66b/LICENSE-HEADER.txt
----------------------------------------------------------------------
diff --git a/LICENSE-HEADER.txt b/LICENSE-HEADER.txt
deleted file mode 100644
index a9ac967..0000000
--- a/LICENSE-HEADER.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/pdfbox-jbig2/blob/a25ed66b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 16f692a..d8ada43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,16 @@
 		Formerly known as the levigo JBig2 ImageIO plugin (com.levigo.jbig2:levigo-jbig2-imageio).
 	</description>
 	
-	<url>https://github.com/levigo/jbig2-imageio</url>
+    <organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://pdfbox.apache.org</url>
+    </organization>
+  
+
+    <issueManagement>
+        <system>jira</system>
+        <url>https://issues.apache.org/jira/browse/PDFBOX</url>
+    </issueManagement>
 
 	<developers>
 		<developer>
@@ -59,26 +68,12 @@
 		</developer>
 	</developers>
 
-	<distributionManagement>
-		<snapshotRepository>
-			<id>sonatype-nexus-snapshots</id>
-			<name>Sonatype Nexus Snapshot Repository</name>
-			<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-		</snapshotRepository>
-		<repository>
-			<id>sonatype-nexus-staging</id>
-			<name>Sonatype Nexus Release Staging Repository</name>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-		</repository>
-	</distributionManagement>
-
-	<scm>
-    	<connection>scm:git:ssh://github.com/levigo/jbig2-imageio.git</connection>
-		<developerConnection>scm:git:ssh://git@github.com/levigo/jbig2-imageio.git</developerConnection>
-    	<url>https://github.com/levigo/jbig2-imageio</url>
-    	<tag>HEAD</tag>
-	</scm>
-
+    <scm>
+      <connection>scm:git:http://git-wip-us.apache.org/repos/asf/pdfbox-jbig2.git</connection>
+      <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/pdfbox-jbig2.git</developerConnection>
+      <url>https://git-wip-us.apache.org/repos/asf?p=pdfbox-jbig2.git</url>
+    </scm>
+	
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
@@ -99,78 +94,62 @@
 					<optimize>true</optimize>
 				</configuration>
 			</plugin>
-
-			<plugin>
-				<inherited>false</inherited>
-				<groupId>com.mycila</groupId>
-				<artifactId>license-maven-plugin</artifactId>
-				<version>3.0</version>
-				<configuration>
-					<header>${basedir}/LICENSE-HEADER.txt</header>
-					<failIfMissing>true</failIfMissing>
-					<aggregate>true</aggregate>
-					<useDefaultExcludes>false</useDefaultExcludes>
-					<excludes>
-						<exclude>**/.classpath</exclude>
-						<exclude>**/.project</exclude>
-						<exclude>**/.settings/**</exclude>
-						<exclude>**/target/**</exclude>
-						<exclude>**/.idea/**</exclude>
-						<exclude>**/atlassian-ide-plugin.xml</exclude>
-					</excludes>
-					<includes>
-						<include>**/*.xml</include>
-						<include>**/*.md</include>
-						<include>**/src/**/*.java</include>
-						<include>**/src/**/*.properties</include>
-						<include>**/META-INF/services/*</include>
-						<include>**/*.yml</include>
-					</includes>
-					<headerDefinitions>
-					   <headerDefinition>src/build/license-maven-plugin/additionalHeaders.xml</headerDefinition>
-					</headerDefinitions>
-					<mapping>
-						<md>MD_STYLE</md>
-						<CacheBridge>SCRIPT_STYLE</CacheBridge>
-						<ReaderSpi>SCRIPT_STYLE</ReaderSpi>
-						<LoggerBridge>SCRIPT_STYLE</LoggerBridge>
-						<TestService>SCRIPT_STYLE</TestService>
-						<ImageReaderSpi>SCRIPT_STYLE</ImageReaderSpi>
-					</mapping>
-				</configuration>
-				<executions>
-					<execution>
-						<id>check-headers</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-      <plugin>
-        <artifactId>maven-release-plugin</artifactId>
-        <configuration>
-          <autoVersionSubmodules>true</autoVersionSubmodules>
-          <!-- Keep changes in the local repo, push will be done afterwards -->
-          <pushChanges>false</pushChanges>
-          <localCheckout>true</localCheckout>
-          <!-- Use a better name for the tag -->
-          <tagNameFormat>${project.artifactId}-${project.version}</tagNameFormat>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.maven.scm</groupId>
-            <artifactId>maven-scm-provider-gitexe</artifactId>
-            <version>1.9</version>
-          </dependency>
-        </dependencies>
-      </plugin>
+            <plugin>
+		      <artifactId>maven-release-plugin</artifactId>
+		      <configuration>
+		          <autoVersionSubmodules>true</autoVersionSubmodules>
+		          <!-- Keep changes in the local repo, push will be done afterwards -->
+		          <pushChanges>false</pushChanges>
+		          <localCheckout>true</localCheckout>
+		          <!-- Use a better name for the tag -->
+		          <tagNameFormat>${project.artifactId}-${project.version}</tagNameFormat>
+		      </configuration>
+		      <dependencies>
+		          <dependency>
+		            <groupId>org.apache.maven.scm</groupId>
+		            <artifactId>maven-scm-provider-gitexe</artifactId>
+		            <version>1.9</version>
+		          </dependency>
+		      </dependencies>
+		    </plugin>
 		</plugins>
 	</build>
 
 	<profiles>
+        <profile>
+            <id>pedantic</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.rat</groupId>
+                        <artifactId>apache-rat-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.owasp</groupId>
+                        <artifactId>dependency-check-maven</artifactId>
+                        <version>2.1.0</version>
+                        <configuration>
+                            <failBuildOnAnyVulnerability>true</failBuildOnAnyVulnerability>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
 		<profile>
 			<id>release-sign-artifacts</id>
 			<activation>

http://git-wip-us.apache.org/repos/asf/pdfbox-jbig2/blob/a25ed66b/src/build/license-maven-plugin/additionalHeaders.xml
----------------------------------------------------------------------
diff --git a/src/build/license-maven-plugin/additionalHeaders.xml b/src/build/license-maven-plugin/additionalHeaders.xml
deleted file mode 100644
index 7effdc9..0000000
--- a/src/build/license-maven-plugin/additionalHeaders.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<additionalHeaders>
-    <md_style>
-        <firstLine><![CDATA[<!---]]></firstLine>
-        <beforeEachLine>  </beforeEachLine>
-        <endLine><![CDATA[--->]]></endLine>
-        <firstLineDetectionPattern><![CDATA[(\s|\t)*<!---.*$]]></firstLineDetectionPattern>
-        <lastLineDetectionPattern><![CDATA[.*--->(\s|\t)*$]]></lastLineDetectionPattern>
-        <allowBlankLines>false</allowBlankLines>
-        <isMultiline>true</isMultiline>
-        <padLines>false</padLines>
-    </md_style>
-</additionalHeaders>
\ No newline at end of file


Mime
View raw message