Skip to content

code format jdk 8 #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gnodet merged 5 commits into from
Aug 25, 2023
Merged

code format jdk 8 #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f8b6994
Use spotless for code formatting
gnodet Aug 25, 2023
4b3dac9
Reformat
gnodet Aug 25, 2023
2e2e5ba
Remove @author tags, we have git for that now
gnodet Aug 25, 2023
cf1e253
Target JDK 1.8, build with JDK >= 11
gnodet Aug 25, 2023
d512dd3
Disable JDK 8 on CI
gnodet Aug 25, 2023
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 .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
java: [ '1.8', '11', '17' ]
java: [ '11', '17' ]
steps:
- uses: actions/checkout@v2
with:
Expand Down
257 changes: 144 additions & 113 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,53 +31,61 @@
<name>Jansi</name>
<description>Jansi is a java library for generating and interpreting ANSI escape sequences.</description>

<properties>
<javadocSource>7</javadocSource>
<jdkTarget>1.7</jdkTarget>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<slf4j-version>1.6.1</slf4j-version>
<project.build.outputTimestamp>2021-10-14T05:42:06Z</project.build.outputTimestamp>
</properties>

<url>http://fusesource.github.io/jansi</url>
<inceptionYear>2009</inceptionYear>

<issueManagement>
<system>jira</system>
<url>https://github.com/fusesource/jansi/issues</url>
</issueManagement>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<developers>
<developer>
<id>chirino</id>
<name>Hiram Chirino</name>
<email>hiram@hiramchirino.com</email>
<url>http://hiramchirino.com</url>
<timezone>GMT-5</timezone>
</developer>
<developer>
<id>gnodet</id>
<name>Guillaume Nodet</name>
<email>gnodet@gmail.com</email>
<timezone>GMT+1</timezone>
</developer>
</developers>

<mailingLists>
<mailingList>
<name>Discussion List</name>
<archive>http://groups.google.com/group/jansi</archive>
<post>jansi-dev@googlegroups.com</post>
<subscribe>jansi-dev+subscribe@googlegroups.com</subscribe>
<unsubscribe>jansi-dev+unsubscribe@googlegroups.com</unsubscribe>
<post>jansi-dev@googlegroups.com</post>
<archive>http://groups.google.com/group/jansi</archive>
</mailingList>
<mailingList>
<name>Commits and Issue Tracker List</name>
<archive>http://groups.google.com/group/jansi-commits</archive>
<post>jansi-commits@googlegroups.com</post>
<subscribe>jansi-commits+subscribe@googlegroups.com</subscribe>
<unsubscribe>jansi-commisots+unsubscribe@googlegroups.com</unsubscribe>
<post>jansi-commits@googlegroups.com</post>
<archive>http://groups.google.com/group/jansi-commits</archive>
</mailingList>
</mailingLists>

<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<url>https://github.com/fusesource/jansi</url>
<connection>scm:git:git://github.com/fusesource/jansi.git</connection>
<developerConnection>scm:git:ssh://git@github.com/fusesource/jansi.git</developerConnection>
<tag>HEAD</tag>
</scm>
<tag>HEAD</tag>
<url>https://github.com/fusesource/jansi</url>
</scm>

<issueManagement>
<system>jira</system>
<url>https://github.com/fusesource/jansi/issues</url>
</issueManagement>

<distributionManagement>
<repository>
Expand All @@ -92,53 +100,59 @@
</snapshotRepository>
</distributionManagement>

<properties>
<javadocSource>8</javadocSource>
<jdkTarget>8</jdkTarget>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<slf4j-version>1.6.1</slf4j-version>
<project.build.outputTimestamp>2021-10-14T05:42:06Z</project.build.outputTimestamp>
</properties>

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.7.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.7.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli-codegen</artifactId>
<version>4.5.2</version>
<scope>test</scope>
</dependency>
</dependencies>

<repositories>
<repository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Snapshot Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Snapshot Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>

<developers>
<developer>
<id>chirino</id>
<name>Hiram Chirino</name>
<email>hiram@hiramchirino.com</email>
<url>http://hiramchirino.com</url>
<timezone>GMT-5</timezone>
</developer>
<developer>
<id>gnodet</id>
<name>Guillaume Nodet</name>
<email>gnodet@gmail.com</email>
<timezone>GMT+1</timezone>
</developer>
</developers>

<build>
<extensions>
<extension>
<groupId>org.fusesource.mvnplugins</groupId>
<artifactId>fuse-jxr-skin</artifactId>
<version>1.9</version>
</extension>
</extensions>

<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<directory>src/main/resources</directory>
<includes>
<include>**/*.properties</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<directory>src/main/resources</directory>
<excludes>
<exclude>**/*.properties</exclude>
</excludes>
Expand All @@ -151,25 +165,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>8</source>
<target>8</target>
<release>${jdkTarget}</release>
</configuration>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<source>${jdkTarget}</source>
<target>${jdkTarget}</target>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Expand All @@ -178,18 +175,16 @@
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
<phase>process-classes</phase>
<configuration>
<instructions>
<Main-Class>org.fusesource.jansi.AnsiMain</Main-Class>
<Export-Package>
!org.fusesource.jansi.internal.native.*;
<Export-Package>!org.fusesource.jansi.internal.native.*;
org.fusesource.jansi.*;
-noimport:=true
</Export-Package>
-noimport:=true</Export-Package>
<_removeheaders>Bnd-LastModified,Include-Resource,Private-Package,Originally-Created-By</_removeheaders>
<_reproducible>true</_reproducible>
</instructions>
Expand All @@ -204,19 +199,17 @@
<executions>
<execution>
<id>add-module-infos</id>
<phase>package</phase>
<goals>
<goal>add-module-info</goal>
</goals>
<phase>package</phase>
<configuration>
<jvmVersion>9</jvmVersion>
<module>
<moduleInfo>
<name>org.fusesource.jansi</name>
<exports>
org.fusesource.jansi;
org.fusesource.jansi.io;
</exports>
<exports>org.fusesource.jansi;
org.fusesource.jansi.io;</exports>
</moduleInfo>
</module>
</configuration>
Expand All @@ -228,13 +221,20 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<dependencies>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli-codegen</artifactId>
<version>4.5.2</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>generate-graalvm-info</id>
<phase>process-classes</phase>
<goals>
<goal>java</goal>
</goals>
<phase>process-classes</phase>
<configuration>
<includeProjectDependencies>true</includeProjectDependencies>
<classpathScope>test</classpathScope>
Expand All @@ -251,13 +251,6 @@
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli-codegen</artifactId>
<version>4.5.2</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -338,10 +331,10 @@
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
</plugin>
Expand All @@ -355,28 +348,66 @@
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
</configuration>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.38.0</version>
<configuration>
<java>
<toggleOffOn />
<palantirJavaFormat>
<version>2.35.0</version>
</palantirJavaFormat>
<importOrder>
<order>java|javax,org,,\#</order>
</importOrder>
<removeUnusedImports />
<licenseHeader>
<content>/*
* Copyright (C) 2009-2023 the original author(s).
*
* Licensed 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.
*/</content>
</licenseHeader>
</java>
<pom>
<sortPom>
<expandEmptyElements>false</expandEmptyElements>
<nrOfIndentSpace>4</nrOfIndentSpace>
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
</sortPom>
</pom>
<upToDateChecking>
<enabled>true</enabled>
</upToDateChecking>
</configuration>
<executions>
<execution>
<goals>
<goal>apply</goal>
</goals>
<phase>process-sources</phase>
</execution>
</executions>
</plugin>
</plugins>
<extensions>
<extension>
<groupId>org.fusesource.mvnplugins</groupId>
<artifactId>fuse-jxr-skin</artifactId>
<version>1.9</version>
</extension>
</extensions>
</build>

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.7.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.7.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli-codegen</artifactId>
<version>4.5.2</version>
<scope>test</scope>
</dependency>
</dependencies>

</project>
Loading