Skip to content

Commit cd23fb1

Browse files
david-waltermiredavid-waltermire
committed
Adjusted developer settings.
1 parent bfd24c9 commit cd23fb1

File tree

13 files changed

+92
-74
lines changed

13 files changed

+92
-74
lines changed

‎.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
actions: read
2424
contents: read
2525
security-events: write
26+
packages: write
2627
env:
2728
# BUILD_SNAPSHOT: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') &&
2829
# (github.ref_name == 'develop' || startsWith(github.ref_name, 'release-')) }}
@@ -48,8 +49,6 @@ jobs:
4849
java-version: 11
4950
distribution: 'temurin'
5051
cache: 'maven'
51-
server-username: MAVEN_USERNAME # env variable for username in deploy
52-
server-password: MAVEN_CENTRAL_TOKEN # env variable for token in deploy
5352
# gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} # Value of the GPG private key to import
5453
# gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
5554
- name: Set up JDK 11 (build only)
@@ -71,7 +70,8 @@ jobs:
7170
name: Build, Test and DEPLOY SNAPSHOT Code
7271
if: ${{ env.BUILD_SNAPSHOT == 'true' }}
7372
run: |
74-
mvn -B -e -Pgpg -Prelease -Preporting deploy -Dmaven.deploy.skip=releases
73+
# mvn -B -e -Pgpg -Prelease -Preporting deploy -Dmaven.deploy.skip=releases
74+
mvn -B -e -Prelease -Preporting deploy -Dmaven.deploy.skip=releases
7575
env:
7676
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7777
# MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

‎cli-processor/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
33
<parent>
4-
<groupId>gov.nist.secauto.metaschema</groupId>
5-
<artifactId>metaschema-framework</artifactId>
4+
<groupId>dev.metaschema-framework</groupId>
5+
<artifactId>parent</artifactId>
66
<version>1.0.0-M2-SNAPSHOT</version>
77
</parent>
88

@@ -19,7 +19,7 @@
1919

2020
<dependencies>
2121
<dependency>
22-
<groupId>gov.nist.secauto.metaschema</groupId>
22+
<groupId>${project.groupId}</groupId>
2323
<artifactId>metaschema-core</artifactId>
2424
</dependency>
2525
<dependency>

‎core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
7-
<groupId>gov.nist.secauto.metaschema</groupId>
8-
<artifactId>metaschema-framework</artifactId>
7+
<groupId>dev.metaschema-framework</groupId>
8+
<artifactId>parent</artifactId>
99
<version>1.0.0-M2-SNAPSHOT</version>
1010
</parent>
1111

‎databind-metaschema/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<groupId>gov.nist.secauto.metaschema</groupId>
6-
<artifactId>metaschema-framework</artifactId>
5+
<groupId>dev.metaschema-framework</groupId>
6+
<artifactId>parent</artifactId>
77
<version>1.0.0-M2-SNAPSHOT</version>
88
</parent>
99

@@ -79,7 +79,7 @@
7979
</pluginManagement>
8080
<plugins>
8181
<plugin>
82-
<groupId>gov.nist.secauto.metaschema</groupId>
82+
<groupId>${project.groupId}</groupId>
8383
<artifactId>metaschema-maven-plugin</artifactId>
8484
<version>${project.version}</version>
8585
<executions>

‎databind/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<groupId>gov.nist.secauto.metaschema</groupId>
6-
<artifactId>metaschema-framework</artifactId>
5+
<groupId>dev.metaschema-framework</groupId>
6+
<artifactId>parent</artifactId>
77
<version>1.0.0-M2-SNAPSHOT</version>
88
</parent>
99

‎metaschema-cli/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<groupId>gov.nist.secauto.metaschema</groupId>
6-
<artifactId>metaschema-framework</artifactId>
5+
<groupId>dev.metaschema-framework</groupId>
6+
<artifactId>parent</artifactId>
77
<version>1.0.0-M2-SNAPSHOT</version>
88
</parent>
99

‎metaschema-documentation-generator/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
22
<modelVersion>4.0.0</modelVersion>
33
<parent>
4-
<groupId>gov.nist.secauto.metaschema</groupId>
5-
<artifactId>metaschema-framework</artifactId>
4+
<groupId>dev.metaschema-framework</groupId>
5+
<artifactId>parent</artifactId>
66
<version>1.0.0-SNAPSHOT</version>
77
</parent>
88
<artifactId>metaschema-documentation-generator</artifactId>

‎metaschema-freemarker-support/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<groupId>gov.nist.secauto.metaschema</groupId>
6-
<artifactId>metaschema-framework</artifactId>
5+
<groupId>dev.metaschema-framework</groupId>
6+
<artifactId>parent</artifactId>
77
<version>1.0.0-SNAPSHOT</version>
88
</parent>
99

‎metaschema-maven-plugin/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
7-
<groupId>gov.nist.secauto.metaschema</groupId>
8-
<artifactId>metaschema-framework</artifactId>
7+
<groupId>dev.metaschema-framework</groupId>
8+
<artifactId>parent</artifactId>
99
<version>1.0.0-M2-SNAPSHOT</version>
1010
</parent>
1111

‎metaschema-maven-plugin/src/it/generate-sources/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>gov.nist.secauto.metaschema.it</groupId>
7+
<groupId>@project.groupId@.it</groupId>
88
<artifactId>generate-sources-test</artifactId>
99
<version>@project.version@</version>
1010

‎metaschema-testing/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
22
<modelVersion>4.0.0</modelVersion>
33
<parent>
4-
<groupId>gov.nist.secauto.metaschema</groupId>
5-
<artifactId>metaschema-framework</artifactId>
4+
<groupId>dev.metaschema-framework</groupId>
5+
<artifactId>parent</artifactId>
66
<version>1.0.0-M2-SNAPSHOT</version>
77
</parent>
88
<artifactId>metaschema-testing</artifactId>

‎pom.xml

Lines changed: 66 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -8,86 +8,55 @@
88
<artifactId>oss-parent</artifactId>
99
<version>28-SNAPSHOT</version>
1010
</parent>
11-
<groupId>gov.nist.secauto.metaschema</groupId>
12-
<artifactId>metaschema-framework</artifactId>
11+
<groupId>dev.metaschema-framework</groupId>
12+
<artifactId>parent</artifactId>
1313
<version>1.0.0-M2-SNAPSHOT</version>
1414
<packaging>pom</packaging>
1515
<name>Metaschema Framework Parent</name>
1616
<description>A common build root for all NIST Java projects related to the
1717
Metaschema framework.</description>
1818
<url>${site.url}</url>
1919
<issueManagement>
20-
<url>https://github.com/usnistgov/metaschema-java/issues</url>
20+
<url>https://github.com/metaschema-framework/metaschema-java/issues</url>
2121
<system>GitHub Issues</system>
2222
</issueManagement>
2323
<scm>
24-
<url>https://github.com/usnistgov/metaschema-java/tree/main</url>
25-
<connection>scm:git:[email protected]/usnistgov/metaschema-java.git</connection>
24+
<url>https://github.com/metaschema-framework/metaschema-java/tree/main</url>
25+
<connection>
26+
scm:git:[email protected]/metaschema-framework/metaschema-java.git</connection>
2627
<developerConnection>
27-
scm:git:[email protected]:usnistgov/metaschema-java.git</developerConnection>
28+
scm:git:[email protected]:metaschema-framework/metaschema-java.git</developerConnection>
2829
<tag>v0.12.0</tag>
2930
</scm>
30-
<distributionManagement>
31-
<snapshotRepository>
32-
<id>ossrh</id>
33-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
34-
</snapshotRepository>
35-
<repository>
36-
<id>ossrh</id>
37-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
38-
</repository>
39-
<site>
40-
<id>nist-pages</id>
41-
<url>${site.url}</url>
42-
</site>
43-
</distributionManagement>
4431
<licenses>
4532
<license>
46-
<name>NIST License</name>
47-
<url>https://www.nist.gov/director/licensing</url>
33+
<name>Public Domain</name>
34+
<url>https://creativecommons.org/publicdomain/zero/1.0/legalcode</url>
4835
<distribution>repo</distribution>
49-
<comments>NIST software License</comments>
5036
</license>
5137
</licenses>
5238
<organization>
53-
<name>National Institute of Standards and Technology</name>
54-
<url>https://www.nist.gov</url>
39+
<name>metaschema.dev</name>
40+
<url>https://metaschema.dev</url>
5541
</organization>
5642
<developers>
5743
<developer>
58-
<id>[email protected]</id>
44+
<id>[email protected]</id>
5945
<name>David Waltermire</name>
60-
<email>[email protected]</email>
61-
<organization>National Institute of Standards and Technology</organization>
46+
<email>[email protected]</email>
6247
<roles>
6348
<role>architect</role>
6449
<role>developer</role>
6550
<role>maintainer</role>
6651
</roles>
6752
</developer>
6853
</developers>
69-
<mailingLists>
70-
<mailingList>
71-
<name>OSCAL NIST Team</name>
72-
<post>[email protected]</post>
73-
</mailingList>
74-
<mailingList>
75-
<name>OSCAL Project Development Discussion</name>
76-
<post>[email protected]</post>
77-
<subscribe>[email protected]</subscribe>
78-
<unsubscribe>[email protected]</unsubscribe>
79-
</mailingList>
80-
<mailingList>
81-
<name>OSCAL Project Updates</name>
82-
<subscribe>[email protected]</subscribe>
83-
<unsubscribe>[email protected]</unsubscribe>
84-
</mailingList>
85-
</mailingLists>
8654
<properties>
8755
<!-- site configuration -->
88-
<site.url>https://pages.nist.gov/metaschema-java/</site.url>
89-
<scm.url>https://github.com/usnistgov/metaschema-java</scm.url>
90-
<issueManagement.url>https://github.com/usnistgov/metaschema-java/issues</issueManagement.url>
56+
<site.url>https://metaschema-java.metaschema.dev/</site.url>
57+
<scm.url>https://github.com/david-waltermire/metaschema-java</scm.url>
58+
<issueManagement.url>
59+
https://github.com/david-waltermire/metaschema-java/issues</issueManagement.url>
9160
<!--
9261
================================================================================ -->
9362
<!-- Web dependencies version -->
@@ -793,4 +762,53 @@
793762
<!-- <module>metaschema-freemarker-support</module> -->
794763
<!-- <module>metaschema-documentation-generator</module> -->
795764
</modules>
765+
<profiles>
766+
<profile>
767+
<id>github</id>
768+
<activation>
769+
<property>
770+
<name>!deployOSSRH</name>
771+
</property>
772+
</activation>
773+
<distributionManagement>
774+
<snapshotRepository>
775+
<id>github</id>
776+
<name>GitHub Packages</name>
777+
<url>
778+
https://maven.pkg.github.com/david-waltermire/metaschema-java</url>
779+
</snapshotRepository>
780+
<repository>
781+
<id>github</id>
782+
<name>GitHub Packages</name>
783+
<url>
784+
https://maven.pkg.github.com/david-waltermire/metaschema-java</url>
785+
</repository>
786+
</distributionManagement>
787+
</profile>
788+
<profile>
789+
<id>ossrh</id>
790+
<activation>
791+
<property>
792+
<name>deployOSSRH</name>
793+
<value>true</value>
794+
</property>
795+
</activation>
796+
<distributionManagement>
797+
<snapshotRepository>
798+
<id>ossrh</id>
799+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
800+
</snapshotRepository>
801+
<repository>
802+
<id>ossrh</id>
803+
<url>
804+
https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
805+
</repository>
806+
<site>
807+
<id>website</id>
808+
<url>${site.url}</url>
809+
</site>
810+
</distributionManagement>
811+
812+
</profile>
813+
</profiles>
796814
</project>

‎schemagen/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<groupId>gov.nist.secauto.metaschema</groupId>
6-
<artifactId>metaschema-framework</artifactId>
5+
<groupId>dev.metaschema-framework</groupId>
6+
<artifactId>parent</artifactId>
77
<version>1.0.0-M2-SNAPSHOT</version>
88
</parent>
99
<artifactId>metaschema-schema-generator</artifactId>

0 commit comments

Comments
 (0)