Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .checkstyle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
Copyright (c) 2021, 2022 John Whaley and others
Copyright (c) 2021-2023 John Whaley and others

See the CONTRIBUTORS file(s) distributed with this work for additional
information regarding copyright ownership.
Expand Down
1 change: 0 additions & 1 deletion .classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Expand Down
41 changes: 24 additions & 17 deletions build.properties → .gitattributes
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
##############################################################################
# Copyright (c) 2020, 2022 John Whaley and others
#
# See the CONTRIBUTORS file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# This program and the accompanying materials are made available under the
# terms of the GNU Library General Public License v2 or later, which is
# available at https://spdx.org/licenses/LGPL-2.0-or-later.html
#
# SPDX-License-Identifier: LGPL-2.0-or-later
##############################################################################

source.. = src/main/java/
bin.includes = .,\
META-INF/
src.includes = src/
##############################################################################
# Copyright (c) 2020-2023 John Whaley and others
#
# See the CONTRIBUTORS file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# This program and the accompanying materials are made available under the
# terms of the GNU Library General Public License v2 or later, which is
# available at https://spdx.org/licenses/LGPL-2.0-or-later.html
#
# SPDX-License-Identifier: LGPL-2.0-or-later
##############################################################################

# Set the default behavior, convert to native line endings on checkout.
* text=auto

# Declare files that will always have certain line endings on checkout.
*.bash text eol=lf
*.sh text eol=lf

# Denote all files that are truly binary.
*.class binary
*.jar binary
*.png binary
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##############################################################################
# Copyright (c) 2020, 2022 John Whaley and others
# Copyright (c) 2020-2023 John Whaley and others
#
# See the CONTRIBUTORS file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
11 changes: 0 additions & 11 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,6 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
Expand All @@ -34,7 +24,6 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
</projectDescription>
9 changes: 0 additions & 9 deletions META-INF/MANIFEST.MF

This file was deleted.

19 changes: 19 additions & 0 deletions com.github.javabdd.build.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
<stringAttribute key="M2_GOALS" value="clean verify"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
<booleanAttribute key="M2_OFFLINE" value="false"/>
<stringAttribute key="M2_PROFILES" value=""/>
<listAttribute key="M2_PROPERTIES"/>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
<intAttribute key="M2_THREADS" value="1"/>
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
<stringAttribute key="M2_USER_SETTINGS" value=""/>
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/com.github.javabdd}"/>
</launchConfiguration>
97 changes: 64 additions & 33 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2020, 2022 John Whaley and others
Copyright (c) 2020-2023 John Whaley and others

See the CONTRIBUTORS file(s) distributed with this work for additional
information regarding copyright ownership.
Expand All @@ -11,7 +11,9 @@ available at https://spdx.org/licenses/LGPL-2.0-or-later.html
SPDX-License-Identifier: LGPL-2.0-or-later
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

Expand All @@ -20,17 +22,26 @@ SPDX-License-Identifier: LGPL-2.0-or-later
<version>4.0.1-SNAPSHOT</version>
<packaging>jar</packaging>

<name>com.github.javabdd</name>
<name>JavaBDD</name>
<url>https://github.com/com-github-javabdd/com.github.javabdd</url>
<description>JavaBDD: A Java library for Binary Decision Diagrams (BDDs)</description>

<properties>
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<licenses>
<license>
<name>LGPL-2.0-or-later</name>
<url>https://spdx.org/licenses/LGPL-2.0-or-later.html</url>
</license>
</licenses>

<organization>
<name>${project.groupId}</name>
</organization>

<developers>
<developer>
<id>dhendriks</id>
Expand All @@ -40,27 +51,59 @@ SPDX-License-Identifier: LGPL-2.0-or-later
</developer>
</developers>

<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<encoding>UTF-8</encoding>
<encoding>${project.build.sourceEncoding}</encoding>
<failOnWarning>true</failOnWarning>
<parameters>true</parameters>
<release>11</release>
<release>${java.version}</release>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<source>11</source>
<target>11</target>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.8</version>
<extensions>true</extensions>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
<configuration>
<instructions>
<Automatic-Module-Name>${project.artifactId}</Automatic-Module-Name>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Bundle-RequiredExecutionEnvironment>JavaSE-${java.version}</Bundle-RequiredExecutionEnvironment>
<!-- PDE does not support Require-Capability, only Bundle-RequiredExecutionEnvironment. -->
<!-- Bundle-RequiredExecutionEnvironment may not be mixed with Require-Capability. -->
<_noee>true</_noee>
</instructions>
<niceManifest>true</niceManifest>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>

Expand All @@ -81,23 +124,19 @@ SPDX-License-Identifier: LGPL-2.0-or-later
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0-M7</version>
<version>3.0.0</version>
<configuration>
<localCheckout>true</localCheckout>
<pushChanges>false</pushChanges>
<mavenExecutorId>forked-path</mavenExecutorId>
<arguments>
-Dgpg.passphrase=${gpg.passphrase}
</arguments>
<arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
<tagNameFormat>@{project.version}</tagNameFormat>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>
maven-scm-provider-gitexe
</artifactId>
<version>2.0.0-M3</version>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>2.0.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -174,25 +213,17 @@ SPDX-License-Identifier: LGPL-2.0-or-later
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>
https://oss.sonatype.org/content/repositories/snapshots
</url>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>
https://oss.sonatype.org/service/local/staging/deploy/maven2/
</url>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<scm>
<connection>
scm:git:git://github.com/dexecutor/dependent-tasks-executor.git
</connection>
<developerConnection>
scm:git:git@github.com:dexecutor/dexecutor.git
</developerConnection>
<connection>scm:git:git://github.com/dexecutor/dependent-tasks-executor.git</connection>
<developerConnection>scm:git:git@github.com:dexecutor/dexecutor.git</developerConnection>
<url>https://github.com/com-github-javabdd/com.github.javabdd</url>
<tag>HEAD</tag>
</scm>
Expand Down
2 changes: 1 addition & 1 deletion release-perform
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/bash

##############################################################################
# Copyright (c) 2020, 2022 John Whaley and others
# Copyright (c) 2020-2023 John Whaley and others
#
# See the CONTRIBUTORS file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion release-prepare
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/bash

##############################################################################
# Copyright (c) 2020, 2022 John Whaley and others
# Copyright (c) 2020-2023 John Whaley and others
#
# See the CONTRIBUTORS file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/javabdd/BDD.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2003, 2022 John Whaley and others
// Copyright (c) 2003-2023 John Whaley and others
//
// See the CONTRIBUTORS file(s) distributed with this work for additional
// information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/javabdd/BDDBitVector.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2003, 2022 John Whaley and others
// Copyright (c) 2003-2023 John Whaley and others
//
// See the CONTRIBUTORS file(s) distributed with this work for additional
// information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/javabdd/BDDDomain.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2003, 2022 John Whaley and others
// Copyright (c) 2003-2023 John Whaley and others
//
// See the CONTRIBUTORS file(s) distributed with this work for additional
// information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/javabdd/BDDException.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2003, 2022 John Whaley and others
// Copyright (c) 2003-2023 John Whaley and others
//
// See the CONTRIBUTORS file(s) distributed with this work for additional
// information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/javabdd/BDDFactory.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2003, 2022 John Whaley and others
// Copyright (c) 2003-2023 John Whaley and others
//
// See the CONTRIBUTORS file(s) distributed with this work for additional
// information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/javabdd/BDDFactoryIntImpl.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2004, 2022 John Whaley and others
// Copyright (c) 2004-2023 John Whaley and others
//
// See the CONTRIBUTORS file(s) distributed with this work for additional
// information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/javabdd/BDDPairing.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2003, 2022 John Whaley and others
// Copyright (c) 2003-2023 John Whaley and others
//
// See the CONTRIBUTORS file(s) distributed with this work for additional
// information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/javabdd/BDDVarSet.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2004, 2022 John Whaley and others
// Copyright (c) 2004-2023 John Whaley and others
//
// See the CONTRIBUTORS file(s) distributed with this work for additional
// information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/javabdd/BitString.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2001, 2022 John Whaley and others
// Copyright (c) 2001-2023 John Whaley and others
//
// See the CONTRIBUTORS file(s) distributed with this work for additional
// information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/javabdd/FindBestOrder.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2004, 2022 John Whaley and others
// Copyright (c) 2004-2023 John Whaley and others
//
// See the CONTRIBUTORS file(s) distributed with this work for additional
// information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/javabdd/JFactory.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2003, 2022 John Whaley and others
// Copyright (c) 2003-2023 John Whaley and others
//
// See the CONTRIBUTORS file(s) distributed with this work for additional
// information regarding copyright ownership.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/javabdd/TryVarOrder.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2004, 2022 John Whaley and others
// Copyright (c) 2004-2023 John Whaley and others
//
// See the CONTRIBUTORS file(s) distributed with this work for additional
// information regarding copyright ownership.
Expand Down