From 60cb5529bf1042bb7670c5ed172c740fdb72e07d Mon Sep 17 00:00:00 2001 From: Jan van Mansum Date: Wed, 29 Sep 2021 10:11:14 +0200 Subject: [PATCH] Updated parent POM to 7.0.0. This includes an upgrade of the license plugin which changes the doc style of the license header from Javadoc to normal doc, avoiding problems with code formatting of Javadocs. --- pom.xml | 2 +- .../scala/nl/knaw/dans/easy/agreement/AgreementGenerator.scala | 2 +- src/main/scala/nl/knaw/dans/easy/agreement/Command.scala | 2 +- .../scala/nl/knaw/dans/easy/agreement/CommandLineOptions.scala | 2 +- src/main/scala/nl/knaw/dans/easy/agreement/Configuration.scala | 2 +- .../dans/easy/agreement/EasyDepositAgreementCreatorApp.scala | 2 +- .../easy/agreement/EasyDepositAgreementCreatorService.scala | 2 +- .../easy/agreement/EasyDepositAgreementCreatorServlet.scala | 2 +- .../scala/nl/knaw/dans/easy/agreement/datafetch/Dataset.scala | 2 +- .../nl/knaw/dans/easy/agreement/datafetch/DatasetLoader.scala | 2 +- .../scala/nl/knaw/dans/easy/agreement/datafetch/Fedora.scala | 2 +- src/main/scala/nl/knaw/dans/easy/agreement/datafetch/Ldap.scala | 2 +- src/main/scala/nl/knaw/dans/easy/agreement/package.scala | 2 +- .../nl/knaw/dans/easy/agreement/AgreementGeneratorSpec.scala | 2 +- .../knaw/dans/easy/agreement/datafetch/DatasetLoaderSpec.scala | 2 +- .../scala/nl/knaw/dans/easy/agreement/datafetch/LdapSpec.scala | 2 +- .../nl/knaw/dans/easy/agreement/fixture/FileSystemSupport.scala | 2 +- .../nl/knaw/dans/easy/agreement/fixture/FixedDateTime.scala | 2 +- .../knaw/dans/easy/agreement/fixture/TestSupportFixture.scala | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index ec901d2..198d311 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ nl.knaw.dans.shared dans-scala-app-project - 6.0.3 + 7.0.0 nl.knaw.dans.easy diff --git a/src/main/scala/nl/knaw/dans/easy/agreement/AgreementGenerator.scala b/src/main/scala/nl/knaw/dans/easy/agreement/AgreementGenerator.scala index 4e2c206..ce66fee 100644 --- a/src/main/scala/nl/knaw/dans/easy/agreement/AgreementGenerator.scala +++ b/src/main/scala/nl/knaw/dans/easy/agreement/AgreementGenerator.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/scala/nl/knaw/dans/easy/agreement/Command.scala b/src/main/scala/nl/knaw/dans/easy/agreement/Command.scala index a5ee669..e82a45c 100644 --- a/src/main/scala/nl/knaw/dans/easy/agreement/Command.scala +++ b/src/main/scala/nl/knaw/dans/easy/agreement/Command.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/scala/nl/knaw/dans/easy/agreement/CommandLineOptions.scala b/src/main/scala/nl/knaw/dans/easy/agreement/CommandLineOptions.scala index 4b9ec17..2c7f2ed 100644 --- a/src/main/scala/nl/knaw/dans/easy/agreement/CommandLineOptions.scala +++ b/src/main/scala/nl/knaw/dans/easy/agreement/CommandLineOptions.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/scala/nl/knaw/dans/easy/agreement/Configuration.scala b/src/main/scala/nl/knaw/dans/easy/agreement/Configuration.scala index 61f1595..b2c5cd8 100644 --- a/src/main/scala/nl/knaw/dans/easy/agreement/Configuration.scala +++ b/src/main/scala/nl/knaw/dans/easy/agreement/Configuration.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/scala/nl/knaw/dans/easy/agreement/EasyDepositAgreementCreatorApp.scala b/src/main/scala/nl/knaw/dans/easy/agreement/EasyDepositAgreementCreatorApp.scala index d9426ba..2ae2a2c 100644 --- a/src/main/scala/nl/knaw/dans/easy/agreement/EasyDepositAgreementCreatorApp.scala +++ b/src/main/scala/nl/knaw/dans/easy/agreement/EasyDepositAgreementCreatorApp.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/scala/nl/knaw/dans/easy/agreement/EasyDepositAgreementCreatorService.scala b/src/main/scala/nl/knaw/dans/easy/agreement/EasyDepositAgreementCreatorService.scala index 9a25985..05f7fe4 100644 --- a/src/main/scala/nl/knaw/dans/easy/agreement/EasyDepositAgreementCreatorService.scala +++ b/src/main/scala/nl/knaw/dans/easy/agreement/EasyDepositAgreementCreatorService.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/scala/nl/knaw/dans/easy/agreement/EasyDepositAgreementCreatorServlet.scala b/src/main/scala/nl/knaw/dans/easy/agreement/EasyDepositAgreementCreatorServlet.scala index fe13c5a..42794c2 100644 --- a/src/main/scala/nl/knaw/dans/easy/agreement/EasyDepositAgreementCreatorServlet.scala +++ b/src/main/scala/nl/knaw/dans/easy/agreement/EasyDepositAgreementCreatorServlet.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/scala/nl/knaw/dans/easy/agreement/datafetch/Dataset.scala b/src/main/scala/nl/knaw/dans/easy/agreement/datafetch/Dataset.scala index a9cd666..d2572df 100644 --- a/src/main/scala/nl/knaw/dans/easy/agreement/datafetch/Dataset.scala +++ b/src/main/scala/nl/knaw/dans/easy/agreement/datafetch/Dataset.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/scala/nl/knaw/dans/easy/agreement/datafetch/DatasetLoader.scala b/src/main/scala/nl/knaw/dans/easy/agreement/datafetch/DatasetLoader.scala index 4bba8f6..5e84dfd 100644 --- a/src/main/scala/nl/knaw/dans/easy/agreement/datafetch/DatasetLoader.scala +++ b/src/main/scala/nl/knaw/dans/easy/agreement/datafetch/DatasetLoader.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/scala/nl/knaw/dans/easy/agreement/datafetch/Fedora.scala b/src/main/scala/nl/knaw/dans/easy/agreement/datafetch/Fedora.scala index 18157ac..6357228 100644 --- a/src/main/scala/nl/knaw/dans/easy/agreement/datafetch/Fedora.scala +++ b/src/main/scala/nl/knaw/dans/easy/agreement/datafetch/Fedora.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/scala/nl/knaw/dans/easy/agreement/datafetch/Ldap.scala b/src/main/scala/nl/knaw/dans/easy/agreement/datafetch/Ldap.scala index 8ad6f60..d76f937 100644 --- a/src/main/scala/nl/knaw/dans/easy/agreement/datafetch/Ldap.scala +++ b/src/main/scala/nl/knaw/dans/easy/agreement/datafetch/Ldap.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/scala/nl/knaw/dans/easy/agreement/package.scala b/src/main/scala/nl/knaw/dans/easy/agreement/package.scala index 2137f17..7c95a1a 100644 --- a/src/main/scala/nl/knaw/dans/easy/agreement/package.scala +++ b/src/main/scala/nl/knaw/dans/easy/agreement/package.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/test/scala/nl/knaw/dans/easy/agreement/AgreementGeneratorSpec.scala b/src/test/scala/nl/knaw/dans/easy/agreement/AgreementGeneratorSpec.scala index 4521395..ebef9cb 100644 --- a/src/test/scala/nl/knaw/dans/easy/agreement/AgreementGeneratorSpec.scala +++ b/src/test/scala/nl/knaw/dans/easy/agreement/AgreementGeneratorSpec.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/test/scala/nl/knaw/dans/easy/agreement/datafetch/DatasetLoaderSpec.scala b/src/test/scala/nl/knaw/dans/easy/agreement/datafetch/DatasetLoaderSpec.scala index d6e667e..c945ce7 100644 --- a/src/test/scala/nl/knaw/dans/easy/agreement/datafetch/DatasetLoaderSpec.scala +++ b/src/test/scala/nl/knaw/dans/easy/agreement/datafetch/DatasetLoaderSpec.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/test/scala/nl/knaw/dans/easy/agreement/datafetch/LdapSpec.scala b/src/test/scala/nl/knaw/dans/easy/agreement/datafetch/LdapSpec.scala index a707db3..ead3923 100644 --- a/src/test/scala/nl/knaw/dans/easy/agreement/datafetch/LdapSpec.scala +++ b/src/test/scala/nl/knaw/dans/easy/agreement/datafetch/LdapSpec.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/test/scala/nl/knaw/dans/easy/agreement/fixture/FileSystemSupport.scala b/src/test/scala/nl/knaw/dans/easy/agreement/fixture/FileSystemSupport.scala index 67043ab..3543d27 100644 --- a/src/test/scala/nl/knaw/dans/easy/agreement/fixture/FileSystemSupport.scala +++ b/src/test/scala/nl/knaw/dans/easy/agreement/fixture/FileSystemSupport.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/test/scala/nl/knaw/dans/easy/agreement/fixture/FixedDateTime.scala b/src/test/scala/nl/knaw/dans/easy/agreement/fixture/FixedDateTime.scala index 5611bd9..ad97a9d 100644 --- a/src/test/scala/nl/knaw/dans/easy/agreement/fixture/FixedDateTime.scala +++ b/src/test/scala/nl/knaw/dans/easy/agreement/fixture/FixedDateTime.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/test/scala/nl/knaw/dans/easy/agreement/fixture/TestSupportFixture.scala b/src/test/scala/nl/knaw/dans/easy/agreement/fixture/TestSupportFixture.scala index 0447978..a596496 100644 --- a/src/test/scala/nl/knaw/dans/easy/agreement/fixture/TestSupportFixture.scala +++ b/src/test/scala/nl/knaw/dans/easy/agreement/fixture/TestSupportFixture.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2016 DANS - Data Archiving and Networked Services (info@dans.knaw.nl) * * Licensed under the Apache License, Version 2.0 (the "License");