Skip to content

Commit c501b1b

Browse files
author
Emil Forslund
committed
Fix project structure to enable deployment in Maven Central
1 parent 096ecbb commit c501b1b

12 files changed

Lines changed: 148 additions & 33 deletions

File tree

‎nb-configuration.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ You can copy and paste the single properties, into the pom.xml file and the IDE
3131
That way multiple projects can share the same settings (useful for formatting rules for example).
3232
Any value defined here will override the pom.xml file value but is only applicable to the current project.
3333
-->
34-
<netbeans.hint.jdkPlatform>JDK_1.8</netbeans.hint.jdkPlatform>
34+
3535
<netbeans.hint.license>apache20</netbeans.hint.license>
3636
<org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
3737
<org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>4</org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>

‎nbactions.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
5+
Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
6+
7+
Licensed under the Apache License, Version 2.0 (the "License"); You may not
8+
use this file except in compliance with the License. You may obtain a copy of
9+
the License at:
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
15+
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
16+
License for the specific language governing permissions and limitations under
17+
the License.
18+
19+
-->
20+
<actions>
21+
<!-- <action>
22+
<actionName>CUSTOM-Deploy</actionName>
23+
<displayName>Deploy</displayName>
24+
<goals>
25+
<goal>mvn</goal>
26+
<goal>clean</goal>
27+
<goal>deploy</goal>
28+
<goal>-Dgpg.passphrase=PoolenÄrVarmIAtherton</goal>
29+
</goals>
30+
</action>-->
31+
</actions>

‎pom.xml‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
44
5-
Copyright (c) 2006-2015, Speedment, Inc. All Rights Reserved.
5+
Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
66
77
Licensed under the Apache License, Version 2.0 (the "License"); You may not
88
use this file except in compliance with the License. You may obtain a copy of
@@ -20,8 +20,8 @@
2020
<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">
2121
<modelVersion>4.0.0</modelVersion>
2222
<groupId>com.github.pyknic</groupId>
23-
<artifactId>CodeGen</artifactId>
24-
<version>1.1</version>
23+
<artifactId>codegen</artifactId>
24+
<version>1.1.0</version>
2525
<packaging>jar</packaging>
2626

2727
<name>CodeGen</name>
@@ -63,6 +63,10 @@
6363
<id>ossrh</id>
6464
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
6565
</snapshotRepository>
66+
<repository>
67+
<id>ossrh</id>
68+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
69+
</repository>
6670
</distributionManagement>
6771

6872
<build>
@@ -82,7 +86,7 @@
8286

8387
<profiles>
8488
<profile>
85-
<id>release</id>
89+
<id>ossrh</id>
8690
<build>
8791
<plugins>
8892
<plugin>
@@ -92,10 +96,11 @@
9296
<configuration>
9397
<header>license_header.txt</header>
9498
<properties>
95-
<currentYear>$(current.year}</currentYear>
99+
<currentYear>2016</currentYear>
96100
</properties>
97101
<excludes>
98102
<exclude>**/README</exclude>
103+
<exclude>**/LICENSE</exclude>
99104
<exclude>src/test/resources/**</exclude>
100105
<exclude>src/main/resources/**</exclude>
101106
</excludes>
@@ -134,9 +139,9 @@
134139
</execution>
135140
</executions>
136141
<configuration>
137-
<docfilessubdirs>true</docfilessubdirs>
138-
<excludePackageNames>com.speedment.internal.*</excludePackageNames>
139-
</configuration>
142+
<docfilessubdirs>true</docfilessubdirs>
143+
<excludePackageNames>com.speedment.internal.*</excludePackageNames>
144+
</configuration>
140145
</plugin>
141146
<plugin>
142147
<groupId>org.apache.maven.plugins</groupId>
@@ -152,18 +157,16 @@
152157
</execution>
153158
</executions>
154159
<configuration>
160+
<useagent>true</useagent>
161+
<!--<defaultKeyring>false</defaultKeyring>-->
155162

156-
</configuration>
157-
</plugin>
158-
<plugin>
159-
<groupId>org.sonatype.plugins</groupId>
160-
<artifactId>nexus-staging-maven-plugin</artifactId>
161-
<version>1.6.7</version>
162-
<extensions>true</extensions>
163-
<configuration>
164-
<serverId>ossrh</serverId>
165-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
166-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
163+
<keyname>${gpg.keyname}</keyname>
164+
<passphrase>${gpg.passphrase}</passphrase>
165+
<!--<passphraseServerId>ossrh</passphraseServerId>-->
166+
167+
<executable>${gpg.executable}</executable>
168+
<!-- <publicKeyring>${gpg.homedir}/pubring.gpg</publicKeyring>
169+
<secretKeyring>${gpg.homedir}/secring.gpg</secretKeyring>-->
167170
</configuration>
168171
</plugin>
169172
</plugins>

‎src/main/java/com/speedment/annotation/package-info.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/**
2+
*
3+
* Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License"); You may not
6+
* use this file except in compliance with the License. You may obtain a copy of
7+
* the License at:
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
13+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
14+
* License for the specific language governing permissions and limitations under
15+
* the License.
16+
*/
117
/**
218
* Annotations used in generated code is located in this package.
319
* <p>

‎src/main/java/com/speedment/codegen/model/modifier/package-info.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/**
2+
*
3+
* Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License"); You may not
6+
* use this file except in compliance with the License. You may obtain a copy of
7+
* the License at:
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
13+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
14+
* License for the specific language governing permissions and limitations under
15+
* the License.
16+
*/
117
/**
218
* Implementations of the
319
* {@link com.speedment.codegen.model.modifier.Modifier} interface that

‎src/main/java/com/speedment/codegen/model/package-info.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/**
2+
*
3+
* Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License"); You may not
6+
* use this file except in compliance with the License. You may obtain a copy of
7+
* the License at:
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
13+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
14+
* License for the specific language governing permissions and limitations under
15+
* the License.
16+
*/
117
/**
218
* Models for typical object-oriented language building blocks are located in
319
* this package. The ambition of codegen is to separate model, view and

‎src/main/java/com/speedment/codegen/model/trait/package-info.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/**
2+
*
3+
* Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License"); You may not
6+
* use this file except in compliance with the License. You may obtain a copy of
7+
* the License at:
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
13+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
14+
* License for the specific language governing permissions and limitations under
15+
* the License.
16+
*/
117
/**
218
* Common traits used by the codegen models located in the
319
* {@code com.speedment.codegen.lang.model} package.

‎src/main/java/com/speedment/codegen/package-info.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/**
2+
*
3+
* Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License"); You may not
6+
* use this file except in compliance with the License. You may obtain a copy of
7+
* the License at:
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
13+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
14+
* License for the specific language governing permissions and limitations under
15+
* the License.
16+
*/
117
/**
218
* The main interfaces of the codegen library are located in this package.
319
* <p>

‎src/main/java/com/speedment/util/NullUtil.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
/*
2-
* Copyright 2016 Emil.
1+
/**
2+
*
3+
* Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
34
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
5+
* Licensed under the Apache License, Version 2.0 (the "License"); You may not
6+
* use this file except in compliance with the License. You may obtain a copy of
7+
* the License at:
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
12+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
13+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
14+
* License for the specific language governing permissions and limitations under
15+
* the License.
1516
*/
1617
package com.speedment.util;
1718

‎src/test/java/com/speedment/codegen/model/AnnotationUsageTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
*
3-
* Copyright (c) 2006-2015, Speedment, Inc. All Rights Reserved.
3+
* Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License"); You may not
66
* use this file except in compliance with the License. You may obtain a copy of

0 commit comments

Comments
 (0)